Software `/` code `/` prosody

Annotate

plugins/muc/muc.lib.lua @ 6097:538cdc3d8225

plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` It is the only place they were used; and I left the old function names in as comments. One reason for doing this was to reduce accesses to _occupants; which may be in a database in future revisions

author	daurnimator <quae@daurnimator.com>
date	Fri, 21 Feb 2014 17:17:01 -0500
parent	6096:84f9123637d4
child	6098:1d7e5d091980

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
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	12 local gettime = os.time;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13 local datetime = require "util.datetime";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	14
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	15 local dataform = require "util.dataforms";
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	16
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	17 local jid_split = require "util.jid".split;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	18 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	19 local jid_prep = require "util.jid".prep;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	20 local st = require "util.stanza";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	21 local log = require "util.logger".init("mod_muc");
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	22 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	23 local setmetatable = setmetatable;
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	24 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	25 local md5 = require "util.hashes".md5;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	26
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	27 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	28 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	29
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	30 ------------
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	31 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	32 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	33 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	34 return nil;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	35 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	36 return tag;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	37 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	38
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	39 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	40 return st.clone(stanza):maptags(presence_filter);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	41 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	42 local kickable_error_conditions = {
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	43 ["gone"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	44 ["internal-server-error"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	45 ["item-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	46 ["jid-malformed"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	47 ["recipient-unavailable"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	48 ["redirect"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	49 ["remote-server-not-found"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	50 ["remote-server-timeout"] = true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	51 ["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	52 ["malformed error"] = true;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	53 };
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	54
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	55 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	56 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	57 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	58 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	59
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	60 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	61 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	62 return kickable_error_conditions[cond] and cond;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	63 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	64 -----------
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	65
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	66 local room_mt = {};
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	67 room_mt.__index = room_mt;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	68
5519 06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	69 function room_mt:__tostring()
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	70 return "MUC room ("..self.jid..")";
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	71 end
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	72
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	73 function room_mt:get_default_role(affiliation)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	74 if affiliation == "owner" or affiliation == "admin" then
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	75 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	76 elseif affiliation == "member" then
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	77 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	78 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	79 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	80 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	81 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	82 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	83 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	84
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	85 function room_mt:broadcast_presence(stanza, sid, code, nick)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	86 stanza = get_filtered_presence(stanza);
1825 f67e4bfc62f1 MUC: Renamed a variable name. Waqas Hussain <waqas20@gmail.com> parents: 1824 diff changeset	87 local occupant = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	88 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	89 :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	90 if code then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	91 stanza:tag("status", {code=code}):up();
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	92 end
1824 8e66c9d09f81 MUC: Refactored to remove some duplicate code. Waqas Hussain <waqas20@gmail.com> parents: 1819 diff changeset	93 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	94 local me = self._occupants[stanza.attr.from];
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	95 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	96 stanza:tag("status", {code='110'}):up();
1989 97c3236cc4ac MUC: Multiple sessions per nick. Waqas Hussain <waqas20@gmail.com> parents: 1862 diff changeset	97 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	98 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	99 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	100 end
1736 98f833669d7f MUC: Fixed function declarations. Waqas Hussain <waqas20@gmail.com> parents: 1735 diff changeset	101 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	102 local to = stanza.attr.to;
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	103 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	104 for jid in pairs(o_data.sessions) do
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	105 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	106 self:_route_stanza(stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	107 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	108 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	109 stanza.attr.to = to;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	110 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	111 return self:save_to_history(stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	112 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	113 end
5982 2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	114 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	115 local history = self._data['history'];
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	116 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	117 stanza = st.clone(stanza);
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	118 stanza.attr.to = "";
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	119 local stamp = datetime.datetime();
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	120 stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = stamp}):up(); -- XEP-0203
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	121 stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	122 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	123 t_insert(history, entry);
2d5685c6262f MUC: Split saving to history into a separate method Kim Alvefur <zash@zash.se> parents: 5854 diff changeset	124 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	125 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	126 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	127 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	128 if rnick ~= nick then
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	129 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	130 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	131 self:_route_stanza(stanza);
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	132 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	133 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	134 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	135 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	136
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	137 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	138 local current_nick = self._jid_nick[to];
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	139 for occupant, o_data in pairs(self._occupants) do
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	140 if occupant ~= current_nick then
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	141 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	142 pres.attr.to, pres.attr.from = to, occupant;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	143 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	144 :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	145 self:_route_stanza(pres);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	146 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	147 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	148 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	149
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	150 local function parse_history(stanza)
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	151 local x_tag = stanza:get_child("x", "http://jabber.org/protocol/muc");
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	152 local history_tag = x_tag and x_tag:get_child("history", "http://jabber.org/protocol/muc");
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	153 if not history_tag then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	154 return nil, 20, nil
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	155 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	156
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	157 local maxchars = tonumber(history_tag.attr.maxchars);
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	158
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	159 local maxstanzas = tonumber(history_tag.attr.maxstanzas);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	160
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	161 -- messages received since the UTC datetime specified
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	162 local since = history_tag.attr.since;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	163 if since then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	164 since = datetime.parse(since);
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	165 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	166
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	167 -- messages received in the last "X" seconds.
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	168 local seconds = tonumber(history_tag.attr.seconds);
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	169 if seconds then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	170 seconds = gettime() - seconds
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	171 if since then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	172 since = math.max(since, seconds);
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	173 else
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	174 since = seconds;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	175 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	176 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	177
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	178 return maxchars, maxstanzas, since
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	179 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	180 -- Get history for 'to'
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	181 function room_mt:get_history(to, maxchars, maxstanzas, since)
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	182 local history = self._data['history']; -- send discussion history
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	183 if not history then return end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	184 local history_len = #history
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	185
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	186 maxstanzas = maxstanzas or history_len
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	187 local n = 0;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	188 local charcount = 0;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	189 for i=history_len,1,-1 do
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	190 local entry = history[i];
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	191 if maxchars then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	192 if not entry.chars then
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	193 entry.stanza.attr.to = "";
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	194 entry.chars = #tostring(entry.stanza);
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	195 end
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	196 charcount = charcount + entry.chars + #to;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	197 if charcount > maxchars then break; end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	198 end
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	199 if since and since > entry.stamp then break; end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	200 if n + 1 > maxstanzas then break; end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	201 n = n + 1;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	202 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	203
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	204 local i = history_len-n+1
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	205 return function()
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	206 if i > history_len then return nil end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	207 local entry = history[i]
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	208 local msg = entry.stanza
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	209 msg.attr.to = to;
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	210 i = i + 1
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	211 return msg
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	212 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	213 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	214 function room_mt:send_history(to, stanza)
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	215 local maxchars, maxstanzas, since = parse_history(stanza)
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	216 for msg in self:get_history(to, maxchars, maxstanzas, since) do
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	217 self:_route_stanza(msg);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	218 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	219 end
930109558aa2 MUC: Split out sending of the topic into method separate from sending history Kim Alvefur <zash@zash.se> parents: 5982 diff changeset	220 function room_mt:send_subject(to)
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	221 if self._data['subject'] then
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	222 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	223 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	224 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	225
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	226 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	227 local count = 0; for _ in pairs(self._occupants) do count = count + 1; end
1808 e164fdb2d18f MUC: Added MUC feature to the disco#info replies of rooms. Waqas Hussain <waqas20@gmail.com> parents: 1778 diff changeset	228 return st.reply(stanza):query("http://jabber.org/protocol/disco#info")
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	229 :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	230 :tag("feature", {var="http://jabber.org/protocol/muc"}):up()
3371419eb0e1 MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set). Waqas Hussain <waqas20@gmail.com> parents: 3245 diff changeset	231 :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	232 :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	233 :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	234 :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	235 :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	236 :tag("feature", {var=self._data.whois ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	237 :add_child(dataform.new({
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	238 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" },
5853 3ee3d79db18c muc.lib.lua: Fix Spark jabber client not displaying conference room lists, seemingly due to a missing value tag for the room description if the description has not been set Paul <paul@quakenet.org> parents: 5680 diff changeset	239 { name = "muc#roominfo_description", label = "Description", value = "" },
4266 513485a11b85 MUC: Include occupant count in room disco#info response. Waqas Hussain <waqas20@gmail.com> parents: 4202 diff changeset	240 { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) }
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	241 }):form({["muc#roominfo_description"] = self:get_description()}, 'result'))
3246 3371419eb0e1 MUC: Added disco#info features to advertise room's password protection (muc_passwordprotected or muc_unsecured, depending on whether a password is set). Waqas Hussain <waqas20@gmail.com> parents: 3245 diff changeset	242 ;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	243 end
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	244 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	245 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	246 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	247 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	248 end
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	249 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	250 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	251 function room_mt:set_subject(current_nick, subject)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	252 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	253 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	254 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	255 if self.save then self:save(); end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	256 local msg = st.message({type='groupchat', from=current_nick})
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	257 :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	258 self:broadcast_message(msg, false);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	259 return true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	260 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	261
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	262 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	263 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	264 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	265 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	266 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	267 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	268 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	269 :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	270 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	271
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	272 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	273 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	274 if self._data.name ~= name then
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	275 self._data.name = name;
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	276 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	277 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	278 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	279 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	280 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	281 end
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	282 function room_mt:set_description(description)
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	283 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	284 if self._data.description ~= description then
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	285 self._data.description = description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	286 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	287 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	288 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	289 function room_mt:get_description()
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	290 return self._data.description;
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	291 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	292 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	293 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	294 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	295 self._data.password = password;
95daf6398dbb MUC: Persist data in room:set_password() when called programmatically. Waqas Hussain <waqas20@gmail.com> parents: 3248 diff changeset	296 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	297 end
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	298 end
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	299 function room_mt:get_password()
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	300 return self._data.password;
616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	301 end
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	302 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	303 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	304 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	305 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	306 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	307 end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	308 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	309 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	310 return self._data.moderated;
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	311 end
3254 a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	312 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	313 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	314 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	315 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	316 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	317 end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	318 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	319 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	320 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	321 end
3258 bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	322 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	323 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	324 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	325 self._data.persistent = persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	326 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	327 end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	328 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	329 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	330 return self._data.persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	331 end
3261 fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	332 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	333 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	334 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	335 self._data.hidden = hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	336 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	337 end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	338 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	339 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	340 return self._data.hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	341 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	342 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	343 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	344 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	345 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	346 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	347 end
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	348 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	349 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	350 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	351 self._data.changesubject = changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	352 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	353 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	354 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	355 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	356 return self._data.changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	357 end
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	358 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	359 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	360 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	361 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	362 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	363 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	364 length = nil;
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	365 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	366 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	367 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	368
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	369
5600 1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	370 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	371
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	372 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	373 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	374 self._data.whois = whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	375 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	376 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	377 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	378
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	379 function room_mt:get_whois()
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	380 return self._data.whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	381 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	382
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	383 function room_mt:handle_presence_error_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	384 local current_nick = self._jid_nick[stanza.attr.from];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	385 if not current_nick then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	386 return true -- discard
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	387 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	388 log("debug", "kicking %s from %s", current_nick, self.jid);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	389 return self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza))
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	390 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	391
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	392 function room_mt:handle_unavailable_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	393 local from = stanza.attr.from;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	394 local current_nick = self._jid_nick[from];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	395 if not current_nick then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	396 return true; -- discard
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	397 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	398 local pr = get_filtered_presence(stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	399 pr.attr.from = current_nick;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	400 log("debug", "%s leaving %s", current_nick, self.jid);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	401 self._jid_nick[from] = nil;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	402 local occupant = self._occupants[current_nick];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	403 local new_jid = next(occupant.sessions);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	404 if new_jid == from then new_jid = next(occupant.sessions, new_jid); end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	405 if new_jid then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	406 local jid = occupant.jid;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	407 occupant.jid = new_jid;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	408 occupant.sessions[from] = nil;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	409 pr.attr.to = from;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	410 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	411 :tag("item", {affiliation=occupant.affiliation or "none", role='none'}):up()
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	412 :tag("status", {code='110'}):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	413 self:_route_stanza(pr);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	414 if jid ~= new_jid then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	415 pr = st.clone(occupant.sessions[new_jid])
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	416 :tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	417 :tag("item", {affiliation=occupant.affiliation or "none", role=occupant.role or "none"});
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	418 pr.attr.from = current_nick;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	419 self:broadcast_except_nick(pr, current_nick);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	420 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	421 else
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	422 occupant.role = 'none';
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	423 self:broadcast_presence(pr, from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	424 self._occupants[current_nick] = nil;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	425 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	426 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	427 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	428
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	429 function room_mt:handle_occupant_presence(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	430 local from = stanza.attr.from;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	431 local pr = get_filtered_presence(stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	432 local current_nick = stanza.attr.to
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	433 pr.attr.from = current_nick;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	434 log("debug", "%s broadcasted presence", current_nick);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	435 self._occupants[current_nick].sessions[from] = pr;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	436 self:broadcast_presence(pr, from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	437 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	438 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	439
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	440 function room_mt:handle_change_nick(origin, stanza, current_nick, to)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	441 local from = stanza.attr.from;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	442 local occupant = self._occupants[current_nick];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	443 local is_multisession = next(occupant.sessions, next(occupant.sessions));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	444 if self._occupants[to] or is_multisession then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	445 log("debug", "%s couldn't change nick", current_nick);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	446 local reply = st.error_reply(stanza, "cancel", "conflict"):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	447 reply.tags[1].attr.code = "409";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	448 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	449 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	450 else
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	451 local data = self._occupants[current_nick];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	452 local to_nick = select(3, jid_split(to));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	453 log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	454 local p = st.presence({type='unavailable', from=current_nick});
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	455 self:broadcast_presence(p, from, '303', to_nick);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	456 self._occupants[current_nick] = nil;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	457 self._occupants[to] = data;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	458 self._jid_nick[from] = to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	459 local pr = get_filtered_presence(stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	460 pr.attr.from = to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	461 self._occupants[to].sessions[from] = pr;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	462 self:broadcast_presence(pr, from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	463 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	464 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	465 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	466
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	467 function room_mt:handle_join(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	468 local from, to = stanza.attr.from, stanza.attr.to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	469 log("debug", "%s joining as %s", from, to);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	470 if not next(self._affiliations) then -- new room, no owners
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	471 self._affiliations[jid_bare(from)] = "owner";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	472 if self.locked and not stanza:get_child("x", "http://jabber.org/protocol/muc") then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	473 self.locked = nil; -- Older groupchat protocol doesn't lock
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	474 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	475 elseif self.locked then -- Deny entry
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	476 origin.send(st.error_reply(stanza, "cancel", "item-not-found"));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	477 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	478 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	479 local affiliation = self:get_affiliation(from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	480 local role = self:get_default_role(affiliation)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	481 if role then -- new occupant
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	482 local is_merge = not not self._occupants[to]
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	483 if not is_merge then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	484 self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}};
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	485 else
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	486 self._occupants[to].sessions[from] = get_filtered_presence(stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	487 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	488 self._jid_nick[from] = to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	489 self:send_occupant_list(from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	490 local pr = get_filtered_presence(stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	491 pr.attr.from = to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	492 pr:tag("x", {xmlns='http://jabber.org/protocol/muc#user'})
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	493 :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	494 if not is_merge then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	495 self:broadcast_except_nick(pr, to);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	496 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	497 pr:tag("status", {code='110'}):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	498 if self._data.whois == 'anyone' then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	499 pr:tag("status", {code='100'}):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	500 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	501 if self.locked then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	502 pr:tag("status", {code='201'}):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	503 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	504 pr.attr.to = from;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	505 self:_route_stanza(pr);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	506 self:send_history(from, stanza);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	507 self:send_subject(from);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	508 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	509 elseif not affiliation then -- registration required for entering members-only room
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	510 local reply = st.error_reply(stanza, "auth", "registration-required"):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	511 reply.tags[1].attr.code = "407";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	512 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	513 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	514 else -- banned
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	515 local reply = st.error_reply(stanza, "auth", "forbidden"):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	516 reply.tags[1].attr.code = "403";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	517 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	518 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	519 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	520 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	521
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	522 function room_mt:handle_available_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	523 local from, to = stanza.attr.from, stanza.attr.to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	524 local current_nick = self._jid_nick[from];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	525 if current_nick then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	526 --if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	527 if current_nick == to then -- simple presence
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	528 return self:handle_occupant_presence(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	529 else -- change nick
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	530 return self:handle_change_nick(origin, stanza, current_nick, to)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	531 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	532 --else -- possible rejoin
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	533 -- log("debug", "%s had connection replaced", current_nick);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	534 -- self:handle_to_occupant(origin, st.presence({type='unavailable', from=from, to=to})
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	535 -- :tag('status'):text('Replaced by new connection'):up()); -- send unavailable
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	536 -- self:handle_to_occupant(origin, stanza); -- resend available
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	537 --end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	538 else -- enter room
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	539 local new_nick = to;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	540 if self._occupants[to] then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	541 if jid_bare(from) ~= jid_bare(self._occupants[to].jid) then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	542 new_nick = nil;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	543 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	544 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	545 local password = stanza:get_child("x", "http://jabber.org/protocol/muc");
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	546 password = password and password:get_child("password", "http://jabber.org/protocol/muc");
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	547 password = password and password[1] ~= "" and password[1];
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	548 if self:get_password() and self:get_password() ~= password then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	549 log("debug", "%s couldn't join due to invalid password: %s", from, to);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	550 local reply = st.error_reply(stanza, "auth", "not-authorized"):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	551 reply.tags[1].attr.code = "401";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	552 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	553 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	554 elseif not new_nick then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	555 log("debug", "%s couldn't join due to nick conflict: %s", from, to);
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	556 local reply = st.error_reply(stanza, "cancel", "conflict"):up();
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	557 reply.tags[1].attr.code = "409";
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	558 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	559 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	560 else
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	561 return self:handle_join(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	562 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	563 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	564 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	565
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	566 function room_mt:handle_presence_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	567 local type = stanza.attr.type;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	568 if type == "error" then -- error, kick em out!
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	569 return self:handle_presence_error_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	570 elseif type == "unavailable" then -- unavailable
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	571 return self:handle_unavailable_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	572 elseif not type then -- available
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	573 return self:handle_available_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	574 elseif type ~= 'result' then -- bad type
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	575 if type ~= 'visible' and type ~= 'invisible' then -- COMPAT ejabberd can broadcast or forward XEP-0018 presences
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	576 origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error?
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	577 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	578 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	579 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	580 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	581
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	582 function room_mt:handle_iq_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	583 local from, to = stanza.attr.from, stanza.attr.to;
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	584 local type = stanza.attr.type;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	585 local id = stanza.attr.id;
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	586 local current_nick = self._jid_nick[from];
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	587 local o_data = self._occupants[to];
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	588 if (type == "error" or type == "result") then
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	589 do -- deconstruct_stanza_id
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	590 if not current_nick or not o_data then return nil; end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	591 local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	592 if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	593 local session_jid
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	594 for to_jid in pairs(o_data.sessions) do
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	595 if md5(to_jid) == to_jid_hash then
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	596 session_jid = to_jid;
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	597 break;
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	598 end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	599 end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	600 if session_jid == nil then return nil; end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	601 stanza.attr.from, stanza.attr.to, stanza.attr.id = current_nick, session_jid, id
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	602 end
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	603 log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	604 self:_route_stanza(stanza);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	605 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	606 return true;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	607 else -- Type is "get" or "set"
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	608 if not current_nick then
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	609 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	610 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	611 end
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	612 if not o_data then -- recipient not in room
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	613 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	614 return true;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	615 end
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	616 do -- construct_stanza_id
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	617 stanza.attr.id = base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from));
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	618 end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	619 stanza.attr.from, stanza.attr.to = current_nick, o_data.jid;
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	620 log("debug", "%s sent private iq stanza to %s (%s)", from, to, o_data.jid);
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	621 if stanza.tags[1].attr.xmlns == 'vcard-temp' then
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	622 stanza.attr.to = jid_bare(stanza.attr.to);
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	623 end
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	624 self:_route_stanza(stanza);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	625 stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	626 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	627 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	628 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	629
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	630 function room_mt:handle_message_to_occupant(origin, stanza)
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	631 local from, to = stanza.attr.from, stanza.attr.to;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	632 local current_nick = self._jid_nick[from];
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	633 local type = stanza.attr.type;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	634 if not current_nick then -- not in room
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	635 if type ~= "error" then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	636 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	637 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	638 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	639 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	640 if type == "groupchat" then -- groupchat messages not allowed in PM
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	641 origin.send(st.error_reply(stanza, "modify", "bad-request"));
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	642 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	643 elseif type == "error" and is_kickable_error(stanza) then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	644 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	645 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	646 return true;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	647 end
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	648
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	649 local o_data = self._occupants[to];
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	650 if not o_data then
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	651 origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	652 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	653 end
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	654 log("debug", "%s sent private message stanza to %s (%s)", from, to, o_data.jid);
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	655 stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up();
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	656 stanza.attr.from = current_nick;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	657 for jid in pairs(o_data.sessions) do
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	658 stanza.attr.to = jid;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	659 self:_route_stanza(stanza);
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	660 end
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	661 stanza.attr.from, stanza.attr.to = from, to;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	662 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	663 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	664
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	665 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	666 local from, to = stanza.attr.from, stanza.attr.to;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	667 local room = jid_bare(to);
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	668 local current_nick = self._jid_nick[from];
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	669 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	670 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	671 if stanza.name == "presence" then
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	672 return self:handle_presence_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	673 elseif stanza.name == "iq" then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	674 return self:handle_iq_to_occupant(origin, stanza)
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	675 elseif stanza.name == "message" then
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	676 return self:handle_message_to_occupant(origin, stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	677 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	678 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	679
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	680 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	681 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	682 :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	683 );
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	684 end
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	685
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	686 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	687 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	688 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	689 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	690 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	691 name = 'FORM_TYPE',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	692 type = 'hidden',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	693 value = 'http://jabber.org/protocol/muc#roomconfig'
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	694 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	695 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	696 name = 'muc#roomconfig_roomname',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	697 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	698 label = 'Name',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	699 value = self:get_name() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	700 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	701 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	702 name = 'muc#roomconfig_roomdesc',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	703 type = 'text-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	704 label = 'Description',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	705 value = self:get_description() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	706 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	707 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	708 name = 'muc#roomconfig_persistentroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	709 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	710 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	711 value = self:get_persistent()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	712 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	713 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	714 name = 'muc#roomconfig_publicroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	715 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	716 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	717 value = not self:get_hidden()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	718 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	719 {
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	720 name = 'muc#roomconfig_changesubject',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	721 type = 'boolean',
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	722 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	723 value = self:get_changesubject()
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	724 },
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	725 {
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	726 name = 'muc#roomconfig_whois',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	727 type = 'list-single',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	728 label = 'Who May Discover Real JIDs?',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	729 value = {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	730 { 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	731 { 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	732 }
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	733 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	734 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	735 name = 'muc#roomconfig_roomsecret',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	736 type = 'text-private',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	737 label = 'Password',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	738 value = self:get_password() or "",
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	739 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	740 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	741 name = 'muc#roomconfig_moderatedroom',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	742 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	743 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	744 value = self:get_moderated()
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	745 },
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	746 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	747 name = 'muc#roomconfig_membersonly',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	748 type = 'boolean',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	749 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	750 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	751 },
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	752 {
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	753 name = 'muc#roomconfig_historylength',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	754 type = 'text-single',
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	755 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	756 value = tostring(self:get_historylength())
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	757 }
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	758 });
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	759 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	760 end
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	761
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	762 function room_mt:process_form(origin, stanza)
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	763 local query = stanza.tags[1];
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	764 local form;
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	765 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	766 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	767 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	768 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	769
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	770 local fields = self:get_form_layout(stanza.attr.from):data(form);
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	771 if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration")); return; end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	772
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	773
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	774 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	775
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	776 local function handle_option(name, field, allowed)
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	777 local new = fields[field];
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	778 if new == nil 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	779 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	780 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	781 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	782 self["set_"..name](self, new);
3508 9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	783 end
9e4c2b048f9a MUC: Added a 'Description' property (muc#roomconfig_roomdesc) Kim Alvefur <zash@zash.se> parents: 3507 diff changeset	784
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	785 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	786 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	787
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	788 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	789 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	790 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	791 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	792 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	793 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	794 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	795 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	796 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	797 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	798
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	799 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	800 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	801 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	802 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	803 end
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	804 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	805
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	806 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	807 local msg = st.message({type='groupchat', from=self.jid})
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	808 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'}):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	809 :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	810 if changed.whois then
5600 1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	811 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	812 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	813 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	814 self:broadcast_message(msg, false)
2412 e243b7c81de6 Added notification of configuration changes for MUCs Rob Hoelz <rob@hoelzro.net> parents: 2411 diff changeset	815 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	816 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	817
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	818 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	819 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	820 :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	821 :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	822 :tag("destroy", {jid=newjid})
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	823 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	824 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	825 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	826 pr.attr.from = nick;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	827 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	828 pr.attr.to = jid;
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	829 self:_route_stanza(pr);
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	830 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	831 end
838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	832 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	833 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	834 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	835 module:fire_event("muc-room-destroyed", { room = self });
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	836 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	837
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	838 function room_mt:handle_admin_item_set_command(origin, stanza)
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	839 local item = stanza.tags[1].tags[1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	840 if item.attr.jid then -- Validate provided JID
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	841 item.attr.jid = jid_prep(item.attr.jid);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	842 if not item.attr.jid then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	843 origin.send(st.error_reply(stanza, "modify", "jid-malformed"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	844 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	845 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	846 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	847 if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	848 local occupant = self._occupants[self.jid.."/"..item.attr.nick];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	849 if occupant then item.attr.jid = occupant.jid; end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	850 elseif not item.attr.nick and item.attr.jid then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	851 local nick = self._jid_nick[item.attr.jid];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	852 if nick then item.attr.nick = select(3, jid_split(nick)); end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	853 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	854 local actor = stanza.attr.from;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	855 local callback = function() origin.send(st.reply(stanza)); end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	856 local reason = item.tags[1] and item.tags[1].name == "reason" and #item.tags[1] == 1 and item.tags[1][1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	857 if item.attr.affiliation and item.attr.jid and not item.attr.role then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	858 local success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, callback, reason);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	859 if not success then origin.send(st.error_reply(stanza, errtype, err)); end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	860 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	861 elseif item.attr.role and item.attr.nick and not item.attr.affiliation then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	862 local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback, reason);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	863 if not success then origin.send(st.error_reply(stanza, errtype, err)); end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	864 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	865 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	866 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	867 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	868 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	869 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	870
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	871 function room_mt:handle_admin_item_get_command(origin, stanza)
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	872 local actor = stanza.attr.from;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	873 local affiliation = self:get_affiliation(actor);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	874 local current_nick = self._jid_nick[actor];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	875 local role = current_nick and self._occupants[current_nick].role or self:get_default_role(affiliation);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	876 local item = stanza.tags[1].tags[1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	877 local _aff = item.attr.affiliation;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	878 local _rol = item.attr.role;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	879 if _aff and not _rol then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	880 if affiliation == "owner" or (affiliation == "admin" and _aff ~= "owner" and _aff ~= "admin") then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	881 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	882 for jid, affiliation in pairs(self._affiliations) do
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	883 if affiliation == _aff then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	884 reply:tag("item", {affiliation = _aff, jid = jid}):up();
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	885 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	886 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	887 origin.send(reply);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	888 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	889 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	890 origin.send(st.error_reply(stanza, "auth", "forbidden"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	891 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	892 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	893 elseif _rol and not _aff then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	894 if role == "moderator" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	895 -- TODO allow admins and owners not in room? Provide read-only access to everyone who can see the participants anyway?
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	896 if _rol == "none" then _rol = nil; end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	897 local reply = st.reply(stanza):query("http://jabber.org/protocol/muc#admin");
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	898 for occupant_jid, occupant in pairs(self._occupants) do
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	899 if occupant.role == _rol then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	900 reply:tag("item", {
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	901 nick = select(3, jid_split(occupant_jid)),
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	902 role = _rol or "none",
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	903 affiliation = occupant.affiliation or "none",
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	904 jid = occupant.jid
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	905 }):up();
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	906 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	907 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	908 origin.send(reply);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	909 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	910 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	911 origin.send(st.error_reply(stanza, "auth", "forbidden"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	912 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	913 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	914 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	915 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	916 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	917 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	918 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	919
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	920 function room_mt:handle_owner_query_get_to_room(origin, stanza)
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	921 if self:get_affiliation(stanza.attr.from) ~= "owner" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	922 origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	923 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	924 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	925
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	926 self:send_form(origin, stanza);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	927 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	928 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	929 function room_mt:handle_owner_query_set_to_room(origin, stanza)
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	930 if self:get_affiliation(stanza.attr.from) ~= "owner" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	931 origin.send(st.error_reply(stanza, "auth", "forbidden", "Only owners can configure rooms"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	932 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	933 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	934
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	935 local child = stanza.tags[1].tags[1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	936 if not child then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	937 origin.send(st.error_reply(stanza, "modify", "bad-request"));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	938 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	939 elseif child.name == "destroy" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	940 local newjid = child.attr.jid;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	941 local reason, password;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	942 for _,tag in ipairs(child.tags) do
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	943 if tag.name == "reason" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	944 reason = #tag.tags == 0 and tag[1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	945 elseif tag.name == "password" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	946 password = #tag.tags == 0 and tag[1];
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	947 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	948 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	949 self:destroy(newjid, reason, password);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	950 origin.send(st.reply(stanza));
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	951 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	952 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	953 self:process_form(origin, stanza);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	954 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	955 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	956 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	957
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	958 function room_mt:handle_iq_to_room(origin, stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	959 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	960 local xmlns = stanza.tags[1] and stanza.tags[1].attr.xmlns;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	961 if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" and not stanza.tags[1].attr.node then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	962 origin.send(self:get_disco_info(stanza));
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	963 return true;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	964 elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" and not stanza.tags[1].attr.node then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	965 origin.send(self:get_disco_items(stanza));
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	966 return true;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	967 elseif xmlns == "http://jabber.org/protocol/muc#admin" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	968 local item = stanza.tags[1].tags[1];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	969 if item and item.name == "item" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	970 if type == "set" then
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	971 return self:handle_admin_item_set_command(origin, stanza)
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	972 elseif type == "get" then
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	973 return self:handle_admin_item_get_command(origin, stanza)
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	974 end
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	975 elseif type == "set" or type == "get" then
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	976 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	977 return true;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	978 end
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	979 elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	980 if stanza.attr.type == "get" then
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	981 return self:handle_owner_query_get_to_room(origin, stanza)
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	982 elseif stanza.attr.type == "set" then
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	983 return self:handle_owner_query_set_to_room(origin, stanza)
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	984 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	985 elseif type == "set" or type == "get" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	986 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	987 return true;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	988 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	989 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	990
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	991 function room_mt:handle_groupchat_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	992 local from = stanza.attr.from;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	993 local current_nick = self._jid_nick[from];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	994 local occupant = self._occupants[current_nick];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	995 if not occupant then -- not in room
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	996 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	997 elseif occupant.role == "visitor" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	998 origin.send(st.error_reply(stanza, "auth", "forbidden"));
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	999 else
5613 f3166adab512 mod_muc: Remove unused variable Matthew Wild <mwild1@gmail.com> parents: 5612 diff changeset	1000 local from = stanza.attr.from;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1001 stanza.attr.from = current_nick;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1002 local subject = stanza:get_child_text("subject");
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1003 if subject then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1004 if occupant.role == "moderator" or
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1005 ( self._data.changesubject and occupant.role == "participant" ) then -- and participant
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1006 self:set_subject(current_nick, subject);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1007 else
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1008 stanza.attr.from = from;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1009 origin.send(st.error_reply(stanza, "auth", "forbidden"));
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1010 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1011 else
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1012 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	1013 end
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1014 stanza.attr.from = from;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1015 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1016 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1017
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1018 function room_mt:handle_kickable_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1019 local current_nick = self._jid_nick[stanza.attr.from];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1020 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1021 self:handle_to_occupant(origin, build_unavailable_presence_from_error(stanza)); -- send unavailable
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1022 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1023
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1024 -- hack - some buggy clients send presence updates to the room rather than their nick
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1025 function room_mt:handle_presence_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1026 local type = stanza.attr.type;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1027 local current_nick = self._jid_nick[stanza.attr.from];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1028 if current_nick then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1029 local to = stanza.attr.to;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1030 stanza.attr.to = current_nick;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1031 self:handle_to_occupant(origin, stanza);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1032 stanza.attr.to = to;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1033 elseif type ~= "error" and type ~= "result" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1034 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1035 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1036 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1037
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1038 function room_mt:handle_invite_to_room(origin, stanza, payload)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1039 local _from, _to = stanza.attr.from, stanza.attr.to;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1040 local _invitee = jid_prep(payload.attr.to);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1041 if _invitee then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1042 local _reason = payload.tags[1] and payload.tags[1].name == 'reason' and #payload.tags[1].tags == 0 and payload.tags[1][1];
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1043 local invite = st.message({from = _to, to = _invitee, id = stanza.attr.id})
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1044 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1045 :tag('invite', {from=_from})
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1046 :tag('reason'):text(_reason or ""):up()
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1047 :up();
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1048 if self:get_password() then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1049 invite:tag("password"):text(self:get_password()):up();
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1050 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1051 invite:up()
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1052 :tag('x', {xmlns="jabber:x:conference", jid=_to}) -- COMPAT: Some older clients expect this
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1053 :text(_reason or "")
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1054 :up()
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1055 :tag('body') -- Add a plain message for clients which don't support invites
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1056 :text(_from..' invited you to the room '.._to..(_reason and (' ('.._reason..')') or ""))
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1057 :up();
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1058 if self:get_members_only() and not self:get_affiliation(_invitee) then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1059 log("debug", "%s invited %s into members only room %s, granting membership", _from, _invitee, _to);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1060 self:set_affiliation(_from, _invitee, "member", nil, "Invited by " .. self._jid_nick[_from])
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1061 end
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1062 self:_route_stanza(invite);
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1063 else
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1064 origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1065 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1066 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1067
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1068 function room_mt:handle_message_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1069 local type = stanza.attr.type;
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1070 if type == "groupchat" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1071 return self:handle_groupchat_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1072 elseif type == "error" and is_kickable_error(stanza) then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1073 return self:handle_kickable_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1074 elseif not(type == "chat" or type == "error" or type == "groupchat" or type == "headline") and #stanza.tags == 1
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	1075 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	1076 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	1077 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	1078 if payload and payload.name == "invite" and payload.attr.to then
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1079 return self:handle_invite_to_room(origin, stanza, payload)
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	1080 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	1081 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	1082 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1083 else
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1084 if type == "error" or type == "result" then return; end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1085 origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1086 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1087 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1088
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1089 function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1090 if stanza.name == "iq" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1091 return self:handle_iq_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1092 elseif stanza.name == "message" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1093 return self:handle_message_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1094 elseif stanza.name == "presence" then
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1095 return self:handle_presence_to_room(origin, stanza)
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1096 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1097 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1098
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1099 function room_mt:handle_stanza(origin, stanza)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1100 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	1101 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	1102 self:handle_to_occupant(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1103 else
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1104 self:handle_to_room(origin, stanza);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1105 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1106 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1107
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1108 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	1109
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1110 function room_mt:get_affiliation(jid)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1111 local node, host, resource = jid_split(jid);
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1112 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	1113 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	1114 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	1115 return result;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1116 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	1117 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	1118 jid = jid_bare(jid);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1119 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	1120 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	1121 return nil, "modify", "not-acceptable";
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1122 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1123 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	1124 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	1125 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	1126 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	1127 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	1128 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	1129 end
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1130 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	1131 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	1132 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	1133 end
d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1134 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	1135 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	1136 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	1137 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	1138 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	1139 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	1140 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	1141 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1142 self._affiliations[jid] = affiliation;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1143 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	1144 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	1145 :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	1146 :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	1147 :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	1148 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1149 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	1150 presence_type = "unavailable";
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1151 if affiliation == "outcast" then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1152 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	1153 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1154 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	1155 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1156 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1157 local modified_nicks = {};
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1158 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	1159 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	1160 if not role then -- getting kicked
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1161 self._occupants[nick] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1162 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1163 occupant.affiliation, occupant.role = affiliation, role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1164 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	1165 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	1166 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	1167 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	1168 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	1169 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1170 p.attr.to = jid;
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1171 p:add_child(x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1172 self:_route_stanza(p);
3631 138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1173 if occupant.jid == jid then
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1174 modified_nicks[nick] = p;
138f385e8246 MUC: Include the user's current presence contents when broadcasting an affiliation change. Waqas Hussain <waqas20@gmail.com> parents: 3629 diff changeset	1175 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1176 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1177 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1178 end
1755 1614e8e62ad5 MUC: Fixed an undefined global access. Waqas Hussain <waqas20@gmail.com> parents: 1754 diff changeset	1179 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	1180 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	1181 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	1182 p.attr.from = nick;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1183 self:broadcast_except_nick(p, nick);
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1184 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1185 return true;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1186 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1187
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1188 function room_mt:get_role(nick)
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1189 local session = self._occupants[nick];
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1190 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	1191 end
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1192 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	1193 local occupant = self._occupants[occupant_jid];
5680 24b044f6e06d mod_muc: Fix incorrect variable name Matthew Wild <mwild1@gmail.com> parents: 5577 diff changeset	1194 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	1195
5542 329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1196 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	1197
329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1198 local actor = self._occupants[self._jid_nick[actor_jid]];
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1199 if actor.role == "moderator" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1200 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	1201 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	1202 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1203 elseif occupant.role ~= "moderator" and role ~= "moderator" then
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1204 return true;
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1205 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1206 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1207 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1208 return nil, "cancel", "not-allowed";
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1209 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	1210 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	1211 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	1212 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	1213 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	1214 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	1215 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	1216 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	1217 :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	1218 :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	1219 :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	1220 local presence_type = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1221 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	1222 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	1223 self._occupants[occupant_jid] = nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1224 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	1225 self._jid_nick[jid] = nil;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1226 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	1227 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	1228 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1229 occupant.role = role;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1230 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	1231 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	1232 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	1233 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	1234 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	1235 p.attr.type = presence_type;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1236 p.attr.to = jid;
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1237 p:add_child(x);
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1238 self:_route_stanza(p);
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1239 if occupant.jid == jid then
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1240 bp = p;
d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1241 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1242 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1243 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	1244 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	1245 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	1246 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1247 return true;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1248 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1249
2064 1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1250 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	1251 local muc_child;
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1252 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	1253 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	1254 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	1255 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	1256 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	1257 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	1258 else
c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1259 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	1260 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	1261 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1262 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1263 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1264 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1265 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	1266 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	1267 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	1268 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	1269 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	1270 else
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1271 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	1272 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1273 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1274 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1275 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1276 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	1277 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	1278 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	1279 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	1280 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	1281 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1282 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1283 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1284 end
1ee862fd1afe MUC: Include occupants' real JIDs in their presence (semi-anonymous rooms). Waqas Hussain <waqas20@gmail.com> parents: 2053 diff changeset	1285
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1286 local _M = {}; -- module "muc"
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1287
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	1288 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	1289 return setmetatable({
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1290 jid = jid;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1291 _jid_nick = {};
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	1292 _occupants = {};
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1293 _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	1294 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	1295 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	1296 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	1297 };
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1298 _affiliations = {};
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1299 }, room_mt);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1300 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1301
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	1302 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	1303 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	1304 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	1305
5063 4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1306 _M.room_mt = room_mt;
4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1307
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1308 return _M;

prosody

538cdc3d8225

plugins/muc/muc.lib.lua

Software / code / prosody

Annotate

plugins/muc/muc.lib.lua @ 6097:538cdc3d8225

Software `/` code `/` prosody