Software `/` code `/` prosody

Annotate

plugins/muc/muc.lib.lua @ 8791:8da11142fabf

muc: Allow clients to change multiple affiliations or roles at once (#345) According to XEP-0045 sections 9.2, 9.5 and 9.8 affiliation lists and role lists should allow mass-modification. Prosody however would just use the first entry of the list and ignore the rest. This is fixed by introducing a `for` loop to `set` stanzas of the respective `muc#admin` namespace. In order for this loop to work, the error handling was changed a little. Prosody no longer returns after the first error. Instead, an error reply is sent for each malformed or otherwise wrong entry, but the loop keeps going over the other entries. This may lead to multiple error messages being sent for one client request. A notable exception from this is when the XML Schema for `muc#admin` requests is violated. In that case the loop is aborted with an error message to the client. The change is a bit bigger than that in order to have the loop only for `set` stanzas without changing the behaviour of the `get` stanzas. This is now more in line with trunk, where there are separate methods for each stanza type. References: #345

author	Lennart Sauerbeck <devel@lennart.sauerbeck.org>
date	Sat, 18 Mar 2017 18:47:28 +0100
parent	8590:4b5a00fffb22
child	8792:c2b99fa134b3

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
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	4 --
1734 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 ------------
5612 5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	30 local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true};
5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	31 local function presence_filter(tag)
5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	32 if presence_filters[tag.attr.xmlns] then
5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	33 return nil;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	34 end
5612 5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	35 return tag;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	36 end
5612 5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	37
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	38 local function get_filtered_presence(stanza)
5612 5404832d6f7a mod_muc: Use stanza:maptags() instead of custom filtering functions, 7 insertions, 19 deletions! Matthew Wild <mwild1@gmail.com> parents: 5611 diff changeset	39 return st.clone(stanza):maptags(presence_filter);
1734 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 kickable_error_conditions = {
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	42 ["gone"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	43 ["internal-server-error"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	44 ["item-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	45 ["jid-malformed"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	46 ["recipient-unavailable"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	47 ["redirect"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	48 ["remote-server-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	49 ["remote-server-timeout"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	50 ["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	51 ["malformed error"] = true;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	52 };
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	53
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	54 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	55 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	56 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	57 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	58
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	59 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	60 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	61 return kickable_error_conditions[cond] and cond;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	62 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	63 -----------
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	64
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	65 local room_mt = {};
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	66 room_mt.__index = room_mt;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	67
5519 06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	68 function room_mt:__tostring()
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	69 return "MUC room ("..self.jid..")";
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	70 end
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	71
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	72 function room_mt:get_default_role(affiliation)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	73 if affiliation == "owner" or affiliation == "admin" then
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	74 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	75 elseif affiliation == "member" then
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	76 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	77 elseif not affiliation then
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	78 if not self:get_members_only() then
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	79 return self:get_moderated() and "visitor" or "participant";
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	80 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	81 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	82 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	83
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	84 function room_mt:broadcast_presence(stanza, sid, code, nick)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	85 stanza = get_filtered_presence(stanza);
1825 f67e4bfc62f1 MUC: Renamed a variable name. Waqas Hussain <waqas20@gmail.com> parents: 1824 diff changeset	86 local occupant = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	87 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	88 :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	89 if code then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	90 stanza:tag("status", {code=code}):up();
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	91 end
1824 8e66c9d09f81 MUC: Refactored to remove some duplicate code. Waqas Hussain <waqas20@gmail.com> parents: 1819 diff changeset	92 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	93 local me = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	94 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	95 stanza:tag("status", {code='110'}):up();
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	96 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	97 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	98 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	99 end
1736 98f833669d7f MUC: Fixed function declarations. Waqas Hussain <waqas20@gmail.com> parents: 1735 diff changeset	100 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	101 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	102 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	103
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	104 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	105 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	106 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	107 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	108 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	109 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	110 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	111 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	112 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	113 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	114 end
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	115 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	116 end)
eb85b10e1fea MUC: Ensure that <delay/> elements which match our from are stripped (fixes #1055) Jonas Wielicki <jonas@wielicki.name> parents: 8474 diff changeset	117
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	118 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	119 for jid in pairs(o_data.sessions) do
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	120 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	121 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	122 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	123 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	124 stanza.attr.to = to;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	125 if historic then -- add to history
5982 2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	126 return self:save_to_history(stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	127 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	128 end
5982 2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	129 function room_mt:save_to_history(stanza)
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	130 local history = self._data['history'];
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	131 if not history then history = {}; self._data['history'] = history; end
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	132 stanza = st.clone(stanza);
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	133 stanza.attr.to = "";
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	134 local stamp = datetime.datetime();
8477 597c23e1c38e Merge 0.9->0.10 Kim Alvefur <zash@zash.se> parents: 8466 8476 diff changeset	135 stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = self.jid, stamp = stamp}):up(); -- XEP-0203
597c23e1c38e Merge 0.9->0.10 Kim Alvefur <zash@zash.se> parents: 8466 8476 diff changeset	136 stanza:tag("x", {xmlns = "jabber:x:delay", from = self.jid, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
5982 2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	137 local entry = { stanza = stanza, stamp = stamp };
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	138 t_insert(history, entry);
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	139 while #history > (self._data.history_length or default_history_length) do t_remove(history, 1) end
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	140 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	141 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	142 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	143 if rnick ~= nick then
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	144 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	145 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	146 self:_route_stanza(stanza);
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	147 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	148 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	149 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	150 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	151
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	152 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	153 local current_nick = self._jid_nick[to];
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	154 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	155 if occupant ~= current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	156 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	157 pres.attr.to, pres.attr.from = to, occupant;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	158 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	159 :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	160 self:_route_stanza(pres);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	161 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	162 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	163 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	164 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	165 local history = self._data['history']; -- send discussion history
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	166 if history then
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	167 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	168 local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	169
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	170 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	171 if maxchars then maxchars = math.floor(maxchars); end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	172
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	173 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	174 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	175
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	176 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	177 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	178
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	179 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	180 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	181 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	182
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	183 local n = 0;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	184 local charcount = 0;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	185
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	186 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	187 local entry = history[i];
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	188 if maxchars then
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	189 if not entry.chars then
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	190 entry.stanza.attr.to = "";
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	191 entry.chars = #tostring(entry.stanza);
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	192 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	193 charcount = charcount + entry.chars + #to;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	194 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	195 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	196 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	197 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	198 n = n + 1;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	199 end
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	200 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	201 local msg = history[i].stanza;
a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	202 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	203 self:_route_stanza(msg);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	204 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	205 end
5983 930109558aa2 MUC: Split out sending of the topic into method separate from sending history Kim Alvefur <zash@zash.se> parents: 5982 diff changeset	206 end
930109558aa2 MUC: Split out sending of the topic into method separate from sending history Kim Alvefur <zash@zash.se> parents: 5982 diff changeset	207 function room_mt:send_subject(to)
8465 0ec72e67f797 MUC: Always send subject message, even if it is empty (fixes #1053) Kim Alvefur <zash@zash.se> parents: 7383 diff changeset	208 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	209 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	210
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	211 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	212 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end
7118 dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	213 local reply = 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	214 :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	215 :tag("feature", {var="http://jabber.org/protocol/muc"}):up()
8588 54b60a1eea2d MUC: send muc#stanza_id feature as per XEP-0045 v1.31 (fixes #1097) Jonas Wielicki <jonas@wielicki.name> parents: 8476 diff changeset	216 :tag("feature", {var="http://jabber.org/protocol/muc#stable_id"}):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	217 :tag("feature", {var=self:get_password() and "muc_passwordprotected" or "muc_unsecured"}):up()
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	218 :tag("feature", {var=self:get_moderated() and "muc_moderated" or "muc_unmoderated"}):up()
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	219 :tag("feature", {var=self:get_members_only() and "muc_membersonly" or "muc_open"}):up()
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	220 :tag("feature", {var=self:get_persistent() and "muc_persistent" or "muc_temporary"}):up()
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	221 :tag("feature", {var=self:get_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	222 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):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	223 ;
7118 dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	224 local dataform = dataform.new({
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	225 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	226 { name = "muc#roominfo_description", label = "Description", value = "" },
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	227 { name = "muc#roominfo_occupants", label = "Number of occupants", value = "" }
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	228 });
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	229 local formdata = {
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	230 ["muc#roominfo_description"] = self:get_description(),
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	231 ["muc#roominfo_occupants"] = tostring(count),
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	232 };
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	233 module:fire_event("muc-disco#info", { room = self, reply = reply, form = dataform, formdata = formdata });
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	234 reply:add_child(dataform:form(formdata, 'result'))
dacc07833b86 MUC: Fire a muc-disco#info event like in trunk so modules can extend the reply Kim Alvefur <zash@zash.se> parents: 7012 diff changeset	235 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	236 end
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	237 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	238 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	239 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	240 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	241 end
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	242 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	243 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	244 function room_mt:set_subject(current_nick, subject)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	245 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	246 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	247 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	248 if self.save then self:save(); end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	249 local msg = st.message({type='groupchat', from=current_nick})
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	250 :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	251 self:broadcast_message(msg, false);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	252 return true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	253 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	254
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	255 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	256 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	257 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	258 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	259 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	260 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	261 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	262 :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	263 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	264
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	265 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	266 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	267 if self._data.name ~= name then
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	268 self._data.name = name;
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	269 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	270 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	271 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	272 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	273 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	274 end
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	275 function room_mt:set_description(description)
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	276 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	277 if self._data.description ~= description then
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	278 self._data.description = description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	279 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	280 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	281 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	282 function room_mt:get_description()
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	283 return self._data.description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	284 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	285 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	286 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	287 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	288 self._data.password = password;
95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	289 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	290 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	291 end
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	292 function room_mt:get_password()
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	293 return self._data.password;
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	294 end
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	295 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	296 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	297 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	298 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	299 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	300 end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	301 end
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	302 function room_mt:get_moderated()
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	303 return self._data.moderated;
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	304 end
3254 a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	305 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	306 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	307 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	308 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	309 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	310 end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	311 end
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	312 function room_mt:get_members_only()
3254 a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	313 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	314 end
3258 bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	315 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	316 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	317 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	318 self._data.persistent = persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	319 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	320 end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	321 end
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	322 function room_mt:get_persistent()
3258 bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	323 return self._data.persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	324 end
3261 fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	325 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	326 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	327 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	328 self._data.hidden = hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	329 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	330 end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	331 end
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	332 function room_mt:get_hidden()
3261 fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	333 return self._data.hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	334 end
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	335 function room_mt:get_public()
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	336 return not self:get_hidden();
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	337 end
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	338 function room_mt:set_public(public)
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	339 return self:set_hidden(not public);
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	340 end
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	341 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	342 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	343 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	344 self._data.changesubject = changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	345 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	346 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	347 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	348 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	349 return self._data.changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	350 end
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	351 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	352 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	353 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	354 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	355 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	356 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	357 length = nil;
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 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	360 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	361
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	362
5600 1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	363 local valid_whois = { moderators = true, anyone = true };
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	364
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	365 function room_mt:set_whois(whois)
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	366 if valid_whois[whois] and self._data.whois ~= whois then
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	367 self._data.whois = whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	368 if self.save then self:save(true); end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	369 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	370 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	371
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	372 function room_mt:get_whois()
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	373 return self._data.whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	374 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	375
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	376 local function construct_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, 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	378 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	379 local occupant = room._occupants[to_nick];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	380 local to_jid = occupant.jid;
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	381
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	382 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	383 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	384 local function deconstruct_stanza_id(room, stanza)
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	385 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	386 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	387 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	388
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	389 if not(from_nick) then return; end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	390 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	391
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	392 local occupant = room._occupants[to_nick];
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	393 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	394 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	395 return from_nick, to_jid, id;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	396 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	397 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	398 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	399
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	400
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	401 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	402 local from, to = stanza.attr.from, stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	403 local room = jid_bare(to);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	404 local current_nick = self._jid_nick[from];
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	405 local type = stanza.attr.type;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	406 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	407 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	408 if stanza.name == "presence" then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	409 local pr = get_filtered_presence(stanza);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	410 pr.attr.from = current_nick;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	411 if type == "error" then -- error, kick em out!
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	412 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	413 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	414 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	415 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	416 elseif type == "unavailable" then -- unavailable
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	417 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	418 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	419 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	420 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	421 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	422 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	423 if new_jid then
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	424 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	425 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	426 occupant.sessions[from] = nil;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	427 pr.attr.to = from;
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	428 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	429 :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	430 :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	431 self:_route_stanza(pr);
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	432 if jid ~= new_jid then
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	433 pr = st.clone(occupant.sessions[new_jid])
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	434 :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	435 :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	436 pr.attr.from = current_nick;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	437 self:broadcast_except_nick(pr, current_nick);
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	438 end
1826 de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	439 else
de165b5de254 MUC: Added multi-session support to the room-exiting occupant use case. Waqas Hussain <waqas20@gmail.com> parents: 1825 diff changeset	440 occupant.role = 'none';
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	441 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	442 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	443 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	444 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	445 elseif not type then -- available
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	446 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	447 --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	448 if current_nick == to then -- simple presence
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	449 log("debug", "%s broadcasted presence", current_nick);
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	450 self._occupants[current_nick].sessions[from] = pr;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	451 self:broadcast_presence(pr, from);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	452 else -- change nick
8187 4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	453 -- a MUC service MUST NOT allow empty or invisible Room Nicknames
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	454 -- (i.e., Room Nicknames that consist only of one or more space characters).
8191 d43012448c1f MUC: Use variable that actually exists (thanks Martin) Kim Alvefur <zash@zash.se> parents: 8187 diff changeset	455 if not select(3, jid_split(to)):find("[^ ]") then -- resourceprep turns all whitespace into 0x20
8187 4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	456 module:log("debug", "Rejecting invisible nickname");
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	457 origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	458 return;
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	459 end
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	460 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	461 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	462 if self._occupants[to] or is_multisession then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	463 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	464 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	465 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	466 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	467 else
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	468 local data = self._occupants[current_nick];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	469 local to_nick = select(3, jid_split(to));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	470 if to_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	471 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	472 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	473 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	474 self._occupants[current_nick] = nil;
393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	475 self._occupants[to] = data;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	476 self._jid_nick[from] = to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	477 pr.attr.from = to;
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	478 self._occupants[to].sessions[from] = pr;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	479 self:broadcast_presence(pr, from);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	480 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	481 --TODO malformed-jid
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	482 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	483 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	484 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	485 --else -- possible rejoin
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	486 -- 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	487 -- 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	488 -- :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	489 -- self:handle_to_occupant(origin, stanza); -- resend available
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	490 --end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	491 else -- enter room
8187 4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	492 -- a MUC service MUST NOT allow empty or invisible Room Nicknames
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	493 -- (i.e., Room Nicknames that consist only of one or more space characters).
8191 d43012448c1f MUC: Use variable that actually exists (thanks Martin) Kim Alvefur <zash@zash.se> parents: 8187 diff changeset	494 if not select(3, jid_split(to)):find("[^ ]") then -- resourceprep turns all whitespace into 0x20
8187 4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	495 module:log("debug", "Rejecting invisible nickname");
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	496 origin.send(st.error_reply(stanza, "cancel", "not-allowed"));
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	497 return;
4d83876aac3e MUC: Reject whitespace-only nicknames (fixes #337) Kim Alvefur <zash@zash.se> parents: 8176 diff changeset	498 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	499 local new_nick = to;
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	500 local is_merge;
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	501 if self._occupants[to] then
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	502 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	503 new_nick = nil;
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	504 end
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	505 is_merge = true;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	506 end
3245 a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	507 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	508 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	509 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	510 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	511 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	512 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	513 reply.tags[1].attr.code = "401";
a8a4c87a4fbf MUC: Added password checking on room join. Waqas Hussain <waqas20@gmail.com> parents: 3244 diff changeset	514 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	515 elseif not new_nick then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	516 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	517 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	518 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	519 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	520 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	521 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	522 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	523 self._affiliations[jid_bare(from)] = "owner";
5808 026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	524 if self.locked and not stanza:get_child("x", "http://jabber.org/protocol/muc") then
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	525 self.locked = nil; -- Older groupchat protocol doesn't lock
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	526 end
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	527 elseif self.locked then -- Deny entry
7997 aca13c433e45 MUC: Log when denying entry to locked room Kim Alvefur <zash@zash.se> parents: 7684 diff changeset	528 module:log("debug", "Room is locked, denying entry");
5808 026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	529 origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	530 return;
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	531 end
1740 b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	532 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	533 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	534 if role then -- new occupant
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	535 if not is_merge then
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	536 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	537 else
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	538 self._occupants[to].sessions[from] = get_filtered_presence(stanza);
97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	539 end
1740 b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	540 self._jid_nick[from] = to;
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	541 self:send_occupant_list(from);
b37ccf9bec89 MUC: Send appropriate error to banned users on join. Waqas Hussain <waqas20@gmail.com> parents: 1739 diff changeset	542 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	543 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	544 :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	545 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	546 self:broadcast_except_nick(pr, to);
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	547 end
3989 84792db89336 MUC: Fix a pair of missing :up() Kim Alvefur <zash@zash.se> parents: 3632 diff changeset	548 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	549 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	550 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	551 end
5808 026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	552 if self.locked then
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	553 pr:tag("status", {code='201'}):up();
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	554 end
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	555 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	556 self:_route_stanza(pr);
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	557 self:send_history(from, stanza);
5983 930109558aa2 MUC: Split out sending of the topic into method separate from sending history Kim Alvefur <zash@zash.se> parents: 5982 diff changeset	558 self:send_subject(from);
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	559 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	560 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	561 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	562 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	563 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	564 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	565 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	566 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	567 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	568 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	569 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	570 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	571 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	572 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	573 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	574 end
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	575 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	576 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	577 local id = stanza.attr.id;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	578 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	579 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	580 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	581 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	582 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	583 elseif type ~= "error" then
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	584 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	585 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	586 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	587 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	588 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	589 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	590 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	591 else -- private stanza
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	592 local o_data = self._occupants[to];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	593 if o_data then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	594 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	595 if stanza.name == "iq" then
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	596 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	597 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	598 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	599 else
cba0b426b542 MUC: Fix private IQ results and errors for non-vcard queries. Waqas Hussain <waqas20@gmail.com> parents: 5063 diff changeset	600 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	601 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	602 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	603 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	604 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	605 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	606 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	607 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	608 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	609 else -- message
6004 09151d26560a MUC: Tag PMs with <x>, like presence stanzas Kim Alvefur <zash@zash.se> parents: 5983 diff changeset	610 stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up();
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	611 stanza.attr.from = current_nick;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	612 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	613 stanza.attr.to = jid;
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	614 self:_route_stanza(stanza);
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	615 end
186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	616 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	617 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	618 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	619 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	620 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	621 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	622 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	623
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	624 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	625 origin.send(st.reply(stanza):query("http://jabber.org/protocol/muc#owner")
5601 f55ab5fa939f mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler Matthew Wild <mwild1@gmail.com> parents: 5600 diff changeset	626 :add_child(self:get_form_layout(stanza.attr.from):form())
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	627 );
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	628 end
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	629
5601 f55ab5fa939f mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler Matthew Wild <mwild1@gmail.com> parents: 5600 diff changeset	630 function room_mt:get_form_layout(actor)
5541 1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	631 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	632 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	633 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	634 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	635 name = 'FORM_TYPE',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	636 type = 'hidden',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	637 value = 'http://jabber.org/protocol/muc#roomconfig'
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	638 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	639 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	640 name = 'muc#roomconfig_roomname',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	641 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	642 label = 'Name',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	643 value = self:get_name() or "",
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 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	646 name = 'muc#roomconfig_roomdesc',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	647 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	648 label = 'Description',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	649 value = self:get_description() or "",
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 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	652 name = 'muc#roomconfig_persistentroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	653 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	654 label = 'Make Room Persistent?',
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	655 value = self:get_persistent()
3517 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 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	658 name = 'muc#roomconfig_publicroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	659 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	660 label = 'Make Room Publicly Searchable?',
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	661 value = not self:get_hidden()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	662 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	663 {
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	664 name = 'muc#roomconfig_changesubject',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	665 type = 'boolean',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	666 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	667 value = self:get_changesubject()
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	668 },
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	669 {
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	670 name = 'muc#roomconfig_whois',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	671 type = 'list-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	672 label = 'Who May Discover Real JIDs?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	673 value = {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	674 { 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	675 { 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	676 }
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	677 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	678 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	679 name = 'muc#roomconfig_roomsecret',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	680 type = 'text-private',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	681 label = 'Password',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	682 value = self:get_password() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	683 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	684 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	685 name = 'muc#roomconfig_moderatedroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	686 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	687 label = 'Make Room Moderated?',
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	688 value = self:get_moderated()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	689 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	690 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	691 name = 'muc#roomconfig_membersonly',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	692 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	693 label = 'Make Room Members-Only?',
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	694 value = self:get_members_only()
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	695 },
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	696 {
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	697 name = 'muc#roomconfig_historylength',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	698 type = 'text-single',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	699 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	700 value = tostring(self:get_historylength())
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	701 }
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	702 });
5601 f55ab5fa939f mod_muc: Pass actor (requesting JID) when generating the config form, and to the muc-config-form event handler Matthew Wild <mwild1@gmail.com> parents: 5600 diff changeset	703 return module:fire_event("muc-config-form", { room = self, actor = actor, form = form }) or form;
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	704 end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	705
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	706 function room_mt:process_form(origin, stanza)
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	707 local query = stanza.tags[1];
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	708 local form;
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	709 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	710 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	711 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	712 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	713
7383 69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	714 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	715 -- instant room
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	716 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	717 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	718 return true;
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	719 end
69827ee1f951 MUC: Accept missing form as "instant room" request (fixes #377) Kim Alvefur <zash@zash.se> parents: 7011 diff changeset	720
6982 c515f9491ce6 MUC: Process only options that are included in a form (Fixes #521) Kim Alvefur <zash@zash.se> parents: 6924 diff changeset	721 local fields, errors, present = self:get_form_layout(stanza.attr.from):data(form);
6831 428b8da1cfce MUC: Break a very long line Kim Alvefur <zash@zash.se> parents: 6054 diff changeset	722 if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then
428b8da1cfce MUC: Break a very long line Kim Alvefur <zash@zash.se> parents: 6054 diff changeset	723 origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration"));
428b8da1cfce MUC: Break a very long line Kim Alvefur <zash@zash.se> parents: 6054 diff changeset	724 return;
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	725 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	726
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	727 local changed = {};
5541 1997671d5e46 MUC: Allow plugins to add and handle options in the MUC config form Matthew Wild <mwild1@gmail.com> parents: 5519 diff changeset	728
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	729 local function handle_option(name, field, allowed)
6983 05ef46379165 MUC: Fix previous commit Kim Alvefur <zash@zash.se> parents: 6982 diff changeset	730 if not present[field] then return; end
05ef46379165 MUC: Fix previous commit Kim Alvefur <zash@zash.se> parents: 6982 diff changeset	731 local new = fields[field];
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	732 if allowed and not allowed[new] then return; end
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	733 if new == self["get_"..name](self) then return; end
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	734 changed[name] = true;
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	735 self["set_"..name](self, new);
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	736 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	737
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	738 local event = { room = self, fields = fields, changed = changed, stanza = stanza, origin = origin, update_option = handle_option };
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	739 module:fire_event("muc-config-submitted", event);
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	740
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	741 handle_option("name", "muc#roomconfig_roomname");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	742 handle_option("description", "muc#roomconfig_roomdesc");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	743 handle_option("persistent", "muc#roomconfig_persistentroom");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	744 handle_option("moderated", "muc#roomconfig_moderatedroom");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	745 handle_option("members_only", "muc#roomconfig_membersonly");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	746 handle_option("public", "muc#roomconfig_publicroom");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	747 handle_option("changesubject", "muc#roomconfig_changesubject");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	748 handle_option("historylength", "muc#roomconfig_historylength");
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	749 handle_option("whois", "muc#roomconfig_whois", valid_whois);
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	750 handle_option("password", "muc#roomconfig_roomsecret");
3248 f8d14ea3ad0e MUC: Added a password field to the room config dialog. Waqas Hussain <waqas20@gmail.com> parents: 3247 diff changeset	751
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	752 if self.save then self:save(true); end
5808 026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	753 if self.locked then
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	754 module:fire_event("muc-room-unlocked", { room = self });
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	755 self.locked = nil;
026367992a0f mod_muc: Support for locking newly-created rooms until they are configured (enabled with muc_room_locking = true) Matthew Wild <mwild1@gmail.com> parents: 5776 diff changeset	756 end
2216 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
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	759 if next(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})
7012 990b4ddaf582 Merge 0.9->0.10 Matthew Wild <mwild1@gmail.com> parents: 6983 7011 diff changeset	761 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	762 :tag('status', {code = '104'}):up();
db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	763 if changed.whois then
5600 1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	764 local code = (self:get_whois() == 'moderators') and "173" or "172";
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	765 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	766 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	767 self:broadcast_message(msg, false)
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	768 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	769 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	770
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	771 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	772 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	773 :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	774 :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	775 :tag("destroy", {jid=newjid})
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	776 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	777 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	778 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	779 pr.attr.from = nick;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	780 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	781 pr.attr.to = jid;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	782 self:_route_stanza(pr);
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	783 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	784 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	785 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	786 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	787 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	788 module:fire_event("muc-room-destroyed", { room = self });
7684 65ba769d9f05 MUC: Return 'true' from room:destroy() so that use from the telnet console says 'OK' Kim Alvefur <zash@zash.se> parents: 7443 diff changeset	789 return true;
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	790 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	791
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	792 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	793 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	794 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	795 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	796 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	797 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	798 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	799 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	800 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	801 local actor = stanza.attr.from;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	802 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	803 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	804 local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation);
8791 8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	805 if type == "set" then
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	806 local at_least_one_item_provided = false;
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	807
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	808 for item in stanza.tags[1]:childtags("item") do
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	809 at_least_one_item_provided = true;
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	810
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	811 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	812 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	813 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	814 if not item.attr.jid then
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	815 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	816 end
115f274dd17f MUC: Prep given JID when changing affiliation. Waqas Hussain <waqas20@gmail.com> parents: 1826 diff changeset	817 end
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	818 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	819 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	820 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	821 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	822 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	823 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	824 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	825 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	826 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	827 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	828 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	829 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	830 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	831 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	832 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	833 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
8791 8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	834 return;
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	835 end
8791 8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	836 end
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	837
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	838 if not at_least_one_item_provided then
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	839 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	840 return;
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	841 end
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	842 elseif type == "get" then
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	843 local item = stanza.tags[1].tags[1];
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	844 if item and item.name == "item" then
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	845 local _aff = item.attr.affiliation;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	846 local _rol = item.attr.role;
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	847 if _aff and not _rol then
7443 4a178edc9847 MUC: Allow members (or above) in members-only non-anonymous rooms to see the member list (fixes #445) Kim Alvefur <zash@zash.se> parents: 7385 diff changeset	848 if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin")
4a178edc9847 MUC: Allow members (or above) in members-only non-anonymous rooms to see the member list (fixes #445) Kim Alvefur <zash@zash.se> parents: 7385 diff changeset	849 or (affiliation and affiliation ~= "outcast" and self:get_members_only() and self:get_whois() == "anyone") then
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	850 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	851 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	852 if affiliation == _aff then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	853 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	854 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	855 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	856 origin.send(reply);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	857 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	858 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	859 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	860 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	861 if role == "moderator" then
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	862 -- 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	863 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	864 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	865 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	866 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	867 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	868 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	869 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	870 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	871 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	872 }):up();
1753 a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	873 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	874 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	875 origin.send(reply);
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	876 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	877 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	878 end
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	879 else
a84901db4085 MUC: Refactored IQ handling to be more easily extensible. Waqas Hussain <waqas20@gmail.com> parents: 1752 diff changeset	880 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	881 end
8791 8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	882 else
8da11142fabf muc: Allow clients to change multiple affiliations or roles at once (#345) Lennart Sauerbeck <devel@lennart.sauerbeck.org> parents: 8590 diff changeset	883 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
1744 265863a5612b MUC: Added support for requesting various lists (owner, admin, voice, etc). Waqas Hussain <waqas20@gmail.com> parents: 1743 diff changeset	884 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	885 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	886 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	887 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	888 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	889 elseif stanza.attr.type == "get" then
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	890 self:send_form(origin, stanza);
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	891 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	892 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	893 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	894 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	895 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	896 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	897 local reason, password;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	898 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	899 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	900 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	901 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	902 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	903 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	904 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	905 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	906 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	907 else
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	908 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	909 end
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	910 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	911 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	912 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	913 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	914 elseif stanza.name == "message" and type == "groupchat" then
5613 f3166adab512 mod_muc: Remove unused variable Matthew Wild <mwild1@gmail.com> parents: 5612 diff changeset	915 local from = stanza.attr.from;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	916 local current_nick = self._jid_nick[from];
2173 f9af31dbfeb8 MUC: Prevent visitors from broadcasting messages. Waqas Hussain <waqas20@gmail.com> parents: 2172 diff changeset	917 local occupant = self._occupants[current_nick];
f9af31dbfeb8 MUC: Prevent visitors from broadcasting messages. Waqas Hussain <waqas20@gmail.com> parents: 2172 diff changeset	918 if not occupant then -- not in room
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	919 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	920 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	921 origin.send(st.error_reply(stanza, "auth", "forbidden"));
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	922 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	923 local from = stanza.attr.from;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	924 stanza.attr.from = current_nick;
5611 e043d4d65423 mod_muc: Replace getText() with get_child_text(), 1 insertion, 12 deletions! Matthew Wild <mwild1@gmail.com> parents: 5601 diff changeset	925 local subject = stanza:get_child_text("subject");
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	926 if subject then
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	927 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	928 ( self._data.changesubject and occupant.role == "participant" ) then -- and participant
5618 4fd2708fe8df mod_muc: Remove some old TODO comments Matthew Wild <mwild1@gmail.com> parents: 5614 diff changeset	929 self:set_subject(current_nick, subject);
2174 13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	930 else
13375e6c4ecb MUC: Only allow moderators to change the room subject. Waqas Hussain <waqas20@gmail.com> parents: 2173 diff changeset	931 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	932 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	933 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	934 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	935 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	936 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	937 stanza.attr.from = from;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	938 end
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	939 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	940 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	941 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	942 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	943 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	944 local to = stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	945 local current_nick = self._jid_nick[stanza.attr.from];
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	946 if current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	947 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	948 self:handle_to_occupant(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	949 stanza.attr.to = to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	950 elseif type ~= "error" and type ~= "result" then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	951 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	952 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	953 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	954 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	955 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	956 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	957 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	958 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	959 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	960 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	961 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	962 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	963 :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	964 :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	965 :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	966 :up();
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	967 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	968 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	969 end
ee8aaca3226c MUC: Include a <password/> element in invites from password protected rooms. Waqas Hussain <waqas20@gmail.com> parents: 3246 diff changeset	970 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	971 :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	972 :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	973 :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	974 :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	975 :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	976 :up();
5580 db5d1a350cc7 mod_muc: Refactor config form handling, and allow for clients to submit incomplete forms. Fixes #246 Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	977 if self:get_members_only() and not self:get_affiliation(_invitee) then
3611 d58da6bb8a77 MUC: Grant membership when inviteing someone into a members-only room. Kim Alvefur <zash@zash.se> parents: 3593 diff changeset	978 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	979 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	980 end
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	981 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	982 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	983 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	984 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	985 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	986 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	987 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	988 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	989 if type == "error" or type == "result" then return; end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	990 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	991 end
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
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	994 function room_mt:handle_stanza(origin, stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	995 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	996 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	997 self:handle_to_occupant(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	998 else
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	999 self:handle_to_room(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1000 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1001 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1002
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1003 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	1004
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1005 function room_mt:get_affiliation(jid)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1006 local node, host, resource = jid_split(jid);
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1007 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	1008 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	1009 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	1010 return result;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1011 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	1012 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	1013 jid = jid_bare(jid);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1014 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	1015 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	1016 return nil, "modify", "not-acceptable";
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1017 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1018 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	1019 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	1020 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	1021 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	1022 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	1023 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	1024 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1025 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	1026 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	1027 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	1028 end
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1029 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	1030 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	1031 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	1032 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	1033 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	1034 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	1035 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	1036 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1037 self._affiliations[jid] = affiliation;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1038 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	1039 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	1040 :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	1041 :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	1042 :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	1043 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1044 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	1045 presence_type = "unavailable";
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1046 if affiliation == "outcast" then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1047 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	1048 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1049 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	1050 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1051 end
8176 f07cfc9b9b36 MUC: Add some comments attempting to explain what presence and <x> tag goes where Kim Alvefur <zash@zash.se> parents: 8175 diff changeset	1052 -- Your own presence should have status 110
8175 b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1053 local self_x = st.clone(x);
b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1054 self_x:tag("status", {code="110"});
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1055 local modified_nicks = {};
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1056 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	1057 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	1058 if not role then -- getting kicked
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1059 self._occupants[nick] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1060 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1061 occupant.affiliation, occupant.role = affiliation, role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1062 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	1063 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	1064 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	1065 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	1066 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	1067 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1068 p.attr.to = jid;
8175 b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1069 if occupant.jid == jid then
8176 f07cfc9b9b36 MUC: Add some comments attempting to explain what presence and <x> tag goes where Kim Alvefur <zash@zash.se> parents: 8175 diff changeset	1070 -- Broadcast this presence to everyone else later, with the public <x> variant
8175 b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1071 local bp = st.clone(p);
b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1072 bp:add_child(x);
b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1073 modified_nicks[nick] = bp;
b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1074 end
b187da5b7e8f MUC: Include status code 110 on affiliation changes (see #765) Kim Alvefur <zash@zash.se> parents: 8174 diff changeset	1075 p:add_child(self_x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1076 self:_route_stanza(p);
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1077 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1078 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1079 end
1755 1614e8e62ad5 MUC: Fixed an undefined global access. Waqas Hussain <waqas20@gmail.com> parents: 1754 diff changeset	1080 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	1081 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	1082 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	1083 p.attr.from = nick;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1084 self:broadcast_except_nick(p, nick);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1085 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1086 return true;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1087 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1088
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1089 function room_mt:get_role(nick)
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1090 local session = self._occupants[nick];
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1091 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	1092 end
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1093 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	1094 local occupant = self._occupants[occupant_jid];
5680 24b044f6e06d mod_muc: Fix incorrect variable name Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	1095 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	1096
5542 329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1097 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	1098
329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1099 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	1100 if actor and actor.role == "moderator" then
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1101 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	1102 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	1103 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1104 elseif occupant.role ~= "moderator" and role ~= "moderator" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1105 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1106 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1107 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1108 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1109 return nil, "cancel", "not-allowed";
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1110 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	1111 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	1112 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	1113 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	1114 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	1115 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	1116 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	1117 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	1118 :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	1119 :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	1120 :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	1121 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1122 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	1123 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	1124 self._occupants[occupant_jid] = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1125 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	1126 self._jid_nick[jid] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1127 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	1128 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	1129 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1130 occupant.role = role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1131 end
8174 260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1132 local self_x = st.clone(x);
260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1133 self_x:tag("status", {code = "110"}):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	1134 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	1135 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	1136 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	1137 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	1138 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1139 p.attr.to = jid;
8174 260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1140 if occupant.jid == jid then
260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1141 bp = st.clone(p);
260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1142 bp:add_child(x);
260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1143 end
260886554512 MUC: Include status code 110 on role change notifications (fixes #765)) Kim Alvefur <zash@zash.se> parents: 7997 diff changeset	1144 p:add_child(self_x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1145 self:_route_stanza(p);
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1146 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1147 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	1148 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	1149 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	1150 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1151 return true;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1152 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1153
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1154 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	1155 local muc_child;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1156 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	1157 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	1158 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	1159 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	1160 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	1161 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	1162 else
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1163 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	1164 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	1165 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1166 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1167 end
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 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	1170 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	1171 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	1172 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	1173 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	1174 else
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1175 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	1176 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1177 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1178 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1179 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1180 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	1181 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	1182 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	1183 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	1184 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	1185 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1186 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1187 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1188 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1189
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1190 local _M = {}; -- module "muc"
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1191
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	1192 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	1193 return setmetatable({
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1194 jid = jid;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1195 _jid_nick = {};
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	1196 _occupants = {};
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1197 _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	1198 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	1199 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	1200 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	1201 };
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1202 _affiliations = {};
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1203 }, room_mt);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1204 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1205
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	1206 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	1207 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	1208 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	1209
5063 4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1210 _M.room_mt = room_mt;
4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1211
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1212 return _M;

prosody

8da11142fabf

plugins/muc/muc.lib.lua

Software / code / prosody

Annotate

plugins/muc/muc.lib.lua @ 8791:8da11142fabf

Software `/` code `/` prosody