Software `/` code `/` prosody

Annotate

plugins/muc/muc.lib.lua @ 8476:082d12728645 0.9.13

MUC: Rename variable to make it clearer that it is the room JID and not the MUC host

author	Kim Alvefur <zash@zash.se>
date	Sun, 10 Dec 2017 17:52:47 +0100
parent	8475:eb85b10e1fea
child	8477:597c23e1c38e
child	8588:54b60a1eea2d

rev	line source
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1 -- Prosody IM
2923 b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2864 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010 Matthew Wild <mwild1@gmail.com> parents: 2864 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	4 --
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	5 -- This project is MIT/X11 licensed. Please see the
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	6 -- COPYING file in the source package for more information.
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	7 --
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	8
3281 fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	9 local select = select;
fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	10 local pairs, ipairs = pairs, ipairs;
fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	11
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	12 local datetime = require "util.datetime";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	14 local dataform = require "util.dataforms";
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	15
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	16 local jid_split = require "util.jid".split;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	17 local jid_bare = require "util.jid".bare;
1862 115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	18 local jid_prep = require "util.jid".prep;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	19 local st = require "util.stanza";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	20 local log = require "util.logger".init("mod_muc");
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	21 local t_insert, t_remove = table.insert, table.remove;
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	22 local setmetatable = setmetatable;
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	23 local base64 = require "util.encodings".base64;
f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	24 local md5 = require "util.hashes".md5;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	25
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	26 local muc_domain = nil; --module:get_host();
5195 ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	27 local default_history_length, max_history_length = 20, math.huge;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	28
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	29 ------------
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	30 local function filter_xmlns_from_array(array, filters)
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	31 local count = 0;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	32 for i=#array,1,-1 do
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	33 local attr = array[i].attr;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	34 if filters[attr and attr.xmlns] then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	35 t_remove(array, i);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	36 count = count + 1;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	37 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	38 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	39 return count;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	40 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	41 local function filter_xmlns_from_stanza(stanza, filters)
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	42 if filters then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	43 if filter_xmlns_from_array(stanza.tags, filters) ~= 0 then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	44 return stanza, filter_xmlns_from_array(stanza, filters);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	45 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	46 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	47 return stanza, 0;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	48 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	49 local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	50 local function get_filtered_presence(stanza)
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	51 return filter_xmlns_from_stanza(st.clone(stanza):reset(), presence_filters);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	52 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	53 local kickable_error_conditions = {
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	54 ["gone"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	55 ["internal-server-error"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	56 ["item-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	57 ["jid-malformed"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	58 ["recipient-unavailable"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	59 ["redirect"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	60 ["remote-server-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	61 ["remote-server-timeout"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	62 ["service-unavailable"] = true;
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	63 ["malformed error"] = true;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	64 };
2527 3fe3dbb27b6f MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/) Matthew Wild <mwild1@gmail.com> parents: 2504 diff changeset	65
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	66 local function get_error_condition(stanza)
2527 3fe3dbb27b6f MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/) Matthew Wild <mwild1@gmail.com> parents: 2504 diff changeset	67 local _, condition = stanza:get_error();
3fe3dbb27b6f MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/) Matthew Wild <mwild1@gmail.com> parents: 2504 diff changeset	68 return condition or "malformed error";
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	69 end
2527 3fe3dbb27b6f MUC: Have get_error_condition() use the new stanza:get_error() (muc.lib.lua 11 lines shorter \o/) Matthew Wild <mwild1@gmail.com> parents: 2504 diff changeset	70
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	71 local function is_kickable_error(stanza)
05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	72 local cond = get_error_condition(stanza);
05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	73 return kickable_error_conditions[cond] and cond;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	74 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	75 local function getUsingPath(stanza, path, getText)
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	76 local tag = stanza;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	77 for _, name in ipairs(path) do
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	78 if type(tag) ~= 'table' then return; end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	79 tag = tag:child_with_name(name);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	80 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	81 if tag and getText then tag = table.concat(tag); end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	82 return tag;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	83 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	84 local function getTag(stanza, path) return getUsingPath(stanza, path); end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	85 local function getText(stanza, path) return getUsingPath(stanza, path, true); end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	86 -----------
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	87
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	88 local room_mt = {};
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	89 room_mt.__index = room_mt;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	90
5519 06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	91 function room_mt:__tostring()
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	92 return "MUC room ("..self.jid..")";
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	93 end
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	94
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	95 function room_mt:get_default_role(affiliation)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	96 if affiliation == "owner" or affiliation == "admin" then
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	97 return "moderator";
3251 f2f9fe088f6e MUC: Updated room:get_default_role() to assign unaffiliated occupants a "visitor" role in moderated rooms. Waqas Hussain <waqas20@gmail.com> parents: 3250 diff changeset	98 elseif affiliation == "member" then
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	99 return "participant";
3251 f2f9fe088f6e MUC: Updated room:get_default_role() to assign unaffiliated occupants a "visitor" role in moderated rooms. Waqas Hussain <waqas20@gmail.com> parents: 3250 diff changeset	100 elseif not affiliation then
3255 6bffb5c63131 MUC: Updated room:get_default_role() to not assign unaffiliated occupants a role in members-only rooms. Waqas Hussain <waqas20@gmail.com> parents: 3254 diff changeset	101 if not self:is_members_only() then
6bffb5c63131 MUC: Updated room:get_default_role() to not assign unaffiliated occupants a role in members-only rooms. Waqas Hussain <waqas20@gmail.com> parents: 3254 diff changeset	102 return self:is_moderated() and "visitor" or "participant";
6bffb5c63131 MUC: Updated room:get_default_role() to not assign unaffiliated occupants a role in members-only rooms. Waqas Hussain <waqas20@gmail.com> parents: 3254 diff changeset	103 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	104 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	105 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	106
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	107 function room_mt:broadcast_presence(stanza, sid, code, nick)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	108 stanza = get_filtered_presence(stanza);
1825 f67e4bfc62f1 MUC: Renamed a variable name. Waqas Hussain <waqas20@gmail.com> parents: 1824 diff changeset	109 local occupant = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	110 stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
2053 f5a198127dd3 MUC: Fixed: affiliation='none' was omitted from some presence broadcasts. Waqas Hussain <waqas20@gmail.com> parents: 2051 diff changeset	111 :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none", nick=nick}):up();
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	112 if code then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	113 stanza:tag("status", {code=code}):up();
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	114 end
1824 8e66c9d09f81 MUC: Refactored to remove some duplicate code. Waqas Hussain <waqas20@gmail.com> parents: 1819 diff changeset	115 self:broadcast_except_nick(stanza, stanza.attr.from);
8e66c9d09f81 MUC: Refactored to remove some duplicate code. Waqas Hussain <waqas20@gmail.com> parents: 1819 diff changeset	116 local me = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	117 if me then
3590 dcc5f3402f5b MUC: Added a missing :up() to the stanza building for presence broadcast (thanks Zash). Waqas Hussain <waqas20@gmail.com> parents: 3580 diff changeset	118 stanza:tag("status", {code='110'}):up();
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	119 stanza.attr.to = sid;
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	120 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	121 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	122 end
1736 98f833669d7f MUC: Fixed function declarations. Waqas Hussain <waqas20@gmail.com> parents: 1735 diff changeset	123 function room_mt:broadcast_message(stanza, historic)
2172 84dd0fada45b MUC: Improved handling of incoming groupchat messages (state preserved for possible later use). Waqas Hussain <waqas20@gmail.com> parents: 2064 diff changeset	124 local to = stanza.attr.to;
8476 082d12728645 MUC: Rename variable to make it clearer that it is the room JID and not the MUC host Kim Alvefur <zash@zash.se> parents: 8475 diff changeset	125 local room_jid = self.jid;
8475 eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	126
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	127 stanza:maptags(function (child)
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	128 if child.name == "delay" and child.attr["xmlns"] == "urn:xmpp:delay" then
8476 082d12728645 MUC: Rename variable to make it clearer that it is the room JID and not the MUC host Kim Alvefur <zash@zash.se> parents: 8475 diff changeset	129 if child.attr["from"] == room_jid then
8475 eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	130 return nil;
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	131 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	132 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	133 if child.name == "x" and child.attr["xmlns"] == "jabber:x:delay" then
8476 082d12728645 MUC: Rename variable to make it clearer that it is the room JID and not the MUC host Kim Alvefur <zash@zash.se> parents: 8475 diff changeset	134 if child.attr["from"] == room_jid then
8475 eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	135 return nil;
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	136 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	137 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	138 return child;
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	139 end)
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	140
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	141 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	142 for jid in pairs(o_data.sessions) do
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	143 stanza.attr.to = jid;
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	144 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	145 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	146 end
2172 84dd0fada45b MUC: Improved handling of incoming groupchat messages (state preserved for possible later use). Waqas Hussain <waqas20@gmail.com> parents: 2064 diff changeset	147 stanza.attr.to = to;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	148 if historic then -- add to history
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	149 local history = self._data['history'];
81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	150 if not history then history = {}; self._data['history'] = history; end
2172 84dd0fada45b MUC: Improved handling of incoming groupchat messages (state preserved for possible later use). Waqas Hussain <waqas20@gmail.com> parents: 2064 diff changeset	151 stanza = st.clone(stanza);
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	152 stanza.attr.to = "";
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	153 local stamp = datetime.datetime();
8474 7ad9d7c4161c MUC: fix the @from on <delay/> in history replay (fixes #1054) Jonas Wielicki <jonas@wielicki.name> parents: 8465 diff changeset	154 stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = self.jid, stamp = stamp}):up(); -- XEP-0203
7ad9d7c4161c MUC: fix the @from on <delay/> in history replay (fixes #1054) Jonas Wielicki <jonas@wielicki.name> parents: 8465 diff changeset	155 stanza:tag("x", {xmlns = "jabber:x:delay", from = self.jid, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	156 local entry = { stanza = stanza, stamp = stamp };
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	157 t_insert(history, entry);
4874 4e9781a61242 muc.lib: Fix for traceback when no history length is set for the room Matthew Wild <mwild1@gmail.com> parents: 4839 diff changeset	158 while #history > (self._data.history_length or default_history_length) do t_remove(history, 1) end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	159 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	160 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	161 function room_mt:broadcast_except_nick(stanza, nick)
1751 55ee6e792e3e MUC: Fixed a variable scoping bug causing problems with presence routing on affiliation/role change. Waqas Hussain <waqas20@gmail.com> parents: 1750 diff changeset	162 for rnick, occupant in pairs(self._occupants) do
55ee6e792e3e MUC: Fixed a variable scoping bug causing problems with presence routing on affiliation/role change. Waqas Hussain <waqas20@gmail.com> parents: 1750 diff changeset	163 if rnick ~= nick then
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	164 for jid in pairs(occupant.sessions) do
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	165 stanza.attr.to = jid;
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	166 self:_route_stanza(stanza);
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	167 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	168 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	169 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	170 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	171
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	172 function room_mt:send_occupant_list(to)
81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	173 local current_nick = self._jid_nick[to];
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	174 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	175 if occupant ~= current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	176 local pres = get_filtered_presence(o_data.sessions[o_data.jid]);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	177 pres.attr.to, pres.attr.from = to, occupant;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	178 pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
2053 f5a198127dd3 MUC: Fixed: affiliation='none' was omitted from some presence broadcasts. Waqas Hussain <waqas20@gmail.com> parents: 2051 diff changeset	179 :tag("item", {affiliation=o_data.affiliation or "none", role=o_data.role or "none"}):up();
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	180 self:_route_stanza(pres);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	181 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	182 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	183 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	184 function room_mt:send_history(to, stanza)
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	185 local history = self._data['history']; -- send discussion history
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	186 if history then
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	187 local x_tag = stanza and stanza:get_child("x", "http://jabber.org/protocol/muc");
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	188 local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	189
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	190 local maxchars = history_tag and tonumber(history_tag.attr.maxchars);
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	191 if maxchars then maxchars = math.floor(maxchars); end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	192
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	193 local maxstanzas = math.floor(history_tag and tonumber(history_tag.attr.maxstanzas) or #history);
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	194 if not history_tag then maxstanzas = 20; end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	195
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	196 local seconds = history_tag and tonumber(history_tag.attr.seconds);
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	197 if seconds then seconds = datetime.datetime(os.time() - math.floor(seconds)); end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	198
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	199 local since = history_tag and history_tag.attr.since;
3516 de54a7ab7e6e MUC: fix timezone support when sending history Kim Alvefur <zash@zash.se> parents: 3510 diff changeset	200 if since then since = datetime.parse(since); since = since and datetime.datetime(since); end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	201 if seconds and (not since or since < seconds) then since = seconds; end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	202
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	203 local n = 0;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	204 local charcount = 0;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	205
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	206 for i=#history,1,-1 do
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	207 local entry = history[i];
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	208 if maxchars then
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	209 if not entry.chars then
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	210 entry.stanza.attr.to = "";
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	211 entry.chars = #tostring(entry.stanza);
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	212 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	213 charcount = charcount + entry.chars + #to;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	214 if charcount > maxchars then break; end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	215 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	216 if since and since > entry.stamp then break; end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	217 if n + 1 > maxstanzas then break; end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	218 n = n + 1;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	219 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	220 for i=#history-n+1,#history do
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	221 local msg = history[i].stanza;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	222 msg.attr.to = to;
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	223 self:_route_stanza(msg);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	224 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	225 end
8465 0ec72e67f797 MUC: Always send subject message, even if it is empty (fixes #1053) Kim Alvefur <zash@zash.se> parents: 7383 diff changeset	226 self:_route_stanza(st.message({type='groupchat', from=self._data['subject_from'] or self.jid, to=to}):tag("subject"):text(self._data['subject']));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	227 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	228
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	229 function room_mt:get_disco_info(stanza)
4266 513485a11b85 MUC: Include occupant count in room disco#info response. Waqas Hussain <waqas20@gmail.com> parents: 4202 diff changeset	230 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end
1808 e164fdb2d18f MUC: Added MUC feature to the disco#info replies of rooms. Waqas Hussain <waqas20@gmail.com> parents: 1778 diff changeset	231 return st.reply(stanza):query("http://jabber.org/protocol/disco#info")
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	232 :tag("identity", {category="conference", type="text", name=self:get_name()}):up()
3246 3371419eb0e1 MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set). Waqas Hussain <waqas20@gmail.com> parents: 3245 diff changeset	233 :tag("feature", {var="http://jabber.org/protocol/muc"}):up()
3371419eb0e1 MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set). Waqas Hussain <waqas20@gmail.com> parents: 3245 diff changeset	234 :tag("feature", {var=self:get_password() and "muc_passwordprotected" or "muc_unsecured"}):up()
3253 23a30abcc76e MUC: Added disco#info features to advertise room's moderation status (muc_moderated or muc_unmoderated). Waqas Hussain <waqas20@gmail.com> parents: 3252 diff changeset	235 :tag("feature", {var=self:is_moderated() and "muc_moderated" or "muc_unmoderated"}):up()
3257 fae054e15e03 MUC: Added disco#info features to advertise room's members-only status (muc_membersonly or muc_open). Waqas Hussain <waqas20@gmail.com> parents: 3256 diff changeset	236 :tag("feature", {var=self:is_members_only() and "muc_membersonly" or "muc_open"}):up()
3260 19b655a8671c MUC: Added disco#info features to advertise room's persistence status (muc_persistent or muc_temporary). Waqas Hussain <waqas20@gmail.com> parents: 3259 diff changeset	237 :tag("feature", {var=self:is_persistent() and "muc_persistent" or "muc_temporary"}):up()
3263 4973b737d4c7 MUC: Added disco#info features to advertise room's public status (muc_public or muc_hidden). Waqas Hussain <waqas20@gmail.com> parents: 3262 diff changeset	238 :tag("feature", {var=self:is_hidden() and "muc_hidden" or "muc_public"}):up()
3264 e1c787c6f86e MUC: Added disco#info features to advertise room's anonymity status (muc_semianonymous or muc_nonanonymous). Waqas Hussain <waqas20@gmail.com> parents: 3263 diff changeset	239 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	240 :add_child(dataform.new({
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	241 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
5853 3ee3d79db18c muc.lib.lua: Fix Spark jabber client not displaying conference room lists, seemingly due to a missing value tag for the room description if the description has not been set Paul <paul@quakenet.org> parents: 5680 diff changeset	242 { name = "muc#roominfo_description", label = "Description", value = "" },
4266 513485a11b85 MUC: Include occupant count in room disco#info response. Waqas Hussain <waqas20@gmail.com> parents: 4202 diff changeset	243 { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) }
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	244 }):form({["muc#roominfo_description"] = self:get_description()}, 'result'))
3246 3371419eb0e1 MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set). Waqas Hussain <waqas20@gmail.com> parents: 3245 diff changeset	245 ;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	246 end
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	247 function room_mt:get_disco_items(stanza)
2035 b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	248 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	249 for room_jid in pairs(self._occupants) do
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	250 reply:tag("item", {jid = room_jid, name = room_jid:match("/(.*)")}):up();
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	251 end
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	252 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	253 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	254 function room_mt:set_subject(current_nick, subject)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	255 -- TODO check nick's authority
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	256 if subject == "" then subject = nil; end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	257 self._data['subject'] = subject;
3393 5b8de0731c4d MUC: Store the nick (full room JID) which set the subject, and send subject to occupants from that JID. Waqas Hussain <waqas20@gmail.com> parents: 3361 diff changeset	258 self._data['subject_from'] = current_nick;
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	259 if self.save then self:save(); end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	260 local msg = st.message({type='groupchat', from=current_nick})
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	261 :tag('subject'):text(subject):up();
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	262 self:broadcast_message(msg, false);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	263 return true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	264 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	265
2529 7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	266 local function build_unavailable_presence_from_error(stanza)
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	267 local type, condition, text = stanza:get_error();
3506 0f46acca11cc MUC: Fixed traceback on presence errors lacking a condition. Waqas Hussain <waqas20@gmail.com> parents: 3446 diff changeset	268 local error_message = "Kicked: "..(condition and condition:gsub("%-", " ") or "presence error");
2529 7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	269 if text then
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	270 error_message = error_message..": "..text;
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	271 end
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	272 return st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to})
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	273 :tag('status'):text(error_message);
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	274 end
7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	275
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	276 function room_mt:set_name(name)
3510 711eb5bf94b4 MUC: Make the room node be the default room name (thanks Zash). Waqas Hussain <waqas20@gmail.com> parents: 3509 diff changeset	277 if name == "" or type(name) ~= "string" or name == (jid_split(self.jid)) then name = nil; end
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	278 if self._data.name ~= name then
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	279 self._data.name = name;
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	280 if self.save then self:save(true); end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	281 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	282 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	283 function room_mt:get_name()
3510 711eb5bf94b4 MUC: Make the room node be the default room name (thanks Zash). Waqas Hussain <waqas20@gmail.com> parents: 3509 diff changeset	284 return self._data.name or jid_split(self.jid);
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	285 end
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	286 function room_mt:set_description(description)
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	287 if description == "" or type(description) ~= "string" then description = nil; end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	288 if self._data.description ~= description then
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	289 self._data.description = description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	290 if self.save then self:save(true); end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	291 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	292 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	293 function room_mt:get_description()
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	294 return self._data.description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	295 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	296 function room_mt:set_password(password)
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	297 if password == "" or type(password) ~= "string" then password = nil; end
3249 95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	298 if self._data.password ~= password then
95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	299 self._data.password = password;
95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	300 if self.save then self:save(true); end
95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	301 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	302 end
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	303 function room_mt:get_password()
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	304 return self._data.password;
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	305 end
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	306 function room_mt:set_moderated(moderated)
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	307 moderated = moderated and true or nil;
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	308 if self._data.moderated ~= moderated then
3252 22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	309 self._data.moderated = moderated;
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	310 if self.save then self:save(true); end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	311 end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	312 end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	313 function room_mt:is_moderated()
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	314 return self._data.moderated;
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	315 end
3254 a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	316 function room_mt:set_members_only(members_only)
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	317 members_only = members_only and true or nil;
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	318 if self._data.members_only ~= members_only then
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	319 self._data.members_only = members_only;
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	320 if self.save then self:save(true); end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	321 end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	322 end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	323 function room_mt:is_members_only()
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	324 return self._data.members_only;
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	325 end
3258 bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	326 function room_mt:set_persistent(persistent)
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	327 persistent = persistent and true or nil;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	328 if self._data.persistent ~= persistent then
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	329 self._data.persistent = persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	330 if self.save then self:save(true); end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	331 end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	332 end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	333 function room_mt:is_persistent()
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	334 return self._data.persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	335 end
3261 fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	336 function room_mt:set_hidden(hidden)
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	337 hidden = hidden and true or nil;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	338 if self._data.hidden ~= hidden then
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	339 self._data.hidden = hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	340 if self.save then self:save(true); end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	341 end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	342 end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	343 function room_mt:is_hidden()
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	344 return self._data.hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	345 end
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	346 function room_mt:set_changesubject(changesubject)
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	347 changesubject = changesubject and true or nil;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	348 if self._data.changesubject ~= changesubject then
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	349 self._data.changesubject = changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	350 if self.save then self:save(true); end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	351 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	352 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	353 function room_mt:get_changesubject()
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	354 return self._data.changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	355 end
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	356 function room_mt:get_historylength()
4785 36234dc4b177 mod_muc/muc.lib: Fall back to default_history_length if no length in config Matthew Wild <mwild1@gmail.com> parents: 4766 diff changeset	357 return self._data.history_length or default_history_length;
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	358 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	359 function room_mt:set_historylength(length)
5195 ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	360 length = math.min(tonumber(length) or default_history_length, max_history_length or math.huge);
4876 fa41d05ee7ef muc.lib: room:set_historylength(): Condense code, and don't store length when equal to default Matthew Wild <mwild1@gmail.com> parents: 4875 diff changeset	361 if length == default_history_length then
fa41d05ee7ef muc.lib: room:set_historylength(): Condense code, and don't store length when equal to default Matthew Wild <mwild1@gmail.com> parents: 4875 diff changeset	362 length = nil;
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	363 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	364 self._data.history_length = length;
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	365 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	366
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	367
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	368 local function construct_stanza_id(room, stanza)
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	369 local from_jid, to_nick = stanza.attr.from, stanza.attr.to;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	370 local from_nick = room._jid_nick[from_jid];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	371 local occupant = room._occupants[to_nick];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	372 local to_jid = occupant.jid;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	373
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	374 return from_nick, to_jid, base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from_jid));
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	375 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	376 local function deconstruct_stanza_id(room, stanza)
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	377 local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to;
6923 f755e0bdc60a muc.lib: Fix pattern so that it doesn't match hashes containing null bytes, causing dropped stanzas (thanks Jitsi folk!) Matthew Wild <mwild1@gmail.com> parents: 6049 diff changeset	378 local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$");
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	379 local from_nick = room._jid_nick[from_jid];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	380
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	381 if not(from_nick) then return; end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	382 if not(from_jid_possiblybare == from_jid or from_jid_possiblybare == jid_bare(from_jid)) then return; end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	383
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	384 local occupant = room._occupants[to_nick];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	385 for to_jid in pairs(occupant and occupant.sessions or {}) do
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	386 if md5(to_jid) == to_jid_hash then
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	387 return from_nick, to_jid, id;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	388 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	389 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	390 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	391
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	392
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	393 function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	394 local from, to = stanza.attr.from, stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	395 local room = jid_bare(to);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	396 local current_nick = self._jid_nick[from];
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	397 local type = stanza.attr.type;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	398 log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag());
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	399 if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	400 if stanza.name == "presence" then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	401 local pr = get_filtered_presence(stanza);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	402 pr.attr.from = current_nick;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	403 if type == "error" then -- error, kick em out!
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	404 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	405 log("debug", "kicking %s from %s", current_nick, room);
2529 7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	406 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	407 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	408 elseif type == "unavailable" then -- unavailable
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	409 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	410 log("debug", "%s leaving %s", current_nick, room);
4424 1cbf3744300c MUC: Fix a possible stack overflow (when a local component joins a room, then disconnects, an unavailble-error presence cycle can occur). Waqas Hussain <waqas20@gmail.com> parents: 4357 diff changeset	411 self._jid_nick[from] = nil;
1826 de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	412 local occupant = self._occupants[current_nick];
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	413 local new_jid = next(occupant.sessions);
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	414 if new_jid == from then new_jid = next(occupant.sessions, new_jid); end
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	415 if new_jid then
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	416 local jid = occupant.jid;
1826 de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	417 occupant.jid = new_jid;
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	418 occupant.sessions[from] = nil;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	419 pr.attr.to = from;
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	420 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
2053 f5a198127dd3 MUC: Fixed: affiliation='none' was omitted from some presence broadcasts. Waqas Hussain <waqas20@gmail.com> parents: 2051 diff changeset	421 :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up()
3989 84792db89336 MUC: Fix a pair of missing :up() Kim Alvefur <zash@zash.se> parents: 3632 diff changeset	422 :tag("status", {code='110'}):up();
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	423 self:_route_stanza(pr);
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	424 if jid ~= new_jid then
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	425 pr = st.clone(occupant.sessions[new_jid])
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	426 :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
2053 f5a198127dd3 MUC: Fixed: affiliation='none' was omitted from some presence broadcasts. Waqas Hussain <waqas20@gmail.com> parents: 2051 diff changeset	427 :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"});
2051 2567f4bf0085 MUC: Fixed an issue with multi-session nicks where the 'from' attribute in a presence broadcast was not being properly set. Waqas Hussain <waqas20@gmail.com> parents: 2035 diff changeset	428 pr.attr.from = current_nick;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	429 self:broadcast_except_nick(pr, current_nick);
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	430 end
1826 de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	431 else
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	432 occupant.role = 'none';
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	433 self:broadcast_presence(pr, from);
1826 de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	434 self._occupants[current_nick] = nil;
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	435 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	436 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	437 elseif not type then -- available
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	438 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	439 --if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	440 if current_nick == to then -- simple presence
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	441 log("debug", "%s broadcasted presence", current_nick);
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	442 self._occupants[current_nick].sessions[from] = pr;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	443 self:broadcast_presence(pr, from);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	444 else -- change nick
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	445 local occupant = self._occupants[current_nick];
2008 6b6b924ee558 MUC: Re-enable nick changes for non-multisession nicks. Waqas Hussain <waqas20@gmail.com> parents: 2006 diff changeset	446 local is_multisession = next(occupant.sessions, next(occupant.sessions));
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	447 if self._occupants[to] or is_multisession then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	448 log("debug", "%s couldn't change nick", current_nick);
1818 a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	449 local reply = st.error_reply(stanza, "cancel", "conflict"):up();
a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	450 reply.tags[1].attr.code = "409";
a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	451 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	452 else
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	453 local data = self._occupants[current_nick];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	454 local to_nick = select(3, jid_split(to));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	455 if to_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	456 log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	457 local p = st.presence({type='unavailable', from=current_nick});
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	458 self:broadcast_presence(p, from, '303', to_nick);
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	459 self._occupants[current_nick] = nil;
393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	460 self._occupants[to] = data;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	461 self._jid_nick[from] = to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	462 pr.attr.from = to;
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	463 self._occupants[to].sessions[from] = pr;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	464 self:broadcast_presence(pr, from);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	465 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	466 --TODO malformed-jid
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	467 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	468 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	469 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	470 --else -- possible rejoin
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	471 -- log("debug", "%s had connection replaced", current_nick);
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	472 -- self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to})
81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	473 -- :tag('status'):text('Replaced by new connection'):up()); -- send unavailable
81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	474 -- self:handle_to_occupant(origin, stanza); -- resend available
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	475 --end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	476 else -- enter room
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	477 local new_nick = to;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	478 local is_merge;
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	479 if self._occupants[to] then
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	480 if jid_bare(from) ~= jid_bare(self._occupants[to].jid) then
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	481 new_nick = nil;
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	482 end
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	483 is_merge = true;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	484 end
3245 a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	485 local password = stanza:get_child("x", "http://jabber.org/protocol/muc");
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	486 password = password and password:get_child("password", "http://jabber.org/protocol/muc");
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	487 password = password and password[1] ~= "" and password[1];
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	488 if self:get_password() and self:get_password() ~= password then
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	489 log("debug", "%s couldn't join due to invalid password: %s", from, to);
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	490 local reply = st.error_reply(stanza, "auth", "not-authorized"):up();
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	491 reply.tags[1].attr.code = "401";
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	492 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	493 elseif not new_nick then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	494 log("debug", "%s couldn't join due to nick conflict: %s", from, to);
1818 a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	495 local reply = st.error_reply(stanza, "cancel", "conflict"):up();
a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	496 reply.tags[1].attr.code = "409";
a394e0bd4847 MUC: Added legacy error codes to nickname conflict presence errors. Waqas Hussain <waqas20@gmail.com> parents: 1808 diff changeset	497 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	498 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	499 log("debug", "%s joining as %s", from, to);
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	500 if not next(self._affiliations) then -- new room, no owners
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	501 self._affiliations[jid_bare(from)] = "owner";
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	502 end
1740 b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	503 local affiliation = self:get_affiliation(from);
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	504 local role = self:get_default_role(affiliation)
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	505 if role then -- new occupant
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	506 if not is_merge then
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	507 self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}};
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	508 else
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	509 self._occupants[to].sessions[from] = get_filtered_presence(stanza);
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	510 end
1740 b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	511 self._jid_nick[from] = to;
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	512 self:send_occupant_list(from);
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	513 pr.attr.from = to;
3593 58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	514 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	515 :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up();
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	516 if not is_merge then
3593 58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	517 self:broadcast_except_nick(pr, to);
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	518 end
3989 84792db89336 MUC: Fix a pair of missing :up() Kim Alvefur <zash@zash.se> parents: 3632 diff changeset	519 pr:tag("status", {code='110'}):up();
3593 58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	520 if self._data.whois == 'anyone' then
58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	521 pr:tag("status", {code='100'}):up();
58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	522 end
58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	523 pr.attr.to = from;
58a4af582eb3 MUC: Only send status code 110 (entering non-anonymous room) to the occupant themselves, not to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 3592 diff changeset	524 self:_route_stanza(pr);
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	525 self:send_history(from, stanza);
3445 2fde9cb97f76 MUC: Return correct error to non-members attempting to enter a members-only room. Waqas Hussain <waqas20@gmail.com> parents: 3393 diff changeset	526 elseif not affiliation then -- registration required for entering members-only room
2fde9cb97f76 MUC: Return correct error to non-members attempting to enter a members-only room. Waqas Hussain <waqas20@gmail.com> parents: 3393 diff changeset	527 local reply = st.error_reply(stanza, "auth", "registration-required"):up();
2fde9cb97f76 MUC: Return correct error to non-members attempting to enter a members-only room. Waqas Hussain <waqas20@gmail.com> parents: 3393 diff changeset	528 reply.tags[1].attr.code = "407";
2fde9cb97f76 MUC: Return correct error to non-members attempting to enter a members-only room. Waqas Hussain <waqas20@gmail.com> parents: 3393 diff changeset	529 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
1740 b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	530 else -- banned
1819 ed1911be26c7 MUC: Added legacy error code to the presence error returned when a banned user attempts to join. Waqas Hussain <waqas20@gmail.com> parents: 1818 diff changeset	531 local reply = st.error_reply(stanza, "auth", "forbidden"):up();
ed1911be26c7 MUC: Added legacy error code to the presence error returned when a banned user attempts to join. Waqas Hussain <waqas20@gmail.com> parents: 1818 diff changeset	532 reply.tags[1].attr.code = "403";
ed1911be26c7 MUC: Added legacy error code to the presence error returned when a banned user attempts to join. Waqas Hussain <waqas20@gmail.com> parents: 1818 diff changeset	533 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	534 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	535 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	536 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	537 elseif type ~= 'result' then -- bad type
1998 40792c18a8e4 MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd). Waqas Hussain <waqas20@gmail.com> parents: 1997 diff changeset	538 if type ~= 'visible' and type ~= 'invisible' then -- COMPAT ejabberd can broadcast or forward XEP-0018 presences
40792c18a8e4 MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd). Waqas Hussain <waqas20@gmail.com> parents: 1997 diff changeset	539 origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
40792c18a8e4 MUC: Ignore invisible presence (incorrectly broadcasted or forwarded by ejabberd). Waqas Hussain <waqas20@gmail.com> parents: 1997 diff changeset	540 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	541 end
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	542 elseif not current_nick then -- not in room
5144 a30507061526 MUC: Fix traceback caused by faulty logic precedence. (thanks waqas, nulani) Kim Alvefur <zash@zash.se> parents: 5086 diff changeset	543 if (type == "error" or type == "result") and stanza.name == "iq" then
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	544 local id = stanza.attr.id;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	545 stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza);
5086 1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	546 if stanza.attr.id then
1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	547 self:_route_stanza(stanza);
1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	548 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	549 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
5294 87f07dd0bbfb MUC: Don't reply to errors (thanks iron) Kim Alvefur <zash@zash.se> parents: 5241 diff changeset	550 elseif type ~= "error" then
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	551 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	552 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	553 elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	554 origin.send(st.error_reply(stanza, "modify", "bad-request"));
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	555 elseif current_nick and stanza.name == "message" and type == "error" and is_kickable_error(stanza) then
1996 3e6b36c6d7b7 MUC: Kick occupants on sending error messages to other occupants. Waqas Hussain <waqas20@gmail.com> parents: 1989 diff changeset	556 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
2529 7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	557 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	558 else -- private stanza
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	559 local o_data = self._occupants[to];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	560 if o_data then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	561 log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid);
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	562 if stanza.name == "iq" then
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	563 local id = stanza.attr.id;
5078 cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	564 if stanza.attr.type == "get" or stanza.attr.type == "set" then
cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	565 stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza);
cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	566 else
cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	567 stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza);
cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	568 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	569 if type == 'get' and stanza.tags[1].attr.xmlns == 'vcard-temp' then
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	570 stanza.attr.to = jid_bare(stanza.attr.to);
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	571 end
5086 1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	572 if stanza.attr.id then
1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	573 self:_route_stanza(stanza);
1ef9aa0c9fb0 MUC: Fix a traceback caused by private IQ result and error stanzas where the encoded id can't be processed. Waqas Hussain <waqas20@gmail.com> parents: 5078 diff changeset	574 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	575 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	576 else -- message
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	577 stanza.attr.from = current_nick;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	578 for jid in pairs(o_data.sessions) do
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	579 stanza.attr.to = jid;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	580 self:_route_stanza(stanza);
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	581 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	582 stanza.attr.from, stanza.attr.to = from, to;
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	583 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	584 elseif type ~= "error" and type ~= "result" then -- recipient not in room
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	585 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	586 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	587 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	588 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	589
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	590 function room_mt:send_form(origin, stanza)
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	591 origin.send(st.reply(stanza):query("http://jabber.org/protocol/muc#owner")
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	592 :add_child(self:get_form_layout():form())
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	593 );
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	594 end
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	595
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	596 function room_mt:get_form_layout()
5541 1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	597 local form = dataform.new({
1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	598 title = "Configuration for "..self.jid,
1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	599 instructions = "Complete and submit this form to configure the room.",
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	600 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	601 name = 'FORM_TYPE',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	602 type = 'hidden',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	603 value = 'http://jabber.org/protocol/muc#roomconfig'
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	604 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	605 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	606 name = 'muc#roomconfig_roomname',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	607 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	608 label = 'Name',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	609 value = self:get_name() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	610 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	611 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	612 name = 'muc#roomconfig_roomdesc',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	613 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	614 label = 'Description',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	615 value = self:get_description() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	616 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	617 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	618 name = 'muc#roomconfig_persistentroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	619 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	620 label = 'Make Room Persistent?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	621 value = self:is_persistent()
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	622 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	623 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	624 name = 'muc#roomconfig_publicroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	625 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	626 label = 'Make Room Publicly Searchable?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	627 value = not self:is_hidden()
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	628 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	629 {
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	630 name = 'muc#roomconfig_changesubject',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	631 type = 'boolean',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	632 label = 'Allow Occupants to Change Subject?',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	633 value = self:get_changesubject()
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	634 },
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	635 {
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	636 name = 'muc#roomconfig_whois',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	637 type = 'list-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	638 label = 'Who May Discover Real JIDs?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	639 value = {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	640 { value = 'moderators', label = 'Moderators Only', default = self._data.whois == 'moderators' },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	641 { value = 'anyone', label = 'Anyone', default = self._data.whois == 'anyone' }
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	642 }
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	643 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	644 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	645 name = 'muc#roomconfig_roomsecret',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	646 type = 'text-private',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	647 label = 'Password',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	648 value = self:get_password() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	649 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	650 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	651 name = 'muc#roomconfig_moderatedroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	652 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	653 label = 'Make Room Moderated?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	654 value = self:is_moderated()
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	655 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	656 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	657 name = 'muc#roomconfig_membersonly',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	658 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	659 label = 'Make Room Members-Only?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	660 value = self:is_members_only()
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	661 },
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	662 {
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	663 name = 'muc#roomconfig_historylength',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	664 type = 'text-single',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	665 label = 'Maximum Number of History Messages Returned by Room',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	666 value = tostring(self:get_historylength())
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	667 }
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	668 });
5541 1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	669 return module:fire_event("muc-config-form", { room = self, form = form }) or form;
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	670 end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	671
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	672 local valid_whois = {
3540 bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3517 diff changeset	673 moderators = true,
bc139431830b Monster whitespace commit (beware the whitespace monster). Waqas Hussain <waqas20@gmail.com> parents: 3517 diff changeset	674 anyone = true,
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	675 }
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	676
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	677 function room_mt:process_form(origin, stanza)
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	678 local query = stanza.tags[1];
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	679 local form;
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	680 for _, tag in ipairs(query.tags) do if tag.name == "x" and tag.attr.xmlns == "jabber:x:data" then form = tag; break; end end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	681 if not form then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); return; end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	682 if form.attr.type == "cancel" then origin.send(st.reply(stanza)); return; end
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	683 if form.attr.type ~= "submit" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Not a submitted form")); return; end
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	684
7383 69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	685 if form.tags[1] == nil then
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	686 -- instant room
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	687 if self.save then self:save(true); end
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	688 origin.send(st.reply(stanza));
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	689 return true;
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	690 end
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	691
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	692
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	693 local fields = self:get_form_layout():data(form);
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	694 if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration")); return; end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	695
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	696 local dirty = false
e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	697
5541 1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	698 local event = { room = self, fields = fields, changed = dirty };
1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	699 module:fire_event("muc-config-submitted", event);
1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	700 dirty = event.changed or dirty;
1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	701
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	702 local name = fields['muc#roomconfig_roomname'];
3629 856e42b38bb0 MUC: Change room name and description properly Kim Alvefur <zash@zash.se> parents: 3611 diff changeset	703 if name ~= self:get_name() then
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	704 self:set_name(name);
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	705 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	706
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	707 local description = fields['muc#roomconfig_roomdesc'];
3629 856e42b38bb0 MUC: Change room name and description properly Kim Alvefur <zash@zash.se> parents: 3611 diff changeset	708 if description ~= self:get_description() then
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	709 self:set_description(description);
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	710 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	711
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	712 local persistent = fields['muc#roomconfig_persistentroom'];
3259 a5b9209efb23 MUC: Replaced direct access of room's internal persistence state with :set_persistent(boolean) and :is_persistent() in various functions. Waqas Hussain <waqas20@gmail.com> parents: 3258 diff changeset	713 dirty = dirty or (self:is_persistent() ~= persistent)
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	714 module:log("debug", "persistent=%s", tostring(persistent));
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	715
3252 22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	716 local moderated = fields['muc#roomconfig_moderatedroom'];
22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	717 dirty = dirty or (self:is_moderated() ~= moderated)
22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	718 module:log("debug", "moderated=%s", tostring(moderated));
22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	719
3256 d96172f78ec2 MUC: Added a 'Make Room Members-Only?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3255 diff changeset	720 local membersonly = fields['muc#roomconfig_membersonly'];
d96172f78ec2 MUC: Added a 'Make Room Members-Only?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3255 diff changeset	721 dirty = dirty or (self:is_members_only() ~= membersonly)
d96172f78ec2 MUC: Added a 'Make Room Members-Only?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3255 diff changeset	722 module:log("debug", "membersonly=%s", tostring(membersonly));
d96172f78ec2 MUC: Added a 'Make Room Members-Only?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3255 diff changeset	723
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	724 local public = fields['muc#roomconfig_publicroom'];
3262 330010ef078f MUC: Updated code to use :set_hidden() and :is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3261 diff changeset	725 dirty = dirty or (self:is_hidden() ~= (not public and true or nil))
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	726
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	727 local changesubject = fields['muc#roomconfig_changesubject'];
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	728 dirty = dirty or (self:get_changesubject() ~= (not changesubject and true or nil))
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	729 module:log('debug', 'changesubject=%s', changesubject and "true" or "false")
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	730
4875 f9fe28461101 MUC: Fix check for history length update. Waqas Hussain <waqas20@gmail.com> parents: 4874 diff changeset	731 local historylength = tonumber(fields['muc#roomconfig_historylength']);
f9fe28461101 MUC: Fix check for history length update. Waqas Hussain <waqas20@gmail.com> parents: 4874 diff changeset	732 dirty = dirty or (historylength and (self:get_historylength() ~= historylength));
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	733 module:log('debug', 'historylength=%s', historylength)
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	734
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	735
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	736 local whois = fields['muc#roomconfig_whois'];
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	737 if not valid_whois[whois] then
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	738 origin.send(st.error_reply(stanza, 'cancel', 'bad-request', "Invalid value for 'whois'"));
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	739 return;
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	740 end
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	741 local whois_changed = self._data.whois ~= whois
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	742 self._data.whois = whois
3281 fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	743 module:log('debug', 'whois=%s', whois)
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	744
3248 f8d14ea3ad0e MUC: Added a password field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3247 diff changeset	745 local password = fields['muc#roomconfig_roomsecret'];
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	746 if self:get_password() ~= password then
3248 f8d14ea3ad0e MUC: Added a password field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3247 diff changeset	747 self:set_password(password);
f8d14ea3ad0e MUC: Added a password field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3247 diff changeset	748 end
3252 22062c50eabe MUC: Added a 'Make Room Moderated?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3251 diff changeset	749 self:set_moderated(moderated);
3256 d96172f78ec2 MUC: Added a 'Make Room Members-Only?' field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3255 diff changeset	750 self:set_members_only(membersonly);
3259 a5b9209efb23 MUC: Replaced direct access of room's internal persistence state with :set_persistent(boolean) and :is_persistent() in various functions. Waqas Hussain <waqas20@gmail.com> parents: 3258 diff changeset	751 self:set_persistent(persistent);
3262 330010ef078f MUC: Updated code to use :set_hidden() and :is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3261 diff changeset	752 self:set_hidden(not public);
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	753 self:set_changesubject(changesubject);
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	754 self:set_historylength(historylength);
3248 f8d14ea3ad0e MUC: Added a password field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3247 diff changeset	755
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	756 if self.save then self:save(true); end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	757 origin.send(st.reply(stanza));
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	758
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	759 if dirty or whois_changed then
3592 3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	760 local msg = st.message({type='groupchat', from=self.jid})
7011 2d5751b2f21c MUC: Fix incorrect nesting of status codes when room config changes (fixes #579) Matthew Wild <mwild1@gmail.com> parents: 6923 diff changeset	761 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'});
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	762
3592 3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	763 if dirty then
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	764 msg.tags[1]:tag('status', {code = '104'}):up();
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	765 end
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	766 if whois_changed then
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	767 local code = (whois == 'moderators') and "173" or "172";
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	768 msg.tags[1]:tag('status', {code = code}):up();
3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	769 end
7011 2d5751b2f21c MUC: Fix incorrect nesting of status codes when room config changes (fixes #579) Matthew Wild <mwild1@gmail.com> parents: 6923 diff changeset	770 msg:up();
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	771
3592 3adac5780c5a MUC: Added some more missing :up()s to the stanza building for presence broadcasts (thanks again Zash). Waqas Hussain <waqas20@gmail.com> parents: 3591 diff changeset	772 self:broadcast_message(msg, false)
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	773 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	774 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	775
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	776 function room_mt:destroy(newjid, reason, password)
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	777 local pr = st.presence({type = "unavailable"})
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	778 :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	779 :tag("item", { affiliation='none', role='none' }):up()
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	780 :tag("destroy", {jid=newjid})
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	781 if reason then pr:tag("reason"):text(reason):up(); end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	782 if password then pr:tag("password"):text(password):up(); end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	783 for nick, occupant in pairs(self._occupants) do
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	784 pr.attr.from = nick;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	785 for jid in pairs(occupant.sessions) do
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	786 pr.attr.to = jid;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	787 self:_route_stanza(pr);
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	788 self._jid_nick[jid] = nil;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	789 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	790 self._occupants[nick] = nil;
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	791 end
3259 a5b9209efb23 MUC: Replaced direct access of room's internal persistence state with :set_persistent(boolean) and :is_persistent() in various functions. Waqas Hussain <waqas20@gmail.com> parents: 3258 diff changeset	792 self:set_persistent(false);
5577 8b09b0d068d4 mod_muc: Fire muc-room-created and muc-room-destroyed events (thanks nik) Matthew Wild <mwild1@gmail.com> parents: 5542 diff changeset	793 module:fire_event("muc-room-destroyed", { room = self });
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	794 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	795
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	796 function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	797 local type = stanza.attr.type;
1745 15039fac3693 MUC: Some fixes for minor bugs in IQ handling. Waqas Hussain <waqas20@gmail.com> parents: 1744 diff changeset	798 local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	799 if stanza.name == "iq" then
5335 bb81c13d2c6f MUC: Always return <service-unavailable/> when a node is present in service discovery requests. Waqas Hussain <waqas20@gmail.com> parents: 5334 diff changeset	800 if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" and not stanza.tags[1].attr.node then
bb81c13d2c6f MUC: Always return <service-unavailable/> when a node is present in service discovery requests. Waqas Hussain <waqas20@gmail.com> parents: 5334 diff changeset	801 origin.send(self:get_disco_info(stanza));
bb81c13d2c6f MUC: Always return <service-unavailable/> when a node is present in service discovery requests. Waqas Hussain <waqas20@gmail.com> parents: 5334 diff changeset	802 elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" and not stanza.tags[1].attr.node then
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	803 origin.send(self:get_disco_items(stanza));
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	804 elseif xmlns == "http://jabber.org/protocol/muc#admin" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	805 local actor = stanza.attr.from;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	806 local affiliation = self:get_affiliation(actor);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	807 local current_nick = self._jid_nick[actor];
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	808 local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	809 local item = stanza.tags[1].tags[1];
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	810 if item and item.name == "item" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	811 if type == "set" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	812 local callback = function() origin.send(st.reply(stanza)); end
1862 115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	813 if item.attr.jid then -- Validate provided JID
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	814 item.attr.jid = jid_prep(item.attr.jid);
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	815 if not item.attr.jid then
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	816 origin.send(st.error_reply(stanza, "modify", "jid-malformed"));
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	817 return;
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	818 end
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	819 end
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	820 if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	821 local occupant = self._occupants[self.jid.."/"..item.attr.nick];
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	822 if occupant then item.attr.jid = occupant.jid; end
2864 1ce0e2ceb419 MUC: Allow role changes based on JIDs. Waqas Hussain <waqas20@gmail.com> parents: 2845 diff changeset	823 elseif not item.attr.nick and item.attr.jid then
1ce0e2ceb419 MUC: Allow role changes based on JIDs. Waqas Hussain <waqas20@gmail.com> parents: 2845 diff changeset	824 local nick = self._jid_nick[item.attr.jid];
1ce0e2ceb419 MUC: Allow role changes based on JIDs. Waqas Hussain <waqas20@gmail.com> parents: 2845 diff changeset	825 if nick then item.attr.nick = select(3, jid_split(nick)); end
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	826 end
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	827 local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	828 if item.attr.affiliation and item.attr.jid and not item.attr.role then
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	829 local success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, callback, reason);
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	830 if not success then origin.send(st.error_reply(stanza, errtype, err)); end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	831 elseif item.attr.role and item.attr.nick and not item.attr.affiliation then
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	832 local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback, reason);
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	833 if not success then origin.send(st.error_reply(stanza, errtype, err)); end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	834 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	835 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	836 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	837 elseif type == "get" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	838 local _aff = item.attr.affiliation;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	839 local _rol = item.attr.role;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	840 if _aff and not _rol then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	841 if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin") then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	842 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	843 for jid, affiliation in pairs(self._affiliations) do
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	844 if affiliation == _aff then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	845 reply:tag("item", {affiliation = _aff, jid = jid}):up();
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	846 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	847 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	848 origin.send(reply);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	849 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	850 origin.send(st.error_reply(stanza, "auth", "forbidden"));
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	851 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	852 elseif _rol and not _aff then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	853 if role == "moderator" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	854 -- TODO allow admins and owners not in room? Provide read-only access to everyone who can see the participants anyway?
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	855 if _rol == "none" then _rol = nil; end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	856 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	857 for occupant_jid, occupant in pairs(self._occupants) do
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	858 if occupant.role == _rol then
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	859 reply:tag("item", {
f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	860 nick = select(3, jid_split(occupant_jid)),
f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	861 role = _rol or "none",
f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	862 affiliation = occupant.affiliation or "none",
f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	863 jid = occupant.jid
f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	864 }):up();
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	865 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	866 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	867 origin.send(reply);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	868 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	869 origin.send(st.error_reply(stanza, "auth", "forbidden"));
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	870 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	871 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	872 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	873 end
1744 265863a5612b MUC: Added support for requesting various lists (owner, admin, voice, etc). Waqas Hussain <waqas20@gmail.com> parents: 1743 diff changeset	874 end
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	875 elseif type == "set" or type == "get" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	876 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	877 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	878 elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	879 if self:get_affiliation(stanza.attr.from) ~= "owner" then
4201 9a8d2baf7a9c MUC: Add a textual error message when the user isn't allowed to get/set config form. Waqas Hussain <waqas20@gmail.com> parents: 4119 diff changeset	880 origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	881 elseif stanza.attr.type == "get" then
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	882 self:send_form(origin, stanza);
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	883 elseif stanza.attr.type == "set" then
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	884 local child = stanza.tags[1].tags[1];
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	885 if not child then
4326 6c082bf9bf0f MUC: Change error type of badly-formatted stanza from 'auth' to 'modify' (thanks Andrew) Matthew Wild <mwild1@gmail.com> parents: 4266 diff changeset	886 origin.send(st.error_reply(stanza, "modify", "bad-request"));
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	887 elseif child.name == "destroy" then
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	888 local newjid = child.attr.jid;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	889 local reason, password;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	890 for _,tag in ipairs(child.tags) do
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	891 if tag.name == "reason" then
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	892 reason = #tag.tags == 0 and tag[1];
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	893 elseif tag.name == "password" then
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	894 password = #tag.tags == 0 and tag[1];
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	895 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	896 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	897 self:destroy(newjid, reason, password);
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	898 origin.send(st.reply(stanza));
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	899 else
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	900 self:process_form(origin, stanza);
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	901 end
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	902 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	903 elseif type == "set" or type == "get" then
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	904 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	905 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	906 elseif stanza.name == "message" and type == "groupchat" then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	907 local from, to = stanza.attr.from, stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	908 local current_nick = self._jid_nick[from];
2173 f9af31dbfeb8 MUC: Prevent visitors from broadcasting messages. Waqas Hussain <waqas20@gmail.com> parents: 2172 diff changeset	909 local occupant = self._occupants[current_nick];
f9af31dbfeb8 MUC: Prevent visitors from broadcasting messages. Waqas Hussain <waqas20@gmail.com> parents: 2172 diff changeset	910 if not occupant then -- not in room
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	911 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
2173 f9af31dbfeb8 MUC: Prevent visitors from broadcasting messages. Waqas Hussain <waqas20@gmail.com> parents: 2172 diff changeset	912 elseif occupant.role == "visitor" then
4999 d5a3c5c1873c mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303 Matthew Wild <mwild1@gmail.com> parents: 4876 diff changeset	913 origin.send(st.error_reply(stanza, "auth", "forbidden"));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	914 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	915 local from = stanza.attr.from;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	916 stanza.attr.from = current_nick;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	917 local subject = getText(stanza, {"subject"});
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	918 if subject then
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	919 if occupant.role == "moderator" or
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	920 ( self._data.changesubject and occupant.role == "participant" ) then -- and participant
2174 13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	921 self:set_subject(current_nick, subject); -- TODO use broadcast_message_stanza
13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	922 else
13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	923 stanza.attr.from = from;
4999 d5a3c5c1873c mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with type 'cancel' - fixes #303 Matthew Wild <mwild1@gmail.com> parents: 4876 diff changeset	924 origin.send(st.error_reply(stanza, "auth", "forbidden"));
2174 13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	925 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	926 else
5397 ed55a48270be mod_muc/muc.lib: Don't add messages without a body (such as chat state notifications) to the room history (thanks louiz’, Link Mauve, poezio and all its users) Matthew Wild <mwild1@gmail.com> parents: 5335 diff changeset	927 self:broadcast_message(stanza, self:get_historylength() > 0 and stanza:get_child("body"));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	928 end
2172 84dd0fada45b MUC: Improved handling of incoming groupchat messages (state preserved for possible later use). Waqas Hussain <waqas20@gmail.com> parents: 2064 diff changeset	929 stanza.attr.from = from;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	930 end
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	931 elseif stanza.name == "message" and type == "error" and is_kickable_error(stanza) then
1768 802c40384dd0 MUC: Don't kick on errors in private messages. Waqas Hussain <waqas20@gmail.com> parents: 1764 diff changeset	932 local current_nick = self._jid_nick[stanza.attr.from];
802c40384dd0 MUC: Don't kick on errors in private messages. Waqas Hussain <waqas20@gmail.com> parents: 1764 diff changeset	933 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
2529 7968e8b3ecf9 MUC: Fixes and refactoring for the previous commit to work in all cases, text of error stanzas is now broadcast Matthew Wild <mwild1@gmail.com> parents: 2528 diff changeset	934 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	935 elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	936 local to = stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	937 local current_nick = self._jid_nick[stanza.attr.from];
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	938 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	939 stanza.attr.to = current_nick;
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	940 self:handle_to_occupant(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	941 stanza.attr.to = to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	942 elseif type ~= "error" and type ~= "result" then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	943 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	944 end
5241 4516e6bd51b4 MUC: Support invite messages when stanza type is explicitly set to "normal" or to an unknown value. Waqas Hussain <waqas20@gmail.com> parents: 5195 diff changeset	945 elseif stanza.name == "message" and not(type == "chat" or type == "error" or type == "groupchat" or type == "headline") and #stanza.tags == 1
4516e6bd51b4 MUC: Support invite messages when stanza type is explicitly set to "normal" or to an unknown value. Waqas Hussain <waqas20@gmail.com> parents: 5195 diff changeset	946 and self._jid_nick[stanza.attr.from] and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" then
2005 478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	947 local x = stanza.tags[1];
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	948 local payload = (#x.tags == 1 and x.tags[1]);
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	949 if payload and payload.name == "invite" and payload.attr.to then
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	950 local _from, _to = stanza.attr.from, stanza.attr.to;
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	951 local _invitee = jid_prep(payload.attr.to);
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	952 if _invitee then
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	953 local _reason = payload.tags[1] and payload.tags[1].name == 'reason' and #payload.tags[1].tags == 0 and payload.tags[1][1];
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	954 local invite = st.message({from = _to, to = _invitee, id = stanza.attr.id})
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	955 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	956 :tag('invite', {from=_from})
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	957 :tag('reason'):text(_reason or ""):up()
3247 ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	958 :up();
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	959 if self:get_password() then
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	960 invite:tag("password"):text(self:get_password()):up();
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	961 end
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	962 invite:up()
2005 478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	963 :tag('x', {xmlns="jabber:x:conference", jid=_to}) -- COMPAT: Some older clients expect this
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	964 :text(_reason or "")
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	965 :up()
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	966 :tag('body') -- Add a plain message for clients which don't support invites
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	967 :text(_from..' invited you to the room '.._to..(_reason and (' ('.._reason..')') or ""))
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	968 :up();
3611 d58da6bb8a77 MUC: Grant membership when inviteing someone into a members-only room. Kim Alvefur <zash@zash.se> parents: 3593 diff changeset	969 if self:is_members_only() and not self:get_affiliation(_invitee) then
d58da6bb8a77 MUC: Grant membership when inviteing someone into a members-only room. Kim Alvefur <zash@zash.se> parents: 3593 diff changeset	970 log("debug", "%s invited %s into members only room %s, granting membership", _from, _invitee, _to);
d58da6bb8a77 MUC: Grant membership when inviteing someone into a members-only room. Kim Alvefur <zash@zash.se> parents: 3593 diff changeset	971 self:set_affiliation(_from, _invitee, "member", nil, "Invited by " .. self._jid_nick[_from])
d58da6bb8a77 MUC: Grant membership when inviteing someone into a members-only room. Kim Alvefur <zash@zash.se> parents: 3593 diff changeset	972 end
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	973 self:_route_stanza(invite);
2005 478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	974 else
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	975 origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	976 end
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	977 else
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	978 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
478ba7e85862 MUC: Rewrote code for mediated invites to be more robust, and to support legacy clients. Waqas Hussain <waqas20@gmail.com> parents: 1999 diff changeset	979 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	980 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	981 if type == "error" or type == "result" then return; end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	982 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	983 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	984 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	985
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	986 function room_mt:handle_stanza(origin, stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	987 local to_node, to_host, to_resource = jid_split(stanza.attr.to);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	988 if to_resource then
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	989 self:handle_to_occupant(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	990 else
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	991 self:handle_to_room(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	992 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	993 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	994
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	995 function room_mt:route_stanza(stanza) end -- Replace with a routing function, e.g., function(room, stanza) core_route_stanza(origin, stanza); end
81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	996
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	997 function room_mt:get_affiliation(jid)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	998 local node, host, resource = jid_split(jid);
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	999 local bare = node and node.."@"..host or host;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1000 local result = self._affiliations[bare]; -- Affiliations are granted, revoked, and maintained based on the user's bare JID.
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1001 if not result and self._affiliations[host] == "outcast" then result = "outcast"; end -- host banned
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1002 return result;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1003 end
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1004 function room_mt:set_affiliation(actor, jid, affiliation, callback, reason)
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1005 jid = jid_bare(jid);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1006 if affiliation == "none" then affiliation = nil; end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1007 if affiliation and affiliation ~= "outcast" and affiliation ~= "owner" and affiliation ~= "admin" and affiliation ~= "member" then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1008 return nil, "modify", "not-acceptable";
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1009 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1010 if actor ~= true then
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1011 local actor_affiliation = self:get_affiliation(actor);
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1012 local target_affiliation = self:get_affiliation(jid);
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1013 if target_affiliation == affiliation then -- no change, shortcut
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1014 if callback then callback(); end
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1015 return true;
4202 dff7df4a191b MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves if they are not the last owner. Waqas Hussain <waqas20@gmail.com> parents: 4201 diff changeset	1016 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1017 if actor_affiliation ~= "owner" then
5334 da7857891eb8 MUC: Fix affiliation check for admins, and bring it in line with the spec (thanks Maranda). Waqas Hussain <waqas20@gmail.com> parents: 5294 diff changeset	1018 if affiliation == "owner" or affiliation == "admin" or actor_affiliation ~= "admin" or target_affiliation == "owner" or target_affiliation == "admin" then
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1019 return nil, "cancel", "not-allowed";
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1020 end
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1021 elseif target_affiliation == "owner" and jid_bare(actor) == jid then -- self change
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1022 local is_last = true;
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1023 for j, aff in pairs(self._affiliations) do if j ~= jid and aff == "owner" then is_last = false; break; end end
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1024 if is_last then
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1025 return nil, "cancel", "conflict";
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1026 end
4202 dff7df4a191b MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves if they are not the last owner. Waqas Hussain <waqas20@gmail.com> parents: 4201 diff changeset	1027 end
dff7df4a191b MUC: Don't limit affiliation changes to owners, and allow owners to remove themselves if they are not the last owner. Waqas Hussain <waqas20@gmail.com> parents: 4201 diff changeset	1028 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1029 self._affiliations[jid] = affiliation;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1030 local role = self:get_default_role(affiliation);
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1031 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1032 :tag("item", {affiliation=affiliation or "none", role=role or "none"})
0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1033 :tag("reason"):text(reason or ""):up()
0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1034 :up();
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1035 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1036 if not role then -- getting kicked
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1037 presence_type = "unavailable";
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1038 if affiliation == "outcast" then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1039 x:tag("status", {code="301"}):up(); -- banned
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1040 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1041 x:tag("status", {code="321"}):up(); -- affiliation change
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1042 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1043 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1044 local modified_nicks = {};
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1045 for nick, occupant in pairs(self._occupants) do
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1046 if jid_bare(occupant.jid) == jid then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1047 if not role then -- getting kicked
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1048 self._occupants[nick] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1049 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1050 occupant.affiliation, occupant.role = affiliation, role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1051 end
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1052 for jid,pres in pairs(occupant.sessions) do -- remove for all sessions of the nick
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1053 if not role then self._jid_nick[jid] = nil; end
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1054 local p = st.clone(pres);
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1055 p.attr.from = nick;
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1056 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1057 p.attr.to = jid;
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1058 p:add_child(x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1059 self:_route_stanza(p);
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1060 if occupant.jid == jid then
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1061 modified_nicks[nick] = p;
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1062 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1063 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1064 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1065 end
1755 1614e8e62ad5 MUC: Fixed an undefined global access. Waqas Hussain <waqas20@gmail.com> parents: 1754 diff changeset	1066 if self.save then self:save(); end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1067 if callback then callback(); end
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1068 for nick,p in pairs(modified_nicks) do
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1069 p.attr.from = nick;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1070 self:broadcast_except_nick(p, nick);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1071 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1072 return true;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1073 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1074
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1075 function room_mt:get_role(nick)
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1076 local session = self._occupants[nick];
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1077 return session and session.role or nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1078 end
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1079 function room_mt:can_set_role(actor_jid, occupant_jid, role)
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1080 local occupant = self._occupants[occupant_jid];
5680 24b044f6e06d mod_muc: Fix incorrect variable name Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	1081 if not occupant or not actor_jid then return nil, "modify", "not-acceptable"; end
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1082
5542 329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1083 if actor_jid == true then return true; end
329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1084
329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1085 local actor = self._occupants[self._jid_nick[actor_jid]];
6049 6d410ffd6e13 MUC: Fixed traceback when a JID not in a room requested a role change for an occupant. Waqas Hussain <waqas20@gmail.com> parents: 5853 diff changeset	1086 if actor and actor.role == "moderator" then
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1087 if occupant.affiliation ~= "owner" and occupant.affiliation ~= "admin" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1088 if actor.affiliation == "owner" or actor.affiliation == "admin" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1089 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1090 elseif occupant.role ~= "moderator" and role ~= "moderator" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1091 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1092 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1093 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1094 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1095 return nil, "cancel", "not-allowed";
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1096 end
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	1097 function room_mt:set_role(actor, occupant_jid, role, callback, reason)
1752 4db786919805 MUC: Added kicking support. Waqas Hussain <waqas20@gmail.com> parents: 1751 diff changeset	1098 if role == "none" then role = nil; end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1099 if role and role ~= "moderator" and role ~= "participant" and role ~= "visitor" then return nil, "modify", "not-acceptable"; end
3280 eef4f31f2d7b MUC: Updated room:set_role() to use room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3279 diff changeset	1100 local allowed, err_type, err_condition = self:can_set_role(actor, occupant_jid, role);
eef4f31f2d7b MUC: Updated room:set_role() to use room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3279 diff changeset	1101 if not allowed then return allowed, err_type, err_condition; end
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	1102 local occupant = self._occupants[occupant_jid];
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1103 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	1104 :tag("item", {affiliation=occupant.affiliation or "none", nick=select(3, jid_split(occupant_jid)), role=role or "none"})
2006 0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1105 :tag("reason"):text(reason or ""):up()
0c62bed9d338 MUC: Added support for reason messages in role and affiliation changes (e.g., reason for kick, etc). Waqas Hussain <waqas20@gmail.com> parents: 2005 diff changeset	1106 :up();
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1107 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1108 if not role then -- kick
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1109 presence_type = "unavailable";
2845 f76139aa7cd5 MUC: muc.lib.lua: Fix the sending of the occupant JID instead of the nick in role lists and presence broadcasts after role changes (thanks teo) Matthew Wild <mwild1@gmail.com> parents: 2174 diff changeset	1110 self._occupants[occupant_jid] = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1111 for jid in pairs(occupant.sessions) do -- remove for all sessions of the nick
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1112 self._jid_nick[jid] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1113 end
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1114 x:tag("status", {code = "307"}):up();
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1115 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1116 occupant.role = role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1117 end
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1118 local bp;
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1119 for jid,pres in pairs(occupant.sessions) do -- send to all sessions of the nick
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1120 local p = st.clone(pres);
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1121 p.attr.from = occupant_jid;
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1122 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1123 p.attr.to = jid;
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1124 p:add_child(x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1125 self:_route_stanza(p);
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1126 if occupant.jid == jid then
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1127 bp = p;
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1128 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1129 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1130 if callback then callback(); end
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1131 if bp then
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1132 self:broadcast_except_nick(bp, occupant_jid);
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1133 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1134 return true;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1135 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1136
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1137 function room_mt:_route_stanza(stanza)
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1138 local muc_child;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1139 local to_occupant = self._occupants[self._jid_nick[stanza.attr.to]];
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1140 local from_occupant = self._occupants[stanza.attr.from];
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1141 if stanza.name == "presence" then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1142 if to_occupant and from_occupant then
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1143 if self._data.whois == 'anyone' then
2416 89be536aae25 mod_muc/muc.lib: Use stanza:get_child() to locate MUC child element Matthew Wild <mwild1@gmail.com> parents: 2412 diff changeset	1144 muc_child = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1145 else
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1146 if to_occupant.role == "moderator" or jid_bare(to_occupant.jid) == jid_bare(from_occupant.jid) then
2416 89be536aae25 mod_muc/muc.lib: Use stanza:get_child() to locate MUC child element Matthew Wild <mwild1@gmail.com> parents: 2412 diff changeset	1147 muc_child = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1148 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1149 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1150 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1151 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1152 if muc_child then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1153 for _, item in pairs(muc_child.tags) do
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1154 if item.name == "item" then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1155 if from_occupant == to_occupant then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1156 item.attr.jid = stanza.attr.to;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1157 else
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1158 item.attr.jid = from_occupant.jid;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1159 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1160 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1161 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1162 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1163 self:route_stanza(stanza);
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1164 if muc_child then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1165 for _, item in pairs(muc_child.tags) do
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1166 if item.name == "item" then
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1167 item.attr.jid = nil;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1168 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1169 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1170 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1171 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1172
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1173 local _M = {}; -- module "muc"
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1174
3330 bdc325ce9fbc MUC: Make number of stored history messages configurable with option max_history_messages (thanks michal and others who requested) Matthew Wild <mwild1@gmail.com> parents: 3281 diff changeset	1175 function _M.new_room(jid, config)
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1176 return setmetatable({
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1177 jid = jid;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1178 _jid_nick = {};
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	1179 _occupants = {};
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1180 _data = {
3330 bdc325ce9fbc MUC: Make number of stored history messages configurable with option max_history_messages (thanks michal and others who requested) Matthew Wild <mwild1@gmail.com> parents: 3281 diff changeset	1181 whois = 'moderators';
5195 ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1182 history_length = math.min((config and config.history_length)
ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1183 or default_history_length, max_history_length);
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1184 };
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1185 _affiliations = {};
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1186 }, room_mt);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1187 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1188
5195 ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1189 function _M.set_max_history_length(_max_history_length)
ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1190 max_history_length = _max_history_length or math.huge;
ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1191 end
ce5d7538ac48 muc: Make max_history_messages simply a service-wide config option, and don't store it per-room (rooms still have their own history_message, but this is a global limit) Matthew Wild <mwild1@gmail.com> parents: 5144 diff changeset	1192
5063 4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1193 _M.room_mt = room_mt;
4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1194
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1195 return _M;

prosody

082d12728645

plugins/muc/muc.lib.lua

Software / code / prosody

Annotate

plugins/muc/muc.lib.lua @ 8476:082d12728645 0.9.13

Software `/` code `/` prosody