Software `/` code `/` prosody

Annotate

plugins/muc/muc.lib.lua @ 6208:d724289a5226

plugins/muc: Move password functions to seperate module

author	daurnimator <quae@daurnimator.com>
date	Wed, 02 Apr 2014 16:57:59 -0400
parent	6206:f937bb5c83c3
child	6209:cc00e78e6a31

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
6102 385772166289 plugins/muc/muc: Add copyright for daurnimator daurnimator <quae@daurnimator.com> parents: 6101 diff changeset	4 -- Copyright (C) 2014 Daurnimator
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	5 --
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	6 -- This project is MIT/X11 licensed. Please see the
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	7 -- COPYING file in the source package for more information.
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	8 --
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	9
3281 fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	10 local select = select;
fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	11 local pairs, ipairs = pairs, ipairs;
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	12 local next = next;
35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	13 local setmetatable = setmetatable;
35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	14 local t_insert, t_remove = table.insert, table.remove;
3281 fd6ab269ecc2 MUC: A little modification to improve code analysis. Waqas Hussain <waqas20@gmail.com> parents: 3280 diff changeset	15
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	16 local gettime = os.time;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	17 local datetime = require "util.datetime";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	18
3517 530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	19 local dataform = require "util.dataforms";
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	20
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	21 local jid_split = require "util.jid".split;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	22 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	23 local jid_prep = require "util.jid".prep;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	24 local st = require "util.stanza";
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	25 local log = require "util.logger".init("mod_muc");
1778 f4213d84ba8a MUC: Correct routing of vCard requests to bare JID. Waqas Hussain <waqas20@gmail.com> parents: 1769 diff changeset	26 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	27 local md5 = require "util.hashes".md5;
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	28
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	29 local occupant_lib = module:require "muc/occupant"
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	30
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	31 local default_history_length, max_history_length = 20, math.huge;
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	32
6115 b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	33 local is_kickable_error do
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	34 local kickable_error_conditions = {
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	35 ["gone"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	36 ["internal-server-error"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	37 ["item-not-found"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	38 ["jid-malformed"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	39 ["recipient-unavailable"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	40 ["redirect"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	41 ["remote-server-not-found"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	42 ["remote-server-timeout"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	43 ["service-unavailable"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	44 ["malformed error"] = true;
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	45 };
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	46 function is_kickable_error(stanza)
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	47 local cond = select(2, stanza:get_error()) or "malformed error";
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	48 return kickable_error_conditions[cond];
b8b68d09c9d8 plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition. daurnimator <quae@daurnimator.com> parents: 6114 diff changeset	49 end
1999 05054e360d89 MUC: Improved handling of error stanzas and made error messages concise. Waqas Hussain <waqas20@gmail.com> parents: 1998 diff changeset	50 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	51
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	52 local room_mt = {};
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	53 room_mt.__index = room_mt;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	54
5519 06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	55 function room_mt:__tostring()
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	56 return "MUC room ("..self.jid..")";
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	57 end
06e188268df1 MUC: add __tostring on room metatable Matthew Wild <mwild1@gmail.com> parents: 5397 diff changeset	58
6119 c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	59 function room_mt:get_occupant_jid(real_jid)
c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	60 return self._jid_nick[real_jid]
c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	61 end
c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	62
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	63 local valid_affiliations = {
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	64 outcast = 0;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	65 none = 1;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	66 member = 2;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	67 admin = 3;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	68 owner = 4;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	69 };
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	70
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	71 local valid_roles = {
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	72 none = 0;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	73 visitor = 1;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	74 participant = 2;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	75 moderator = 3;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	76 };
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	77
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	78 function room_mt:get_default_role(affiliation)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	79 if affiliation == "owner" or affiliation == "admin" then
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	80 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	81 elseif affiliation == "member" then
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	82 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	83 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	84 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	85 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	86 end
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	87 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	88 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	89
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	90 --- Occupant functions
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	91 function room_mt:new_occupant(bare_real_jid, nick)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	92 local occupant = occupant_lib.new(bare_real_jid, nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	93 local affiliation = self:get_affiliation(bare_real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	94 occupant.role = self:get_default_role(affiliation);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	95 return occupant;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	96 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	97
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	98 function room_mt:get_occupant_by_nick(nick)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	99 local occupant = self._occupants[nick];
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	100 if occupant == nil then return nil end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	101 return occupant_lib.copy(occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	102 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	103
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	104 do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	105 local function next_copied_occupant(occupants, occupant_jid)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	106 local next_occupant_jid, raw_occupant = next(occupants, occupant_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	107 if next_occupant_jid == nil then return nil end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	108 return next_occupant_jid, occupant_lib.copy(raw_occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	109 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	110 function room_mt:each_occupant(read_only)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	111 return next_copied_occupant, self._occupants, nil;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	112 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	113 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	114
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	115 function room_mt:get_occupant_by_real_jid(real_jid)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	116 local occupant_jid = self:get_occupant_jid(real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	117 if occupant_jid == nil then return nil end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	118 return self:get_occupant_by_nick(occupant_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	119 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	120
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	121 function room_mt:save_occupant(occupant)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	122 occupant = occupant_lib.copy(occupant); -- So that occupant can be modified more
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	123 local id = occupant.nick
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	124
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	125 -- Need to maintain _jid_nick secondary index
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	126 local old_occupant = self._occupants[id];
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	127 if old_occupant then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	128 for real_jid in pairs(old_occupant.sessions) do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	129 self._jid_nick[real_jid] = nil;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	130 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	131 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	132 if occupant.role ~= nil and next(occupant.sessions) then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	133 for real_jid, presence in occupant:each_session() do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	134 self._jid_nick[real_jid] = occupant.nick;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	135 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	136 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	137 occupant = nil
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	138 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	139 self._occupants[id] = occupant
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	140 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	141
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	142 function room_mt:route_to_occupant(occupant, stanza)
6130 c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	143 local to = stanza.attr.to;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	144 for jid, pr in occupant:each_session() do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	145 if pr.attr.type ~= "unavailable" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	146 stanza.attr.to = jid;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	147 self:route_stanza(stanza);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	148 end
6130 c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	149 end
c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	150 stanza.attr.to = to;
c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	151 end
c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	152
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	153 -- Adds an item to an "x" element.
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	154 -- actor is the attribute table
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	155 local function add_item(x, affiliation, role, jid, nick, actor, reason)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	156 x:tag("item", {affiliation = affiliation; role = role; jid = jid; nick = nick;})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	157 if actor then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	158 x:tag("actor", actor):up()
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	159 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	160 if reason then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	161 x:tag("reason"):text(reason):up()
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	162 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	163 x:up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	164 return x
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	165 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	166 -- actor is (real) jid
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	167 function room_mt:build_item_list(occupant, x, is_anonymous, nick, actor, reason)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	168 local affiliation = self:get_affiliation(occupant.bare_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	169 local role = occupant.role;
6183 a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	170 local actor_attr;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	171 if actor then
6183 a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	172 actor_attr = {nick = select(3,jid_split(self:get_occupant_jid(actor)))};
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	173 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	174 if is_anonymous then
6183 a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	175 add_item(x, affiliation, role, nil, nick, actor_attr, reason);
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	176 else
6183 a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	177 if actor_attr then
a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	178 actor_attr.jid = actor;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	179 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	180 for real_jid, session in occupant:each_session() do
6183 a8e777a19816 plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor daurnimator <quae@daurnimator.com> parents: 6182 diff changeset	181 add_item(x, affiliation, role, real_jid, nick, actor_attr, reason);
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	182 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	183 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	184 return x
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	185 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	186
1736 98f833669d7f MUC: Fixed function declarations. Waqas Hussain <waqas20@gmail.com> parents: 1735 diff changeset	187 function room_mt:broadcast_message(stanza, historic)
6137 7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	188 module:fire_event("muc-broadcast-message", {room = self, stanza = stanza, historic = historic});
6140 e4cdb3e5d7d0 plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message daurnimator <quae@daurnimator.com> parents: 6139 diff changeset	189 self:broadcast(stanza);
6137 7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	190 end
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	191
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	192 -- add to history
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	193 module:hook("muc-broadcast-message", function(event)
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	194 if event.historic then
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	195 local room = event.room
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	196 local history = room._data['history'];
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	197 if not history then history = {}; room._data['history'] = history; end
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	198 local stanza = st.clone(event.stanza);
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	199 stanza.attr.to = "";
6142 a6e526c00e6e plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history daurnimator <quae@daurnimator.com> parents: 6141 diff changeset	200 local ts = gettime();
a6e526c00e6e plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history daurnimator <quae@daurnimator.com> parents: 6141 diff changeset	201 local stamp = datetime.datetime(ts);
6137 7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	202 stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = module.host, stamp = stamp}):up(); -- XEP-0203
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	203 stanza:tag("x", {xmlns = "jabber:x:delay", from = module.host, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated)
6142 a6e526c00e6e plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history daurnimator <quae@daurnimator.com> parents: 6141 diff changeset	204 local entry = { stanza = stanza, timestamp = ts };
6137 7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	205 t_insert(history, entry);
7db24f237a83 plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history daurnimator <quae@daurnimator.com> parents: 6136 diff changeset	206 while #history > room:get_historylength() do t_remove(history, 1) end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	207 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	208 end);
6140 e4cdb3e5d7d0 plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message daurnimator <quae@daurnimator.com> parents: 6139 diff changeset	209
e4cdb3e5d7d0 plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message daurnimator <quae@daurnimator.com> parents: 6139 diff changeset	210 -- Broadcast a stanza to all occupants in the room.
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	211 -- optionally checks conditional called with (nick, occupant)
6140 e4cdb3e5d7d0 plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message daurnimator <quae@daurnimator.com> parents: 6139 diff changeset	212 function room_mt:broadcast(stanza, cond_func)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	213 for nick, occupant in self:each_occupant() do
6140 e4cdb3e5d7d0 plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message daurnimator <quae@daurnimator.com> parents: 6139 diff changeset	214 if cond_func == nil or cond_func(nick, occupant) then
6133 5d8949bb15b0 plugins/muc/muc.lib: Additional `route_to_occupant` usage daurnimator <quae@daurnimator.com> parents: 6132 diff changeset	215 self:route_to_occupant(occupant, stanza)
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	216 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	217 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	218 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	219
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	220 -- Broadcasts an occupant's presence to the whole room
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	221 -- Takes (and modifies) the x element that goes into the stanzas
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	222 function room_mt:publicise_occupant_status(occupant, full_x, actor, reason)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	223 local anon_x;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	224 local has_anonymous = self:get_whois() ~= "anyone";
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	225 if has_anonymous then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	226 anon_x = st.clone(full_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	227 self:build_item_list(occupant, anon_x, true, nil, actor, reason);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	228 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	229 self:build_item_list(occupant,full_x, false, nil, actor, reason);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	230
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	231 -- General populance
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	232 local full_p
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	233 if occupant.role ~= nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	234 -- Try to use main jid's presence
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	235 local pr = occupant:get_presence();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	236 if pr ~= nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	237 full_p = st.clone(pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	238 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	239 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	240 if full_p == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	241 full_p = st.presence{from=occupant.nick; type="unavailable"};
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	242 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	243 local anon_p;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	244 if has_anonymous then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	245 anon_p = st.clone(full_p);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	246 anon_p:add_child(anon_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	247 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	248 full_p:add_child(full_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	249
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	250 for nick, n_occupant in self:each_occupant() do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	251 if nick ~= occupant.nick or n_occupant.role == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	252 local pr = full_p;
6190 6580e557cc61 plugins/muc/muc.lib: Fix typo (moderators vs moderator) daurnimator <quae@daurnimator.com> parents: 6189 diff changeset	253 if has_anonymous and n_occupant.role ~= "moderator" and occupant.bare_jid ~= n_occupant.bare_jid then
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	254 pr = anon_p;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	255 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	256 self:route_to_occupant(n_occupant, pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	257 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	258 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	259
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	260 -- Presences for occupant itself
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	261 full_x:tag("status", {code = "110";}):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	262 if occupant.role == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	263 -- They get an unavailable
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	264 self:route_to_occupant(occupant, full_p);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	265 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	266 -- use their own presences as templates
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	267 for full_jid, pr in occupant:each_session() do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	268 if pr.attr.type ~= "unavailable" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	269 pr = st.clone(pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	270 pr.attr.to = full_jid;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	271 -- You can always see your own full jids
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	272 pr:add_child(full_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	273 self:route_stanza(pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	274 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	275 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	276 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	277 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	278
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	279 function room_mt:send_occupant_list(to, filter)
6185 d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	280 local to_bare = jid_bare(to);
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	281 local is_anonymous = true;
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	282 if self:get_whois() ~= "anyone" then
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	283 local affiliation = self:get_affiliation(to);
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	284 if affiliation ~= "admin" and affiliation ~= "owner" then
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	285 local occupant = self:get_occupant_by_real_jid(to);
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	286 if not occupant or occupant.role ~= "moderator" then
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	287 is_anonymous = false;
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	288 end
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	289 end
d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	290 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	291 for occupant_jid, occupant in self:each_occupant() do
6184 2bfc4b12ec8f plugins/muc/muc.lib: Allow `:send_occupant_list` to have no filter daurnimator <quae@daurnimator.com> parents: 6183 diff changeset	292 if filter == nil or filter(occupant_jid, occupant) then
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	293 local x = st.stanza("x", {xmlns='http://jabber.org/protocol/muc#user'});
6185 d4a8840e72f9 plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list` daurnimator <quae@daurnimator.com> parents: 6184 diff changeset	294 self:build_item_list(occupant, x, is_anonymous and to_bare ~= occupant.bare_jid); -- can always see your own jids
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	295 local pres = st.clone(occupant:get_presence());
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	296 pres.attr.to = to;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	297 pres:add_child(x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	298 self:route_stanza(pres);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	299 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	300 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	301 end
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	302
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	303 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	304 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	305 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	306 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	307 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	308 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	309
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	310 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	311
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	312 local maxstanzas = tonumber(history_tag.attr.maxstanzas);
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	313
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	314 -- 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	315 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	316 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	317 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	318 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	319
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	320 -- 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	321 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	322 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	323 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	324 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	325 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	326 else
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	327 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	328 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	329 end
2880 a3f6cc3417f2 MUC: Added support for letting clients manage discussion history. Waqas Hussain <waqas20@gmail.com> parents: 2658 diff changeset	330
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	331 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	332 end
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	333
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	334 module:hook("muc-get-history", function(event)
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	335 local room = event.room
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	336 local history = room._data['history']; -- send discussion history
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	337 if not history then return nil 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	338 local history_len = #history
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5681 diff changeset	339
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	340 local to = event.to
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	341 local maxchars = event.maxchars
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	342 local maxstanzas = event.maxstanzas or history_len
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	343 local since = event.since
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	344 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	345 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	346 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	347 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	348 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	349 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	350 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	351 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	352 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	353 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	354 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	355 end
6142 a6e526c00e6e plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history daurnimator <quae@daurnimator.com> parents: 6141 diff changeset	356 if since and since > entry.timestamp then break; 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	357 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	358 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	359 end
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	360
16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	361 local i = history_len-n+1
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	362 function event:next_stanza()
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	363 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	364 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	365 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	366 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	367 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	368 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	369 end
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	370 return true;
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	371 end);
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	372
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	373 function room_mt:send_history(stanza)
6092 16d5049fe842 plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history` daurnimator <quae@daurnimator.com> parents: 6004 diff changeset	374 local maxchars, maxstanzas, since = parse_history(stanza)
6138 fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	375 local event = {
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	376 room = self;
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	377 to = stanza.attr.from; -- `to` is required to calculate the character count for `maxchars`
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	378 maxchars = maxchars, maxstanzas = maxstanzas, since = since;
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	379 next_stanza = function() end; -- events should define this iterator
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	380 }
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	381 module:fire_event("muc-get-history", event)
fa746d834424 plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once daurnimator <quae@daurnimator.com> parents: 6137 diff changeset	382 for msg in event.next_stanza , event do
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	383 self:route_stanza(msg);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	384 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	385 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	386
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	387 function room_mt:get_disco_info(stanza)
6200 57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	388 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#info");
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	389 local form = dataform.new {
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	390 { name = "FORM_TYPE", type = "hidden", value = "http://jabber.org/protocol/muc#roominfo" };
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	391 };
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	392 module:fire_event("muc-disco#info", {room = self; reply = reply; form = form;});
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	393 reply:add_child(form:form(nil, "result"));
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	394 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	395 end
6200 57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	396 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	397 event.reply:tag("identity", {category="conference", type="text", name=event.room:get_name()}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	398 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	399 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	400 event.reply:tag("feature", {var = "http://jabber.org/protocol/muc"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	401 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	402 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	403 event.reply:tag("feature", {var = event.room:get_moderated() and "muc_moderated" or "muc_unmoderated"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	404 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	405 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	406 event.reply:tag("feature", {var = event.room:get_members_only() and "muc_membersonly" or "muc_open"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	407 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	408 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	409 event.reply:tag("feature", {var = event.room:get_persistent() and "muc_persistent" or "muc_temporary"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	410 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	411 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	412 event.reply:tag("feature", {var = event.room:get_hidden() and "muc_hidden" or "muc_public"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	413 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	414 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	415 event.reply:tag("feature", {var = event.room:get_whois() ~= "anyone" and "muc_semianonymous" or "muc_nonanonymous"}):up();
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	416 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	417 module:hook("muc-disco#info", function(event)
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	418 local count = 0; for _ in event.room:each_occupant() do count = count + 1; end
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	419 table.insert(event.form, { name = "muc#roominfo_occupants", label = "Number of occupants", value = tostring(count) });
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	420 end);
57bc52f67564 plugins/muc/muc.lib: Split up get_disco_info into events daurnimator <quae@daurnimator.com> parents: 6199 diff changeset	421
2503 bb6b0bd7f2cf MUC: Converted some local functions into methods. Waqas Hussain <waqas20@gmail.com> parents: 2416 diff changeset	422 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	423 local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	424 for room_jid in self:each_occupant() do
2035 b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	425 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	426 end
b8c3dbf76a2e MUC: List occupants in a room's disco#items response. Waqas Hussain <waqas20@gmail.com> parents: 2008 diff changeset	427 return reply;
1756 b2291156a9c2 MUC: Added service discovery replies for rooms. Waqas Hussain <waqas20@gmail.com> parents: 1755 diff changeset	428 end
6139 544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	429
544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	430 function room_mt:get_subject()
544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	431 return self._data['subject'], self._data['subject_from']
544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	432 end
6191 5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	433 local function create_subject_message(from, subject)
5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	434 return st.message({from = from; type = "groupchat"})
6139 544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	435 :tag('subject'):text(subject):up();
544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	436 end
544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	437 function room_mt:send_subject(to)
6191 5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	438 local msg = create_subject_message(self:get_subject());
5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	439 msg.attr.to = to;
5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	440 self:route_stanza(msg);
6139 544f75256883 plugins/muc/muc.lib: Extra utility functions around subjects daurnimator <quae@daurnimator.com> parents: 6138 diff changeset	441 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	442 function room_mt:set_subject(current_nick, subject)
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	443 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	444 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	445 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	446 if self.save then self:save(); end
6191 5956f4e69ab2 plugins/muc/muc.lib: Subjects get sent even if empty. daurnimator <quae@daurnimator.com> parents: 6190 diff changeset	447 local msg = create_subject_message(current_nick, subject);
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	448 self:broadcast_message(msg, false);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	449 return true;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	450 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	451
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	452 function room_mt:handle_kickable(origin, stanza)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	453 local real_jid = stanza.attr.from;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	454 local occupant = self:get_occupant_by_real_jid(real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	455 if occupant == nil then return nil; end
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	456 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	457 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	458 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	459 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	460 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	461 occupant:set_session(real_jid, st.presence({type="unavailable"})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	462 :tag('status'):text(error_message));
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	463 self:save_occupant(occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	464 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	465 :tag("status", {code = "307"})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	466 self:publicise_occupant_status(occupant, x);
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	467 return true;
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	468 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	469
3507 b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	470 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	471 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	472 if self._data.name ~= name then
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	473 self._data.name = name;
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	474 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	475 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	476 end
b639042bb0d5 MUC: Added a 'Name' property (muc#roomconfig_roomname) Kim Alvefur <zash@zash.se> parents: 3446 diff changeset	477 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	478 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	479 end
3250 38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	480 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	481 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	482 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	483 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	484 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	485 end
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	486 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	487 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	488 return self._data.moderated;
38402e874b45 MUC: Added room:set_moderated(boolean) and room:is_moderated(). Waqas Hussain <waqas20@gmail.com> parents: 3249 diff changeset	489 end
3254 a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	490 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	491 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	492 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	493 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	494 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	495 end
a01c6411fdfb MUC: Added room:set_members_only(boolean) and room:is_members_only(). Waqas Hussain <waqas20@gmail.com> parents: 3253 diff changeset	496 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	497 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	498 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	499 end
3258 bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	500 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	501 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	502 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	503 self._data.persistent = persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	504 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	505 end
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	506 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	507 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	508 return self._data.persistent;
bc07564bec6d MUC: Added room:set_persistent(boolean) and room:is_persistent(). Waqas Hussain <waqas20@gmail.com> parents: 3257 diff changeset	509 end
3261 fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	510 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	511 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	512 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	513 self._data.hidden = hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	514 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	515 end
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	516 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	517 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	518 return self._data.hidden;
fe1c93296abd MUC: Added room:set_hidden(boolean) and room:is_hidden(). Waqas Hussain <waqas20@gmail.com> parents: 3260 diff changeset	519 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	520 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	521 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	522 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	523 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	524 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	525 end
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	526 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	527 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	528 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	529 self._data.changesubject = changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	530 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	531 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	532 end
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	533 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	534 return self._data.changesubject;
813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	535 end
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	536 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	537 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	538 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	539 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	540 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	541 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	542 length = nil;
4528 875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	543 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	544 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	545 end
875b90d5ce0f muc - implement per channel history limits Markus Kötter <koetter@rrzn-hiwi.uni-hannover.de> parents: 4424 diff changeset	546
3244 616a3bb2bad9 MUC: Added room:get_password() and room:set_password(). Waqas Hussain <waqas20@gmail.com> parents: 2985 diff changeset	547
5600 1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	548 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	549
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	550 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	551 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	552 self._data.whois = whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	553 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	554 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	555 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	556
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	557 function room_mt:get_whois()
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	558 return self._data.whois;
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	559 end
1b326a1e4da6 mod_muc: Add getter/setter for 'whois' (fixes traceback) Matthew Wild <mwild1@gmail.com> parents: 5580 diff changeset	560
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	561 -- Give the room creator owner affiliation
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	562 module:hook("muc-room-pre-create", function(event)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	563 event.room:set_affiliation(true, jid_bare(event.stanza.attr.from), "owner");
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	564 end, -1);
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	565
6135 6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	566 -- registration required for entering members-only room
6193 b9074126639f plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers daurnimator <quae@daurnimator.com> parents: 6192 diff changeset	567 module:hook("muc-occupant-pre-join", function(event)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	568 local room, stanza = event.room, event.stanza;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	569 local affiliation = room:get_affiliation(stanza.attr.from);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	570 if affiliation == nil and event.room:get_members_only() then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	571 local reply = st.error_reply(stanza, "auth", "registration-required"):up();
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	572 reply.tags[1].attr.code = "407";
6135 6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	573 event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	574 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	575 end
6193 b9074126639f plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers daurnimator <quae@daurnimator.com> parents: 6192 diff changeset	576 end, -5);
6135 6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	577
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	578 -- check if user is banned
6193 b9074126639f plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers daurnimator <quae@daurnimator.com> parents: 6192 diff changeset	579 module:hook("muc-occupant-pre-join", function(event)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	580 local room, stanza = event.room, event.stanza;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	581 local affiliation = room:get_affiliation(stanza.attr.from);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	582 if affiliation == "outcast" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	583 local reply = st.error_reply(stanza, "auth", "forbidden"):up();
6135 6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	584 reply.tags[1].attr.code = "403";
6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	585 event.origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	586 return true;
6b061f8c6e11 plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks daurnimator <quae@daurnimator.com> parents: 6134 diff changeset	587 end
6193 b9074126639f plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers daurnimator <quae@daurnimator.com> parents: 6192 diff changeset	588 end, -10);
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	589
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	590 module:hook("muc-occupant-joined", function(event)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	591 local room, stanza = event.room, event.stanza;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	592 local real_jid = stanza.attr.from;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	593 room:send_occupant_list(real_jid, function(nick, occupant)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	594 -- Don't include self
6192 f97aa1f4b1f1 plugins/muc/muc.lib: Use occupant methods where possible daurnimator <quae@daurnimator.com> parents: 6191 diff changeset	595 return occupant:get_presence(real_jid) == nil;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	596 end);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	597 room:send_history(stanza);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	598 room:send_subject(real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	599 end, -1);
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	600
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	601 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	602 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	603 if type == "error" then -- error, kick em out!
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	604 return self:handle_kickable(origin, stanza)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	605 elseif type == nil or type == "unavailable" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	606 local real_jid = stanza.attr.from;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	607 local bare_jid = jid_bare(real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	608 local orig_occupant, dest_occupant;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	609 local is_new_room = next(self._affiliations) == nil;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	610 if is_new_room then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	611 if type == "unavailable" then return true; end -- Unavailable from someone not in the room
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	612 if module:fire_event("muc-room-pre-create", {
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	613 room = self;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	614 origin = origin;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	615 stanza = stanza;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	616 }) then return true; end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	617 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	618 orig_occupant = self:get_occupant_by_real_jid(real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	619 if type == "unavailable" and orig_occupant == nil then return true; end -- Unavailable from someone not in the room
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	620 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	621 local is_first_dest_session;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	622 if type == "unavailable" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	623 -- dest_occupant = nil
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	624 elseif orig_occupant and orig_occupant.nick == stanza.attr.to then -- Just a presence update
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	625 log("debug", "presence update for %s from session %s", orig_occupant.nick, real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	626 dest_occupant = orig_occupant;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	627 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	628 local dest_jid = stanza.attr.to;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	629 dest_occupant = self:get_occupant_by_nick(dest_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	630 if dest_occupant == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	631 log("debug", "no occupant found for %s; creating new occupant object for %s", dest_jid, real_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	632 is_first_dest_session = true;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	633 dest_occupant = self:new_occupant(bare_jid, dest_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	634 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	635 is_first_dest_session = false;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	636 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	637 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	638 local is_last_orig_session;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	639 if orig_occupant ~= nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	640 -- Is there are least 2 sessions?
6192 f97aa1f4b1f1 plugins/muc/muc.lib: Use occupant methods where possible daurnimator <quae@daurnimator.com> parents: 6191 diff changeset	641 local iter, ob, last = orig_occupant:each_session();
f97aa1f4b1f1 plugins/muc/muc.lib: Use occupant methods where possible daurnimator <quae@daurnimator.com> parents: 6191 diff changeset	642 is_last_orig_session = iter(ob, iter(ob, last)) == nil;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	643 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	644
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	645 local event, event_name = {
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	646 room = self;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	647 origin = origin;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	648 stanza = stanza;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	649 is_first_session = is_first_dest_session;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	650 is_last_session = is_last_orig_session;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	651 };
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	652 if orig_occupant == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	653 event_name = "muc-occupant-pre-join";
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	654 event.is_new_room = is_new_room;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	655 elseif dest_occupant == nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	656 event_name = "muc-occupant-pre-leave";
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	657 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	658 event_name = "muc-occupant-pre-change";
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	659 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	660 if module:fire_event(event_name, event) then return true; end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	661
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	662 -- Check for nick conflicts
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	663 if dest_occupant ~= nil and not is_first_dest_session and bare_jid ~= jid_bare(dest_occupant.bare_jid) then -- new nick or has different bare real jid
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	664 log("debug", "%s couldn't join due to nick conflict: %s", real_jid, dest_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	665 local reply = st.error_reply(stanza, "cancel", "conflict"):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	666 reply.tags[1].attr.code = "409";
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	667 origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"}));
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	668 return true;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	669 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	670
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	671 -- Send presence stanza about original occupant
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	672 if orig_occupant ~= nil and orig_occupant ~= dest_occupant then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	673 local orig_x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	674
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	675 if dest_occupant == nil then -- Session is leaving
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	676 log("debug", "session %s is leaving occupant %s", real_jid, orig_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	677 orig_occupant:set_session(real_jid, stanza);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	678 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	679 log("debug", "session %s is changing from occupant %s to %s", real_jid, orig_occupant.nick, dest_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	680 orig_occupant:remove_session(real_jid); -- If we are moving to a new nick; we don't want to get our own presence
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	681
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	682 local dest_nick = select(3, jid_split(dest_occupant.nick));
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	683 local affiliation = self:get_affiliation(bare_jid);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	684
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	685 -- This session
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	686 if not is_first_dest_session then -- User is swapping into another pre-existing session
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	687 log("debug", "session %s is swapping into multisession %s, showing it leave.", real_jid, dest_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	688 -- Show the other session leaving
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	689 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	690 :tag("status"):text("you are joining pre-existing session " .. dest_nick):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	691 add_item(x, affiliation, "none");
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	692 local pr = st.presence{from = dest_occupant.nick, to = real_jid, type = "unavailable"}
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	693 :add_child(x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	694 self:route_stanza(pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	695 else
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	696 if is_last_orig_session then -- User is moving to a new session
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	697 log("debug", "no sessions in %s left; marking as nick change", orig_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	698 -- Everyone gets to see this as a nick change
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	699 local jid = self:get_whois() ~= "anyone" and real_jid or nil; -- FIXME: mods should see real jids
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	700 add_item(orig_x, affiliation, orig_occupant.role, jid, dest_nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	701 orig_x:tag("status", {code = "303";}):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	702 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	703 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	704 -- The session itself always sees a nick change
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	705 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	706 add_item(x, affiliation, orig_occupant.role, real_jid, dest_nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	707 -- self:build_item_list(orig_occupant, x, false); -- COMPAT
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	708 x:tag("status", {code = "303";}):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	709 x:tag("status", {code = "110";}):up();
6189 c54ef63f6e20 plugins/muc/muc.lib: nick change unavailables should be from original occupant jid daurnimator <quae@daurnimator.com> parents: 6188 diff changeset	710 self:route_stanza(st.presence{from = orig_occupant.nick, to = real_jid, type = "unavailable"}:add_child(x));
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	711 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	712 self:save_occupant(orig_occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	713 self:publicise_occupant_status(orig_occupant, orig_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	714
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	715 if is_last_orig_session then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	716 module:fire_event("muc-occupant-left", {room = self; nick = orig_occupant.nick;});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	717 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	718 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	719
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	720 if dest_occupant ~= nil then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	721 dest_occupant:set_session(real_jid, stanza);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	722 local dest_x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	723 if is_new_room then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	724 dest_x:tag("status", {code = "201"}):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	725 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	726 if orig_occupant == nil and self:get_whois() == "anyone" then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	727 dest_x:tag("status", {code = "100"}):up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	728 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	729 self:save_occupant(dest_occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	730 self:publicise_occupant_status(dest_occupant, dest_x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	731
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	732 if orig_occupant ~= nil and orig_occupant ~= dest_occupant and not is_last_orig_session then -- If user is swapping and wasn't last original session
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	733 log("debug", "session %s split nicks; showing %s rejoining", real_jid, orig_occupant.nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	734 -- Show the original nick joining again
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	735 local pr = st.clone(orig_occupant:get_presence());
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	736 pr.attr.to = real_jid;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	737 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user";});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	738 self:build_item_list(orig_occupant, x, false);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	739 -- TODO: new status code to inform client this was the multi-session it left?
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	740 pr:add_child(x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	741 self:route_stanza(pr);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	742 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	743
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	744 if orig_occupant == nil and is_first_dest_session then
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	745 module:fire_event("muc-occupant-joined", {room = self; nick = dest_occupant.nick; stanza = stanza;});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	746 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	747 end
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	748 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	749 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	750 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	751 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	752 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	753 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	754 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	755
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	756 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	757 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	758 local type = stanza.attr.type;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	759 local id = stanza.attr.id;
6119 c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	760 local current_nick = self:get_occupant_jid(from);
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	761 local occupant = self:get_occupant_by_nick(to);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	762 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	763 do -- deconstruct_stanza_id
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	764 if not current_nick or not occupant then return nil; 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	765 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	766 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	767 local session_jid
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	768 for to_jid in occupant:each_session() do
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	769 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	770 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	771 break;
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	772 end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	773 end
538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	774 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	775 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	776 end
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	777 log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	778 self:route_stanza(stanza);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	779 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	780 return true;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	781 else -- Type is "get" or "set"
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	782 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	783 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	784 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	785 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	786 if not occupant then -- recipient not in room
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	787 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	788 return true;
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	789 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	790 do -- construct_stanza_id
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	791 stanza.attr.id = base64.encode(occupant.jid.."\0"..stanza.attr.id.."\0"..md5(from));
6097 538cdc3d8225 plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant` daurnimator <quae@daurnimator.com> parents: 6096 diff changeset	792 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	793 stanza.attr.from, stanza.attr.to = current_nick, occupant.jid;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	794 log("debug", "%s sent private iq stanza to %s (%s)", from, to, occupant.jid);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	795 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	796 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	797 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	798 self:route_stanza(stanza);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	799 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	800 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	801 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	802 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	803
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	804 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	805 local from, to = stanza.attr.from, stanza.attr.to;
6119 c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	806 local current_nick = self:get_occupant_jid(from);
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	807 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	808 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	809 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	810 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	811 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	812 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	813 end
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	814 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	815 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	816 return true;
db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	817 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	818 log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	819 return self:handle_kickable(origin, stanza); -- send unavailable
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	820 end
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	821
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	822 local o_data = self:get_occupant_by_nick(to);
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	823 if not o_data then
84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	824 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	825 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	826 end
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	827 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	828 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	829 stanza.attr.from = current_nick;
6130 c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	830 self:route_to_occupant(o_data, stanza)
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	831 -- TODO: Remove x tag?
6130 c95d9132592a plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions daurnimator <quae@daurnimator.com> parents: 6129 diff changeset	832 stanza.attr.from = from;
6096 84f9123637d4 plugins/muc/muc.lib: Refactor _to_occupant handlers daurnimator <quae@daurnimator.com> parents: 6095 diff changeset	833 return true;
6094 db2faeb151b6 plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions daurnimator <quae@daurnimator.com> parents: 6093 diff changeset	834 end
5061 186f34d88073 MUC: Fix private IQ and message routing. Waqas Hussain <waqas20@gmail.com> parents: 4999 diff changeset	835
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	836 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	837 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	838 :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	839 );
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	840 end
dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	841
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	842 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	843 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	844 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	845 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	846 {
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	847 name = 'FORM_TYPE',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	848 type = 'hidden',
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	849 value = 'http://jabber.org/protocol/muc#roomconfig'
530f7de1d265 MUC: Use util.dataforms to generate forms Kim Alvefur <zash@zash.se> parents: 3516 diff changeset	850 }
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	851 });
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	852 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	853 end
6201 b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	854 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	855 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	856 name = 'muc#roomconfig_roomname',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	857 type = 'text-single',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	858 label = 'Name',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	859 value = event.room:get_name() or "",
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	860 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	861 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	862 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	863 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	864 name = 'muc#roomconfig_persistentroom',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	865 type = 'boolean',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	866 label = 'Make Room Persistent?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	867 value = event.room:get_persistent()
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	868 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	869 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	870 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	871 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	872 name = 'muc#roomconfig_publicroom',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	873 type = 'boolean',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	874 label = 'Make Room Publicly Searchable?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	875 value = not event.room:get_hidden()
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	876 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	877 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	878 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	879 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	880 name = 'muc#roomconfig_changesubject',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	881 type = 'boolean',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	882 label = 'Allow Occupants to Change Subject?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	883 value = event.room:get_changesubject()
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	884 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	885 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	886 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	887 local whois = event.room:get_whois();
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	888 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	889 name = 'muc#roomconfig_whois',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	890 type = 'list-single',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	891 label = 'Who May Discover Real JIDs?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	892 value = {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	893 { value = 'moderators', label = 'Moderators Only', default = whois == 'moderators' },
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	894 { value = 'anyone', label = 'Anyone', default = whois == 'anyone' }
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	895 }
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	896 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	897 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	898 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	899 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	900 name = 'muc#roomconfig_moderatedroom',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	901 type = 'boolean',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	902 label = 'Make Room Moderated?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	903 value = event.room:get_moderated()
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	904 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	905 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	906 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	907 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	908 name = 'muc#roomconfig_membersonly',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	909 type = 'boolean',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	910 label = 'Make Room Members-Only?',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	911 value = event.room:get_members_only()
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	912 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	913 end);
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	914 module:hook("muc-config-form", function(event)
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	915 table.insert(event.form, {
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	916 name = 'muc#roomconfig_historylength',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	917 type = 'text-single',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	918 label = 'Maximum Number of History Messages Returned by Room',
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	919 value = tostring(event.room:get_historylength())
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	920 });
b9e8f5268c97 plugins/muc/muc.lib: Move default config layout into hooks daurnimator <quae@daurnimator.com> parents: 6200 diff changeset	921 end);
2216 dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	922
dbbb5ed41365 MUC: Slightly refactored form processing. Waqas Hussain <waqas20@gmail.com> parents: 2174 diff changeset	923 function room_mt:process_form(origin, stanza)
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	924 local form = stanza.tags[1]:get_child("x", "jabber:x:data");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	925 if form.attr.type == "cancel" then
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	926 origin.send(st.reply(stanza));
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	927 elseif form.attr.type == "submit" then
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	928 local fields = self:get_form_layout(stanza.attr.from):data(form);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	929 if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	930 origin.send(st.error_reply(stanza, "cancel", "bad-request", "Form is not of type room configuration"));
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	931 return true;
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	932 end
3591 dff4a77ee285 MUC: Parse submitted form with util.dataforms Kim Alvefur <zash@zash.se> parents: 3590 diff changeset	933
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	934 local event = {room = self; origin = origin; stanza = stanza; fields = fields; status_codes = {};};
b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	935 function event.update_option(name, field, allowed)
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	936 local new = fields[field];
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	937 if new == nil then return; end
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	938 if allowed and not allowed[new] then return; end
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	939 if new == self["get_"..name](self) then return; end
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	940 event.status_codes["104"] = true;
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	941 self["set_"..name](self, new);
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	942 return true;
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	943 end
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	944 module:fire_event("muc-config-submitted", event);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	945
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	946 if self.save then self:save(true); end
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	947 origin.send(st.reply(stanza));
4119 813adb81d7da MUC: Add option to allow participants to change the subject. Kim Alvefur <zash@zash.se> parents: 3989 diff changeset	948
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	949 if next(event.status_codes) then
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	950 local msg = st.message({type='groupchat', from=self.jid})
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	951 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	952 for code in pairs(event.status_codes) do
b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	953 msg:tag("status", {code = code;}):up();
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	954 end
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	955 msg:up();
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	956 self:broadcast_message(msg, false)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	957 end
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	958 else
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	959 origin.send(st.error_reply(stanza, "cancel", "bad-request", "Not a submitted form"));
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	960 end
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	961 return true;
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	962 end
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	963 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	964 event.update_option("name", "muc#roomconfig_roomname");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	965 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	966 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	967 event.update_option("persistent", "muc#roomconfig_persistentroom");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	968 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	969 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	970 event.update_option("moderated", "muc#roomconfig_moderatedroom");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	971 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	972 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	973 event.update_option("members_only", "muc#roomconfig_membersonly");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	974 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	975 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	976 event.update_option("public", "muc#roomconfig_publicroom");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	977 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	978 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	979 event.update_option("changesubject", "muc#roomconfig_changesubject");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	980 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	981 module:hook("muc-config-submitted", function(event)
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	982 event.update_option("historylength", "muc#roomconfig_historylength");
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	983 end);
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	984 module:hook("muc-config-submitted", function(event)
6203 b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	985 if event.update_option("whois", "muc#roomconfig_whois", valid_whois) then
b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	986 local code = (event.room:get_whois() == 'moderators') and "173" or "172";
b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	987 event.status_codes[code] = true;
b6ffce01e6cf plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed daurnimator <quae@daurnimator.com> parents: 6202 diff changeset	988 end
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	989 end);
1754 67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	990
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	991 -- Removes everyone from the room
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	992 function room_mt:clear(x)
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	993 x = x or st.stanza("x", {xmlns='http://jabber.org/protocol/muc#user'});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	994 local occupants_updated = {};
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	995 for nick, occupant in self:each_occupant() do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	996 occupant.role = nil;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	997 self:save_occupant(occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	998 occupants_updated[occupant] = true;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	999 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1000 for occupant in pairs(occupants_updated) do
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1001 self:publicise_occupant_status(occupant, x);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1002 module:fire_event("muc-occupant-left", { room = self; nick = occupant.nick; });
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1003 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1004 end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1005
2217 838f6d546177 MUC: Added support for the room-destroy owner use case. Waqas Hussain <waqas20@gmail.com> parents: 2216 diff changeset	1006 function room_mt:destroy(newjid, reason, password)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1007 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"})
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1008 :tag("item", { affiliation='none', role='none' }):up()
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1009 :tag("destroy", {jid=newjid});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1010 if reason then x:tag("reason"):text(reason):up(); end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1011 if password then x:tag("password"):text(password):up(); end
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1012 x:up();
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1013 self:clear(x);
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	1014 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	1015 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	1016 end
67b66eec9777 MUC: Added support for room configuration forms, persistence and hidden rooms. Waqas Hussain <waqas20@gmail.com> parents: 1753 diff changeset	1017
6101 a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1018 function room_mt:handle_disco_info_get_query(origin, stanza)
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1019 origin.send(self:get_disco_info(stanza));
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1020 return true;
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1021 end
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1022
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1023 function room_mt:handle_disco_items_get_query(origin, stanza)
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1024 origin.send(self:get_disco_items(stanza));
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1025 return true;
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1026 end
a861dc18e08d plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature daurnimator <quae@daurnimator.com> parents: 6100 diff changeset	1027
6141 bf6de8ef66c2 plugins/muc: Rename admin query hook daurnimator <quae@daurnimator.com> parents: 6140 diff changeset	1028 function room_mt:handle_admin_query_set_command(origin, stanza)
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1029 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	1030 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	1031 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	1032 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	1033 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	1034 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1035 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1036 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1037 if not item.attr.jid and item.attr.nick then -- COMPAT Workaround for Miranda sending 'nick' instead of 'jid' when changing affiliation
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1038 local occupant = self:get_occupant_by_nick(self.jid.."/"..item.attr.nick);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1039 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	1040 elseif not item.attr.nick and item.attr.jid then
6119 c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	1041 local nick = self:get_occupant_jid(item.attr.jid);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1042 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	1043 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1044 local actor = stanza.attr.from;
6112 819e00a86239 plugins/muc/muc.lib: Use more modern stanza methods daurnimator <quae@daurnimator.com> parents: 6111 diff changeset	1045 local reason = item:get_child_text("reason");
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1046 local success, errtype, err
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1047 if item.attr.affiliation and item.attr.jid and not item.attr.role then
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1048 success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, reason);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1049 elseif item.attr.role and item.attr.nick and not item.attr.affiliation then
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1050 success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, reason);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1051 else
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1052 success, errtype, err = nil, "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	1053 end
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1054 if not success then origin.send(st.error_reply(stanza, errtype, err)); end
6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1055 origin.send(st.reply(stanza));
6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1056 return true;
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1057 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1058
6141 bf6de8ef66c2 plugins/muc: Rename admin query hook daurnimator <quae@daurnimator.com> parents: 6140 diff changeset	1059 function room_mt:handle_admin_query_get_command(origin, stanza)
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1060 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	1061 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	1062 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	1063 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	1064 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	1065 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	1066 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	1067 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	1068 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	1069 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	1070 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	1071 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1072 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1073 origin.send(reply);
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1074 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1075 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1076 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	1077 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1078 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1079 elseif _rol and not _aff then
6126 122e0f26e8f6 plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a TODO that's already done daurnimator <quae@daurnimator.com> parents: 6125 diff changeset	1080 local role = self:get_role(self:get_occupant_jid(actor)) or self:get_default_role(affiliation);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1081 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	1082 if _rol == "none" then _rol = nil; end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1083 self:send_occupant_list(actor, function(occupant_jid, occupant) return occupant.role == _rol end);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1084 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1085 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1086 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	1087 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1088 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1089 else
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1090 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	1091 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1092 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1093 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1094
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1095 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	1096 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	1097 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	1098 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1099 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1100
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1101 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	1102 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1103 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1104 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	1105 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	1106 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	1107 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1108 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1109
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1110 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	1111 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	1112 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	1113 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1114 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	1115 local newjid = child.attr.jid;
6112 819e00a86239 plugins/muc/muc.lib: Use more modern stanza methods daurnimator <quae@daurnimator.com> parents: 6111 diff changeset	1116 local reason = child:get_child_text("reason");
819e00a86239 plugins/muc/muc.lib: Use more modern stanza methods daurnimator <quae@daurnimator.com> parents: 6111 diff changeset	1117 local password = child:get_child_text("password");
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1118 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	1119 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	1120 return true;
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	1121 elseif child.name == "x" and child.attr.xmlns == "jabber:x:data" then
64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	1122 return self:process_form(origin, stanza);
6095 7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1123 else
6202 64ed7f538f81 plugins/muc/muc.lib: Refactor out process_form into hooks daurnimator <quae@daurnimator.com> parents: 6201 diff changeset	1124 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	1125 return true;
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1126 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1127 end
7900ebc544ce plugins/muc/muc.lib: Split out the room iq handler into functions daurnimator <quae@daurnimator.com> parents: 6094 diff changeset	1128
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1129 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	1130 local from = stanza.attr.from;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1131 local occupant = self:get_occupant_by_real_jid(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	1132 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	1133 origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
6098 1d7e5d091980 plugins/muc/muc.lib: Add some missing return values daurnimator <quae@daurnimator.com> parents: 6097 diff changeset	1134 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	1135 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	1136 origin.send(st.error_reply(stanza, "auth", "forbidden"));
6098 1d7e5d091980 plugins/muc/muc.lib: Add some missing return values daurnimator <quae@daurnimator.com> parents: 6097 diff changeset	1137 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	1138 else
5613 f3166adab512 mod_muc: Remove unused variable Matthew Wild <mwild1@gmail.com> parents: 5612 diff changeset	1139 local from = stanza.attr.from;
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1140 stanza.attr.from = occupant.nick;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1141 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	1142 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	1143 if occupant.role == "moderator" or
6118 aae3d6daa50d plugins/muc/muc.lib: Fetch config via accessors instead of using `_data` daurnimator <quae@daurnimator.com> parents: 6117 diff changeset	1144 ( self:get_changesubject() and occupant.role == "participant" ) then -- and participant
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1145 self:set_subject(occupant.nick, subject);
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1146 else
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1147 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	1148 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	1149 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1150 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	1151 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	1152 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	1153 stanza.attr.from = from;
6098 1d7e5d091980 plugins/muc/muc.lib: Add some missing return values daurnimator <quae@daurnimator.com> parents: 6097 diff changeset	1154 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	1155 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1156 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1157
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1158 -- 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	1159 function room_mt:handle_presence_to_room(origin, stanza)
6119 c13f5d6b9b16 plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick daurnimator <quae@daurnimator.com> parents: 6118 diff changeset	1160 local current_nick = self:get_occupant_jid(stanza.attr.from);
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	1161 local handled
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1162 if current_nick then
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1163 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	1164 stanza.attr.to = current_nick;
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	1165 handled = self:handle_presence_to_occupant(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	1166 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	1167 end
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	1168 return handled;
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1169 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1170
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1171 -- Need visitor role or higher to invite
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1172 module:hook("muc-pre-invite", function(event)
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1173 local room, stanza = event.room, event.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	1174 local _from, _to = stanza.attr.from, stanza.attr.to;
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1175 local inviter = room:get_occupant_by_real_jid(_from);
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1176 local role = inviter and inviter.role or room:get_default_role(room:get_affiliation(_from));
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1177 if valid_roles[role or "none"] <= valid_roles.visitor then
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1178 event.origin.send(st.error_reply(stanza, "auth", "forbidden"));
6103 25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1179 return true;
25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1180 end
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1181 end);
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1182
6198 8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1183 -- Invitation privileges in members-only rooms SHOULD be restricted to room admins;
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1184 -- if a member without privileges to edit the member list attempts to invite another user
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1185 -- the service SHOULD return a <forbidden/> error to the occupant
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1186 module:hook("muc-pre-invite", function(event)
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1187 local room, stanza = event.room, event.stanza;
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1188 if room:get_members_only() and valid_affiliations[room:get_affiliation(stanza.attr.from) or "none"] < valid_affiliations.admin then
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1189 event.origin.send(st.error_reply(stanza, "auth", "forbidden"));
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1190 return true;
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1191 end
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1192 end);
8936b9fbedfd plugins/muc/muc.lib: restrict invitations in members only rooms to admins daurnimator <quae@daurnimator.com> parents: 6197 diff changeset	1193
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1194 function room_mt:handle_mediated_invite(origin, stanza)
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1195 local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite");
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1196 local invitee = jid_prep(payload.attr.to);
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1197 if not invitee 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	1198 origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
6098 1d7e5d091980 plugins/muc/muc.lib: Add some missing return values daurnimator <quae@daurnimator.com> parents: 6097 diff changeset	1199 return true;
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1200 elseif not module:fire_event("muc-pre-invite", {room = self, origin = origin, stanza = stanza}) then
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1201 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	1202 end
6195 9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1203 local invite = st.message({from = self.jid, to = invitee, id = stanza.attr.id})
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1204 :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1205 :tag('invite', {from = stanza.attr.from;})
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1206 :tag('reason'):text(payload:get_child_text("reason")):up()
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1207 :up()
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1208 :up();
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1209 if not module:fire_event("muc-invite", {room = self, stanza = invite, origin = origin, incoming = stanza}) then
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1210 self:route_stanza(invite);
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1211 end
9f6a003baf2e plugins/muc/muc.lib: Add pre-invite event. Move role check to it daurnimator <quae@daurnimator.com> parents: 6194 diff changeset	1212 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	1213 end
9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1214
6194 9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1215 -- COMPAT: Some older clients expect this
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1216 module:hook("muc-invite", function(event)
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1217 local room, stanza = event.room, event.stanza;
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1218 local invite = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite");
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1219 local reason = invite:get_child_text("reason");
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1220 stanza:tag('x', {xmlns = "jabber:x:conference"; jid = room.jid;})
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1221 :text(reason or "")
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1222 :up();
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1223 end);
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1224
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1225 -- Add a plain message for clients which don't support invites
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1226 module:hook("muc-invite", function(event)
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1227 local room, stanza = event.room, event.stanza;
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1228 local invite = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite");
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1229 local reason = invite:get_child_text("reason") or "";
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1230 stanza:tag("body")
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1231 :text(invite.attr.from.." invited you to the room "..room.jid..(reason == "" and (" ("..reason..")") or ""))
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1232 :up();
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1233 end);
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1234
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1235 -- Mask 'from' jid as occupant jid if room is anonymous
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1236 module:hook("muc-invite", function(event)
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1237 local room, stanza = event.room, event.stanza;
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1238 if room:get_whois() == "moderators" and room:get_default_role(room:get_affiliation(stanza.attr.to)) ~= "moderator" then
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1239 local invite = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite");
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1240 local occupant_jid = room:get_occupant_jid(invite.attr.from);
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1241 if occupant_jid ~= nil then -- FIXME: This will expose real jid if inviter is not in room
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1242 invite.attr.from = occupant_jid;
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1243 end
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1244 end
9b6c2d89f143 plugins/muc/muc.lib: Tidy up muc-invite event. daurnimator <quae@daurnimator.com> parents: 6193 diff changeset	1245 end, 50);
6125 4a35a0281d8a plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name daurnimator <quae@daurnimator.com> parents: 6124 diff changeset	1246
6121 74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1247 -- When an invite is sent; add an affiliation for the invitee
6125 4a35a0281d8a plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name daurnimator <quae@daurnimator.com> parents: 6124 diff changeset	1248 module:hook("muc-invite", function(event)
6121 74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1249 local room, stanza = event.room, event.stanza
74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1250 local invitee = stanza.attr.to
74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1251 if room:get_members_only() and not room:get_affiliation(invitee) then
74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1252 local from = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("invite").attr.from
74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1253 log("debug", "%s invited %s into members only room %s, granting membership", from, invitee, room.jid);
6197 1ee4d8953544 plugins/muc/muc.lib: Don't try and get occupant jids for annotating invite affiliation changes daurnimator <quae@daurnimator.com> parents: 6196 diff changeset	1254 room:set_affiliation(from, invitee, "member", "Invited by " .. from); -- This might fail; ignore for now
6121 74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1255 end
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	1256 end);
6121 74bbcef3978e plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms daurnimator <quae@daurnimator.com> parents: 6120 diff changeset	1257
6123 7f82bbd249fe plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_`; extract it from inside. daurnimator <quae@daurnimator.com>* parents: 6122 diff changeset	1258 function room_mt:handle_mediated_decline(origin, stanza)
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1259 local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline");
6105 68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1260 local declinee = jid_prep(payload.attr.to);
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1261 if not declinee then
6105 68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1262 origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1263 return true;
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1264 elseif not module:fire_event("muc-pre-decline", {room = self, origin = origin, stanza = stanza}) then
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1265 return true;
6105 68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1266 end
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1267 local decline = st.message({from = self.jid, to = declinee, id = stanza.attr.id})
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1268 :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1269 :tag("decline", {from = stanza.attr.from})
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1270 :tag("reason"):text(payload:get_child_text("reason")):up()
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1271 :up()
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1272 :up();
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1273 if not module:fire_event("muc-decline", {room = self, stanza = decline, origin = origin, incoming = stanza}) then
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1274 local occupant = self:get_occupant_by_real_jid(decline.attr.to);
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1275 if occupant then
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1276 self:route_to_occupant(occupant, decline);
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1277 else
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1278 self:route_stanza(decline);
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1279 end
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1280 end
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1281 return true;
6105 68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1282 end
68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1283
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1284 -- Add a plain message for clients which don't support declines
6131 8dd0c6145603 plugins/muc/muc.lib: Add decline event for parity with invite daurnimator <quae@daurnimator.com> parents: 6130 diff changeset	1285 module:hook("muc-decline", function(event)
6196 e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1286 local room, stanza = event.room, event.stanza;
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1287 local decline = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline");
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1288 local reason = decline:get_child_text("reason") or "";
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1289 stanza:tag("body")
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1290 :text(decline.attr.from.." declined your invite to the room "..room.jid..(reason == "" and (" ("..reason..")") or ""))
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1291 :up();
e73bb1568d87 plugins/muc/muc.lib: Update declines to be more like invites daurnimator <quae@daurnimator.com> parents: 6195 diff changeset	1292 end);
6131 8dd0c6145603 plugins/muc/muc.lib: Add decline event for parity with invite daurnimator <quae@daurnimator.com> parents: 6130 diff changeset	1293
6093 9a7eaf0a35b6 plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko) daurnimator <quae@daurnimator.com> parents: 6092 diff changeset	1294 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	1295 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	1296 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	1297 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	1298 elseif type == "error" and is_kickable_error(stanza) then
6100 c78ba94d3261 plugins/muc/muc.lib: Move all kick code into one place daurnimator <quae@daurnimator.com> parents: 6099 diff changeset	1299 return self:handle_kickable(origin, stanza)
6103 25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1300 elseif type == nil then
25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1301 local x = stanza:get_child("x", "http://jabber.org/protocol/muc#user");
25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1302 if x then
25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1303 local payload = x.tags[1];
6104 260a18062cb2 plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic daurnimator <quae@daurnimator.com> parents: 6103 diff changeset	1304 if payload == nil then
260a18062cb2 plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic daurnimator <quae@daurnimator.com> parents: 6103 diff changeset	1305 -- fallthrough
260a18062cb2 plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic daurnimator <quae@daurnimator.com> parents: 6103 diff changeset	1306 elseif payload.name == "invite" and payload.attr.to then
6123 7f82bbd249fe plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_`; extract it from inside. daurnimator <quae@daurnimator.com>* parents: 6122 diff changeset	1307 return self:handle_mediated_invite(origin, stanza)
6105 68f53b9a186e plugins/muc/muc: Support mediated declines daurnimator <quae@daurnimator.com> parents: 6104 diff changeset	1308 elseif payload.name == "decline" and payload.attr.to then
6123 7f82bbd249fe plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_`; extract it from inside. daurnimator <quae@daurnimator.com>* parents: 6122 diff changeset	1309 return self:handle_mediated_decline(origin, stanza)
6103 25ba4e2b31b3 plugins/muc/muc: Check for mediated invites in a smarter way daurnimator <quae@daurnimator.com> parents: 6102 diff changeset	1310 end
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	1311 origin.send(st.error_reply(stanza, "cancel", "bad-request"));
6098 1d7e5d091980 plugins/muc/muc.lib: Add some missing return values daurnimator <quae@daurnimator.com> parents: 6097 diff changeset	1312 return true;
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	1313 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1314 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1315 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1316
6111 f8b94903be52 plugins/muc: Provide a reasonable default `route_stanza` daurnimator <quae@daurnimator.com> parents: 6108 diff changeset	1317 function room_mt:route_stanza(stanza)
6180 35388114439f plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments) daurnimator <quae@daurnimator.com> parents: 6179 diff changeset	1318 module:send(stanza);
6111 f8b94903be52 plugins/muc: Provide a reasonable default `route_stanza` daurnimator <quae@daurnimator.com> parents: 6108 diff changeset	1319 end
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1320
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1321 function room_mt:get_affiliation(jid)
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1322 local node, host, resource = jid_split(jid);
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1323 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	1324 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	1325 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	1326 return result;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1327 end
6186 85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1328
6181 6baa9a59aa03 plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation daurnimator <quae@daurnimator.com> parents: 6180 diff changeset	1329 function room_mt:set_affiliation(actor, jid, affiliation, reason)
6186 85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1330 if not actor then return nil, "modify", "not-acceptable"; end;
85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1331
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1332 jid = jid_bare(jid);
6186 85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1333
85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1334 if valid_affiliations[affiliation or "none"] == nil then
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1335 return nil, "modify", "not-acceptable";
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1336 end
6186 85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1337 affiliation = affiliation ~= "none" and affiliation or nil; -- coerces `affiliation == false` to `nil`
85f7cd91dc31 plugins/muc/muc.lib: Smarter validation in set_affiliation daurnimator <quae@daurnimator.com> parents: 6185 diff changeset	1338
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1339 local target_affiliation = self._affiliations[jid]; -- Raw; don't want to check against host
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1340 local is_downgrade = valid_affiliations[target_affiliation or "none"] > valid_affiliations[affiliation or "none"];
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1341
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1342 if actor ~= true then
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1343 local actor_bare = jid_bare(actor);
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1344 local actor_affiliation = self._affiliations[actor_bare];
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1345 if actor_affiliation == "owner" then
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1346 if actor_bare == jid then -- self change
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1347 -- need at least one owner
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1348 local is_last = true;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1349 for j, aff in pairs(self._affiliations) do if j ~= jid and aff == "owner" then is_last = false; break; end end
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1350 if is_last then
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1351 return nil, "cancel", "conflict";
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1352 end
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1353 end
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1354 -- owners can do anything else
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1355 elseif affiliation == "owner" or affiliation == "admin"
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1356 or actor_affiliation ~= "admin"
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1357 or target_affiliation == "owner" or target_affiliation == "admin" then
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1358 -- Can't demote owners or other admins
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1359 return nil, "cancel", "not-allowed";
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	1360 end
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1361 end
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1362
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1363 -- Set in 'database'
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1364 self._affiliations[jid] = affiliation;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1365
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1366 -- Update roles
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1367 local role = self:get_default_role(affiliation);
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1368 local role_rank = valid_roles[role or "none"];
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1369 local occupants_updated = {}; -- Filled with old roles
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1370 for nick, occupant in self:each_occupant() do
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1371 if occupant.bare_jid == jid then
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1372 -- need to publcize in all cases; as affiliation in <item/> has changed.
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1373 occupants_updated[occupant] = occupant.role;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1374 if occupant.role ~= role and (
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1375 is_downgrade or
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1376 valid_roles[occupant.role or "none"] < role_rank -- upgrade
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1377 ) then
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1378 occupant.role = role;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1379 self:save_occupant(occupant);
4357 d6928b78c548 MUC: Allow affiliation change when argument actor==true in room:set_affiliation(). Waqas Hussain <waqas20@gmail.com> parents: 4326 diff changeset	1380 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	1381 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	1382 end
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1383
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1384 -- Tell the room of the new occupant affiliations+roles
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1385 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"});
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1386 if not role then -- getting kicked
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1387 if affiliation == "outcast" then
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1388 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	1389 else
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1390 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	1391 end
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1392 end
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1393 local is_semi_anonymous = self:get_whois() == "moderators";
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1394 for occupant, old_role in pairs(occupants_updated) do
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1395 self:publicise_occupant_status(occupant, x, actor, reason);
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1396 if is_semi_anonymous and
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1397 (old_role == "moderator" and occupant.role ~= "moderator") or
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1398 (old_role ~= "moderator" and occupant.role == "moderator") then -- Has gained or lost moderator status
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1399 -- Send everyone else's presences (as jid visibility has changed)
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1400 for real_jid in occupant:each_session() do
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1401 self:send_occupant_list(real_jid, function(occupant_jid, occupant)
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1402 return occupant.bare_jid ~= jid;
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1403 end);
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1404 end
c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1405 end
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1406 end
6187 c0b4b5d41e55 plugins/muc/muc.lib: Improve set affiliation logic; daurnimator <quae@daurnimator.com> parents: 6186 diff changeset	1407
1755 1614e8e62ad5 MUC: Fixed an undefined global access. Waqas Hussain <waqas20@gmail.com> parents: 1754 diff changeset	1408 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	1409 return true;
1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1410 end
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1411
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1412 function room_mt:get_role(nick)
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1413 local occupant = self:get_occupant_by_nick(nick);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1414 return occupant and occupant.role or nil;
1742 1483a62d69bb MUC: Owners can now modify roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1740 diff changeset	1415 end
6182 dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1416
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1417 function room_mt:set_role(actor, occupant_jid, role, reason)
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1418 if not actor then return nil, "modify", "not-acceptable"; end
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1419
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1420 local occupant = self:get_occupant_by_nick(occupant_jid);
6182 dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1421 if not occupant then return nil, "modify", "not-acceptable"; end
5542 329ebdfb39a2 MUC: Allow actor == true to set roles (like affiliations) Matthew Wild <mwild1@gmail.com> parents: 5541 diff changeset	1422
6182 dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1423 if valid_roles[role or "none"] == nil then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1424 return nil, "modify", "not-acceptable";
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1425 end
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1426 role = role ~= "none" and role or nil; -- coerces `role == false` to `nil`
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1427
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1428 if actor ~= true then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1429 -- Can't do anything to other owners or admins
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1430 local occupant_affiliation = self:get_affiliation(occupant.bare_jid);
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1431 if occupant_affiliation == "owner" and occupant_affiliation == "admin" then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1432 return nil, "cancel", "not-allowed";
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1433 end
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1434
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1435 -- If you are trying to give or take moderator role you need to be an owner or admin
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1436 if occupant.role == "moderator" or role == "moderator" then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1437 local actor_affiliation = self:get_affiliation(actor);
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1438 if actor_affiliation ~= "owner" and actor_affiliation ~= "admin" then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1439 return nil, "cancel", "not-allowed";
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1440 end
8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1441 end
6182 dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1442
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1443 -- Need to be in the room and a moderator
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1444 local actor_occupant = self:get_occupant_by_real_jid(actor);
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1445 if not actor_occupant or actor_occupant.role ~= "moderator" then
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1446 return nil, "cancel", "not-allowed";
dbf0b09664cd plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role daurnimator <quae@daurnimator.com> parents: 6181 diff changeset	1447 end
3279 8b0a4a7d2c6e MUC: Added room:can_set_role(). Waqas Hussain <waqas20@gmail.com> parents: 3264 diff changeset	1448 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1449
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1450 local x = st.stanza("x", {xmlns = "http://jabber.org/protocol/muc#user"});
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1451 if not role then
3632 d82189efecc0 MUC: Include the user's current presence contents when broadcasting a role change. Waqas Hussain <waqas20@gmail.com> parents: 3631 diff changeset	1452 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	1453 end
6179 e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1454 occupant.role = role;
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1455 self:save_occupant(occupant);
e488a90195bc plugins/muc: Massive refactor daurnimator <quae@daurnimator.com> parents: 6143 diff changeset	1456 self:publicise_occupant_status(occupant, x, actor, reason);
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1457 return true;
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1458 end
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1459
6204 c3254827698d plugins/muc/muc.lib: Move description functions out to own file daurnimator <quae@daurnimator.com> parents: 6203 diff changeset	1460 local description = module:require "muc/description";
c3254827698d plugins/muc/muc.lib: Move description functions out to own file daurnimator <quae@daurnimator.com> parents: 6203 diff changeset	1461 room_mt.get_description = description.get;
c3254827698d plugins/muc/muc.lib: Move description functions out to own file daurnimator <quae@daurnimator.com> parents: 6203 diff changeset	1462 room_mt.set_description = description.set;
c3254827698d plugins/muc/muc.lib: Move description functions out to own file daurnimator <quae@daurnimator.com> parents: 6203 diff changeset	1463
6208 d724289a5226 plugins/muc: Move password functions to seperate module daurnimator <quae@daurnimator.com> parents: 6206 diff changeset	1464 local password = module:require "muc/password";
d724289a5226 plugins/muc: Move password functions to seperate module daurnimator <quae@daurnimator.com> parents: 6206 diff changeset	1465 room_mt.get_password = password.get;
d724289a5226 plugins/muc: Move password functions to seperate module daurnimator <quae@daurnimator.com> parents: 6206 diff changeset	1466 room_mt.set_password = password.set;
d724289a5226 plugins/muc: Move password functions to seperate module daurnimator <quae@daurnimator.com> parents: 6206 diff changeset	1467
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1468 local _M = {}; -- module "muc"
31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1469
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	1470 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	1471 return setmetatable({
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1472 jid = jid;
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1473 _jid_nick = {};
1739 393abf245322 MUC: Renamed _participants table to _occupants Waqas Hussain <waqas20@gmail.com> parents: 1737 diff changeset	1474 _occupants = {};
2411 c2b6c55201af Add support for non-anonymous MUC rooms Rob Hoelz <rob@hoelzro.net> parents: 2217 diff changeset	1475 _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	1476 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	1477 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	1478 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	1479 };
1737 31c3eb5797c7 MUC: Initial support for roles and affiliations Waqas Hussain <waqas20@gmail.com> parents: 1736 diff changeset	1480 _affiliations = {};
1735 81406277279e MUC: The MUC lib is now metatable based. Cleaned up code, etc. Waqas Hussain <waqas20@gmail.com> parents: 1734 diff changeset	1481 }, room_mt);
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1482 end
34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1483
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	1484 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	1485 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	1486 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	1487
5063 4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1488 _M.room_mt = room_mt;
4bc202a7b351 MUC: Expose room metatable in the MUC lib. Waqas Hussain <waqas20@gmail.com> parents: 5061 diff changeset	1489
1734 34ac9ba0aad6 MUC: Added initial MUC lib Waqas Hussain <waqas20@gmail.com> parents: diff changeset	1490 return _M;

prosody

d724289a5226

plugins/muc/muc.lib.lua

Software / code / prosody

Annotate

plugins/muc/muc.lib.lua @ 6208:d724289a5226

Software `/` code `/` prosody