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