Sat, 03 Oct 2009 02:33:33 +0100
util.timer: Pass current_time to timer callbacks
1734 | 1 | -- Prosody IM |
2 | -- Copyright (C) 2008-2009 Matthew Wild | |
3 | -- Copyright (C) 2008-2009 Waqas Hussain | |
4 | -- | |
5 | -- This project is MIT/X11 licensed. Please see the | |
6 | -- COPYING file in the source package for more information. | |
7 | -- | |
8 | ||
9 | local datamanager = require "util.datamanager"; | |
10 | local datetime = require "util.datetime"; | |
11 | ||
12 | local jid_split = require "util.jid".split; | |
13 | local jid_bare = require "util.jid".bare; | |
1862
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
14 | local jid_prep = require "util.jid".prep; |
1734 | 15 | local st = require "util.stanza"; |
16 | local log = require "util.logger".init("mod_muc"); | |
17 | local multitable_new = require "util.multitable".new; | |
18 | 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
|
19 | local setmetatable = setmetatable; |
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
20 | 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
|
21 | local md5 = require "util.hashes".md5; |
1734 | 22 | |
23 | local muc_domain = nil; --module:get_host(); | |
24 | local history_length = 20; | |
25 | ||
26 | ------------ | |
27 | local function filter_xmlns_from_array(array, filters) | |
28 | local count = 0; | |
29 | for i=#array,1,-1 do | |
30 | local attr = array[i].attr; | |
31 | if filters[attr and attr.xmlns] then | |
32 | t_remove(array, i); | |
33 | count = count + 1; | |
34 | end | |
35 | end | |
36 | return count; | |
37 | end | |
38 | local function filter_xmlns_from_stanza(stanza, filters) | |
39 | if filters then | |
40 | if filter_xmlns_from_array(stanza.tags, filters) ~= 0 then | |
41 | return stanza, filter_xmlns_from_array(stanza, filters); | |
42 | end | |
43 | end | |
44 | return stanza, 0; | |
45 | end | |
46 | local presence_filters = {["http://jabber.org/protocol/muc"]=true;["http://jabber.org/protocol/muc#user"]=true}; | |
47 | local function get_filtered_presence(stanza) | |
48 | return filter_xmlns_from_stanza(st.clone(stanza), presence_filters); | |
49 | end | |
50 | local kickable_error_conditions = { | |
51 | ["gone"] = true; | |
52 | ["internal-server-error"] = true; | |
53 | ["item-not-found"] = true; | |
54 | ["jid-malformed"] = true; | |
55 | ["recipient-unavailable"] = true; | |
56 | ["redirect"] = true; | |
57 | ["remote-server-not-found"] = true; | |
58 | ["remote-server-timeout"] = true; | |
59 | ["service-unavailable"] = true; | |
60 | }; | |
61 | local function get_kickable_error(stanza) | |
62 | for _, tag in ipairs(stanza.tags) do | |
63 | if tag.name == "error" and tag.attr.xmlns == "jabber:client" then | |
64 | for _, cond in ipairs(tag.tags) do | |
65 | if cond.attr.xmlns == "urn:ietf:params:xml:ns:xmpp-stanzas" then | |
66 | return kickable_error_conditions[cond.name] and cond.name; | |
67 | end | |
68 | end | |
69 | return true; -- malformed error message | |
70 | end | |
71 | end | |
72 | return true; -- malformed error message | |
73 | end | |
74 | local function getUsingPath(stanza, path, getText) | |
75 | local tag = stanza; | |
76 | for _, name in ipairs(path) do | |
77 | if type(tag) ~= 'table' then return; end | |
78 | tag = tag:child_with_name(name); | |
79 | end | |
80 | if tag and getText then tag = table.concat(tag); end | |
81 | return tag; | |
82 | end | |
83 | local function getTag(stanza, path) return getUsingPath(stanza, path); end | |
84 | local function getText(stanza, path) return getUsingPath(stanza, path, true); end | |
85 | ----------- | |
86 | ||
87 | --[[function get_room_disco_info(room, stanza) | |
88 | return st.iq({type='result', id=stanza.attr.id, from=stanza.attr.to, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#info") | |
89 | :tag("identity", {category='conference', type='text', name=room._data["name"]):up() | |
90 | :tag("feature", {var="http://jabber.org/protocol/muc"}); -- TODO cache disco reply | |
91 | end | |
92 | function get_room_disco_items(room, stanza) | |
93 | return st.iq({type='result', id=stanza.attr.id, from=stanza.attr.to, to=stanza.attr.from}):query("http://jabber.org/protocol/disco#items"); | |
94 | end -- TODO allow non-private rooms]] | |
95 | ||
96 | -- | |
97 | ||
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
98 | local room_mt = {}; |
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
99 | room_mt.__index = room_mt; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
100 | |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
101 | function room_mt:get_default_role(affiliation) |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
102 | if affiliation == "owner" or affiliation == "admin" then |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
103 | return "moderator"; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
104 | elseif affiliation == "member" or not affiliation then |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
105 | return "participant"; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
106 | end |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
107 | end |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
108 | |
1736
98f833669d7f
MUC: Fixed function declarations.
Waqas Hussain <waqas20@gmail.com>
parents:
1735
diff
changeset
|
109 | function room_mt:broadcast_presence(stanza, code, nick) |
1734 | 110 | stanza = get_filtered_presence(stanza); |
1835
f67e4bfc62f1
MUC: Renamed a variable name.
Waqas Hussain <waqas20@gmail.com>
parents:
1834
diff
changeset
|
111 | local occupant = self._occupants[stanza.attr.from]; |
1734 | 112 | stanza:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
1835
f67e4bfc62f1
MUC: Renamed a variable name.
Waqas Hussain <waqas20@gmail.com>
parents:
1834
diff
changeset
|
113 | :tag("item", {affiliation=occupant.affiliation, role=occupant.role, nick=nick}):up(); |
1734 | 114 | if code then |
115 | stanza:tag("status", {code=code}):up(); | |
116 | end | |
1834
8e66c9d09f81
MUC: Refactored to remove some duplicate code.
Waqas Hussain <waqas20@gmail.com>
parents:
1819
diff
changeset
|
117 | 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
|
118 | local me = self._occupants[stanza.attr.from]; |
1734 | 119 | if me then |
120 | stanza:tag("status", {code='110'}); | |
121 | for jid in pairs(me.sessions) do | |
122 | stanza.attr.to = jid; | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
123 | self:route_stanza(stanza); |
1734 | 124 | end |
125 | end | |
126 | end | |
1736
98f833669d7f
MUC: Fixed function declarations.
Waqas Hussain <waqas20@gmail.com>
parents:
1735
diff
changeset
|
127 | function room_mt:broadcast_message(stanza, historic) |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
128 | for occupant, o_data in pairs(self._occupants) do |
1734 | 129 | for jid in pairs(o_data.sessions) do |
130 | stanza.attr.to = jid; | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
131 | self:route_stanza(stanza); |
1734 | 132 | end |
133 | end | |
134 | 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
|
135 | 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
|
136 | if not history then history = {}; self._data['history'] = history; end |
1734 | 137 | -- stanza = st.clone(stanza); |
138 | stanza:tag("delay", {xmlns = "urn:xmpp:delay", from = muc_domain, stamp = datetime.datetime()}):up(); -- XEP-0203 | |
139 | stanza:tag("x", {xmlns = "jabber:x:delay", from = muc_domain, stamp = datetime.legacy()}):up(); -- XEP-0091 (deprecated) | |
140 | t_insert(history, st.clone(st.preserialize(stanza))); | |
141 | while #history > history_length do t_remove(history, 1) end | |
142 | end | |
143 | end | |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
144 | 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
|
145 | 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
|
146 | if rnick ~= nick then |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
147 | 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
|
148 | stanza.attr.to = jid; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
149 | self:route_stanza(stanza); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
150 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
151 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
152 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
153 | end |
1734 | 154 | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
155 | 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
|
156 | local current_nick = self._jid_nick[to]; |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
157 | for occupant, o_data in pairs(self._occupants) do |
1734 | 158 | if occupant ~= current_nick then |
159 | local pres = get_filtered_presence(o_data.sessions[o_data.jid]); | |
160 | pres.attr.to, pres.attr.from = to, occupant; | |
161 | pres:tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) | |
162 | :tag("item", {affiliation=o_data.affiliation, role=o_data.role}):up(); | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
163 | self:route_stanza(pres); |
1734 | 164 | end |
165 | end | |
166 | end | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
167 | function room_mt:send_history(to) |
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
168 | local history = self._data['history']; -- send discussion history |
1734 | 169 | if history then |
170 | for _, msg in ipairs(history) do | |
171 | msg = st.deserialize(msg); | |
172 | msg.attr.to=to; | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
173 | self:route_stanza(msg); |
1734 | 174 | end |
175 | end | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
176 | if self._data['subject'] then |
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
177 | self:route_stanza(st.message({type='groupchat', from=self.jid, to=to}):tag("subject"):text(self._data['subject'])); |
1734 | 178 | end |
179 | end | |
180 | ||
1756
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
181 | local function room_get_disco_info(self, stanza) |
1816
e164fdb2d18f
MUC: Added MUC feature to the disco#info replies of rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1778
diff
changeset
|
182 | return st.reply(stanza):query("http://jabber.org/protocol/disco#info") |
e164fdb2d18f
MUC: Added MUC feature to the disco#info replies of rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1778
diff
changeset
|
183 | :tag("identity", {category="conference", type="text"}):up() |
e164fdb2d18f
MUC: Added MUC feature to the disco#info replies of rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1778
diff
changeset
|
184 | :tag("feature", {var="http://jabber.org/protocol/muc"}); |
1756
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
185 | end |
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
186 | local function room_get_disco_items(self, stanza) |
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
187 | return st.reply(stanza):query("http://jabber.org/protocol/disco#items"); |
b2291156a9c2
MUC: Added service discovery replies for rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1755
diff
changeset
|
188 | end |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
189 | function room_mt:set_subject(current_nick, subject) |
1734 | 190 | -- TODO check nick's authority |
191 | 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
|
192 | self._data['subject'] = subject; |
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
193 | if self.save then self:save(); end |
1734 | 194 | local msg = st.message({type='groupchat', from=current_nick}) |
195 | :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
|
196 | self:broadcast_message(msg, false); |
1734 | 197 | return true; |
198 | end | |
199 | ||
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
200 | function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc |
1734 | 201 | local from, to = stanza.attr.from, stanza.attr.to; |
202 | local room = jid_bare(to); | |
203 | local current_nick = self._jid_nick[from]; | |
204 | local type = stanza.attr.type; | |
205 | log("debug", "room: %s, current_nick: %s, stanza: %s", room or "nil", current_nick or "nil", stanza:top_tag()); | |
206 | if (select(2, jid_split(from)) == muc_domain) then error("Presence from the MUC itself!!!"); end | |
207 | if stanza.name == "presence" then | |
208 | local pr = get_filtered_presence(stanza); | |
209 | pr.attr.from = current_nick; | |
210 | if type == "error" then -- error, kick em out! | |
211 | if current_nick then | |
212 | log("debug", "kicking %s from %s", current_nick, room); | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
213 | 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
|
214 | :tag('status'):text('This participant is kicked from the room because he sent an error presence')); -- send unavailable |
1734 | 215 | end |
216 | elseif type == "unavailable" then -- unavailable | |
217 | if current_nick then | |
218 | log("debug", "%s leaving %s", current_nick, room); | |
1836
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
219 | 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:
1835
diff
changeset
|
220 | local old_session = occupant.sessions[from]; |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
221 | 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:
1835
diff
changeset
|
222 | 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:
1835
diff
changeset
|
223 | if new_jid then |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
224 | occupant.jid = new_jid; |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
225 | occupant.sessions[from] = nil; |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
226 | local pr = st.clone(occupant[new_jid]) |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
227 | :tag("x", {xmlns='http://jabber.org/protocol/muc#user'}) |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
228 | :tag("item", {affiliation=occupant.affiliation, role=occupant.role}); |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
229 | self:broadcast_except_nick(pr, current_nick); |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
230 | else |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
231 | occupant.role = 'none'; |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
232 | self:broadcast_presence(pr); |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
233 | self._occupants[current_nick] = nil; |
de165b5de254
MUC: Added multi-session support to the room-exiting occupant use case.
Waqas Hussain <waqas20@gmail.com>
parents:
1835
diff
changeset
|
234 | end |
1734 | 235 | self._jid_nick[from] = nil; |
236 | end | |
237 | elseif not type then -- available | |
238 | if current_nick then | |
239 | --if #pr == #stanza or current_nick ~= to then -- commented because google keeps resending directed presence | |
240 | if current_nick == to then -- simple presence | |
241 | log("debug", "%s broadcasted presence", current_nick); | |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
242 | self._occupants[current_nick].sessions[from] = pr; |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
243 | self:broadcast_presence(pr); |
1734 | 244 | else -- change nick |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
245 | if self._occupants[to] then |
1734 | 246 | 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:
1816
diff
changeset
|
247 | 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:
1816
diff
changeset
|
248 | reply.tags[1].attr.code = "409"; |
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1816
diff
changeset
|
249 | origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
1734 | 250 | else |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
251 | local data = self._occupants[current_nick]; |
1734 | 252 | local to_nick = select(3, jid_split(to)); |
253 | if to_nick then | |
254 | log("debug", "%s (%s) changing nick to %s", current_nick, data.jid, to); | |
255 | local p = st.presence({type='unavailable', from=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
|
256 | self:broadcast_presence(p, '303', to_nick); |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
257 | self._occupants[current_nick] = nil; |
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
258 | self._occupants[to] = data; |
1734 | 259 | self._jid_nick[from] = to; |
260 | pr.attr.from = to; | |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
261 | self._occupants[to].sessions[from] = pr; |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
262 | self:broadcast_presence(pr); |
1734 | 263 | else |
264 | --TODO malformed-jid | |
265 | end | |
266 | end | |
267 | end | |
268 | --else -- possible rejoin | |
269 | -- 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
|
270 | -- 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
|
271 | -- :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
|
272 | -- self:handle_to_occupant(origin, stanza); -- resend available |
1734 | 273 | --end |
274 | else -- enter room | |
275 | local new_nick = to; | |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
276 | if self._occupants[to] then |
1734 | 277 | new_nick = nil; |
278 | end | |
279 | if not new_nick then | |
280 | 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:
1816
diff
changeset
|
281 | 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:
1816
diff
changeset
|
282 | reply.tags[1].attr.code = "409"; |
a394e0bd4847
MUC: Added legacy error codes to nickname conflict presence errors.
Waqas Hussain <waqas20@gmail.com>
parents:
1816
diff
changeset
|
283 | origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
1734 | 284 | else |
285 | 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
|
286 | 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
|
287 | self._affiliations[jid_bare(from)] = "owner"; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
288 | end |
1740
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
289 | 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
|
290 | 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
|
291 | if role then -- new occupant |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
292 | self._occupants[to] = {affiliation=affiliation, role=role, jid=from, sessions={[from]=get_filtered_presence(stanza)}}; |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
293 | self._jid_nick[from] = to; |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
294 | self:send_occupant_list(from); |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
295 | pr.attr.from = to; |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
296 | self:broadcast_presence(pr); |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
297 | self:send_history(from); |
b37ccf9bec89
MUC: Send appropriate error to banned users on join.
Waqas Hussain <waqas20@gmail.com>
parents:
1739
diff
changeset
|
298 | 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
|
299 | 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
|
300 | 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
|
301 | origin.send(reply:tag("x", {xmlns = "http://jabber.org/protocol/muc"})); |
1734 | 302 | end |
303 | end | |
304 | end | |
305 | elseif type ~= 'result' then -- bad type | |
306 | origin.send(st.error_reply(stanza, "modify", "bad-request")); -- FIXME correct error? | |
307 | end | |
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
308 | 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
|
309 | 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
|
310 | 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
|
311 | 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
|
312 | 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
|
313 | 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
|
314 | 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
|
315 | 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
|
316 | if md5(jid) == _hash then |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
317 | _to = jid; |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
318 | break; |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
319 | end |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
320 | end |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
321 | if _to then |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
322 | stanza.attr.to, stanza.attr.from, stanza.attr.id = _to, self._jid_nick[_nick], _id; |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
323 | self:route_stanza(stanza); |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
324 | 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
|
325 | end |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
326 | end |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
327 | else |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
328 | 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
|
329 | end |
1734 | 330 | elseif stanza.name == "message" and type == "groupchat" then -- groupchat messages not allowed in PM |
331 | origin.send(st.error_reply(stanza, "modify", "bad-request")); | |
332 | else -- private stanza | |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
333 | local o_data = self._occupants[to]; |
1734 | 334 | if o_data then |
335 | log("debug", "%s sent private stanza to %s (%s)", from, to, o_data.jid); | |
336 | 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
|
337 | local bare = jid_bare(jid); |
1769
39865fbbb2f7
MUC: Preserve stanza attributes for private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1768
diff
changeset
|
338 | 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
|
339 | local id = stanza.attr.id; |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
340 | 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
|
341 | stanza.attr.to = bare; |
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
342 | 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
|
343 | end |
1734 | 344 | self:route_stanza(stanza); |
1778
f4213d84ba8a
MUC: Correct routing of vCard requests to bare JID.
Waqas Hussain <waqas20@gmail.com>
parents:
1769
diff
changeset
|
345 | stanza.attr.to, stanza.attr.from, stanza.attr.id = to, from, id; |
1734 | 346 | elseif type ~= "error" and type ~= "result" then -- recipient not in room |
347 | origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room")); | |
348 | end | |
349 | end | |
350 | end | |
351 | ||
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
352 | function room_mt:handle_form(origin, stanza) |
1757
157e438823ba
MUC: Fixed traceback on unauthorized access of the room configuration form.
Waqas Hussain <waqas20@gmail.com>
parents:
1756
diff
changeset
|
353 | if self:get_affiliation(stanza.attr.from) ~= "owner" then origin.send(st.error_reply(stanza, "auth", "forbidden")); return; end |
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
354 | if stanza.attr.type == "get" then |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
355 | local title = "Configuration for "..self.jid; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
356 | origin.send(st.reply(stanza):query("http://jabber.org/protocol/muc#owner") |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
357 | :tag("x", {xmlns='jabber:x:data', type='form'}) |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
358 | :tag("title"):text(title):up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
359 | :tag("instructions"):text(title):up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
360 | :tag("field", {type='hidden', var='FORM_TYPE'}):tag("value"):text("http://jabber.org/protocol/muc#roomconfig"):up():up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
361 | :tag("field", {type='boolean', label='Make Room Persistent?', var='muc#roomconfig_persistentroom'}) |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
362 | :tag("value"):text(self._data.persistent and "1" or "0"):up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
363 | :up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
364 | :tag("field", {type='boolean', label='Make Room Publicly Searchable?', var='muc#roomconfig_publicroom'}) |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
365 | :tag("value"):text(self._data.hidden and "0" or "1"):up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
366 | :up() |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
367 | ); |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
368 | elseif stanza.attr.type == "set" then |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
369 | local query = stanza.tags[1]; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
370 | local form; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
371 | for _, tag in ipairs(query.tags) do if tag.name == "x" and tag.attr.xmlns == "jabber:x:data" then form = tag; break; end end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
372 | if not form then origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
373 | if form.attr.type == "cancel" then origin.send(st.reply(stanza)); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
374 | if form.attr.type ~= "submit" then origin.send(st.error_reply(stanza, "cancel", "bad-request")); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
375 | local fields = {}; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
376 | for _, field in pairs(form.tags) do |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
377 | if field.name == "field" and field.attr.var and field.tags[1].name == "value" and #field.tags[1].tags == 0 then |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
378 | fields[field.attr.var] = field.tags[1][1] or ""; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
379 | end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
380 | end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
381 | if fields.FORM_TYPE ~= "http://jabber.org/protocol/muc#roomconfig" then origin.send(st.error_reply(stanza, "cancel", "bad-request")); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
382 | |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
383 | local persistent = fields['muc#roomconfig_persistentroom']; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
384 | if persistent == "0" or persistent == "false" then persistent = nil; elseif persistent == "1" or persistent == "true" then persistent = true; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
385 | else origin.send(st.error_reply(stanza, "cancel", "bad-request")); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
386 | self._data.persistent = persistent; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
387 | module:log("debug", "persistent=%s", tostring(persistent)); |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
388 | |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
389 | local public = fields['muc#roomconfig_publicroom']; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
390 | if public == "0" or public == "false" then public = nil; elseif public == "1" or public == "true" then public = true; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
391 | else origin.send(st.error_reply(stanza, "cancel", "bad-request")); return; end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
392 | self._data.hidden = not public and true or nil; |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
393 | |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
394 | if self.save then self:save(true); end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
395 | origin.send(st.reply(stanza)); |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
396 | end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
397 | end |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
398 | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
399 | function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc |
1734 | 400 | 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
|
401 | 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
|
402 | if stanza.name == "iq" then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
403 | if xmlns == "http://jabber.org/protocol/disco#info" and type == "get" then |
1734 | 404 | origin.send(room_get_disco_info(self, stanza)); |
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
405 | elseif xmlns == "http://jabber.org/protocol/disco#items" and type == "get" then |
1734 | 406 | origin.send(room_get_disco_items(self, stanza)); |
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
407 | 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
|
408 | local actor = stanza.attr.from; |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
409 | 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
|
410 | 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
|
411 | 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
|
412 | 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
|
413 | 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
|
414 | if type == "set" then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
415 | local callback = function() origin.send(st.reply(stanza)); end |
1862
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
416 | if item.attr.jid then -- Validate provided JID |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
417 | item.attr.jid = jid_prep(item.attr.jid); |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
418 | if not item.attr.jid then |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
419 | origin.send(st.error_reply(stanza, "modify", "jid-malformed")); |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
420 | return; |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
421 | end |
115f274dd17f
MUC: Prep given JID when changing affiliation.
Waqas Hussain <waqas20@gmail.com>
parents:
1836
diff
changeset
|
422 | end |
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
423 | 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
|
424 | 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
|
425 | if occupant then item.attr.jid = occupant.jid; end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
426 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
427 | if item.attr.affiliation and item.attr.jid and not item.attr.role then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
428 | local success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, callback); |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
429 | 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
|
430 | elseif item.attr.role and item.attr.nick and not item.attr.affiliation then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
431 | local success, errtype, err = self:set_role(actor, self.jid.."/"..item.attr.nick, item.attr.role, callback); |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
432 | 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
|
433 | else |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
434 | 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
|
435 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
436 | elseif type == "get" then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
437 | local _aff = item.attr.affiliation; |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
438 | local _rol = item.attr.role; |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
439 | 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
|
440 | 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
|
441 | 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
|
442 | 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
|
443 | if affiliation == _aff then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
444 | 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
|
445 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
446 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
447 | origin.send(reply); |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
448 | else |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
449 | 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
|
450 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
451 | 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
|
452 | if role == "moderator" then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
453 | -- 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
|
454 | 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
|
455 | 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
|
456 | for nick, occupant in pairs(self._occupants) do |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
457 | if occupant.role == _rol then |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
458 | reply:tag("item", {nick = nick, role = _rol or "none", affiliation = occupant.affiliation or "none", jid = occupant.jid}):up(); |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
459 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
460 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
461 | origin.send(reply); |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
462 | else |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
463 | 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
|
464 | end |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
465 | else |
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
466 | 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
|
467 | end |
1744
265863a5612b
MUC: Added support for requesting various lists (owner, admin, voice, etc).
Waqas Hussain <waqas20@gmail.com>
parents:
1743
diff
changeset
|
468 | end |
1753
a84901db4085
MUC: Refactored IQ handling to be more easily extensible.
Waqas Hussain <waqas20@gmail.com>
parents:
1752
diff
changeset
|
469 | 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
|
470 | 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
|
471 | end |
1754
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
472 | elseif xmlns == "http://jabber.org/protocol/muc#owner" and (type == "get" or type == "set") and stanza.tags[1].name == "query" then |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
473 | self:handle_form(origin, stanza); |
67b66eec9777
MUC: Added support for room configuration forms, persistence and hidden rooms.
Waqas Hussain <waqas20@gmail.com>
parents:
1753
diff
changeset
|
474 | 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
|
475 | 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
|
476 | end |
1734 | 477 | elseif stanza.name == "message" and type == "groupchat" then |
478 | local from, to = stanza.attr.from, stanza.attr.to; | |
479 | local room = jid_bare(to); | |
480 | local current_nick = self._jid_nick[from]; | |
481 | if not current_nick then -- not in room | |
482 | origin.send(st.error_reply(stanza, "cancel", "not-acceptable")); | |
483 | else | |
484 | local from = stanza.attr.from; | |
485 | stanza.attr.from = current_nick; | |
486 | local subject = getText(stanza, {"subject"}); | |
487 | if subject then | |
488 | self:set_subject(current_nick, subject); -- TODO use broadcast_message_stanza | |
489 | else | |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
490 | self:broadcast_message(stanza, true); |
1734 | 491 | end |
492 | end | |
1768
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
493 | elseif stanza.name == "message" and type == "error" and get_kickable_error(stanza) then |
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
494 | 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
|
495 | log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid); |
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
496 | self:handle_to_occupant(origin, st.presence({type='unavailable', from=stanza.attr.from, to=stanza.attr.to}) |
802c40384dd0
MUC: Don't kick on errors in private messages.
Waqas Hussain <waqas20@gmail.com>
parents:
1764
diff
changeset
|
497 | :tag('status'):text('This participant is kicked from the room because he sent an error message to another occupant')); -- send unavailable |
1734 | 498 | elseif stanza.name == "presence" then -- hack - some buggy clients send presence updates to the room rather than their nick |
499 | local to = stanza.attr.to; | |
500 | local current_nick = self._jid_nick[stanza.attr.from]; | |
501 | if current_nick then | |
502 | 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
|
503 | self:handle_to_occupant(origin, stanza); |
1734 | 504 | stanza.attr.to = to; |
505 | elseif type ~= "error" and type ~= "result" then | |
506 | origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); | |
507 | end | |
508 | elseif stanza.name == "message" and not stanza.attr.type and #stanza.tags == 1 and self._jid_nick[stanza.attr.from] | |
509 | and stanza.tags[1].name == "x" and stanza.tags[1].attr.xmlns == "http://jabber.org/protocol/muc#user" and #stanza.tags[1].tags == 1 | |
510 | and stanza.tags[1].tags[1].name == "invite" and stanza.tags[1].tags[1].attr.to then | |
511 | local _from, _to = stanza.attr.from, stanza.attr.to; | |
512 | local _invitee = stanza.tags[1].tags[1].attr.to; | |
513 | stanza.attr.from, stanza.attr.to = _to, _invitee; | |
514 | stanza.tags[1].tags[1].attr.from, stanza.tags[1].tags[1].attr.to = _from, nil; | |
515 | self:route_stanza(stanza); | |
516 | stanza.tags[1].tags[1].attr.from, stanza.tags[1].tags[1].attr.to = nil, _invitee; | |
517 | stanza.attr.from, stanza.attr.to = _from, _to; | |
518 | else | |
519 | if type == "error" or type == "result" then return; end | |
520 | origin.send(st.error_reply(stanza, "cancel", "service-unavailable")); | |
521 | end | |
522 | end | |
523 | ||
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
524 | function room_mt:handle_stanza(origin, stanza) |
1734 | 525 | local to_node, to_host, to_resource = jid_split(stanza.attr.to); |
526 | 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
|
527 | self:handle_to_occupant(origin, stanza); |
1734 | 528 | else |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
529 | self:handle_to_room(origin, stanza); |
1734 | 530 | end |
531 | end | |
532 | ||
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
533 | 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
|
534 | |
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
535 | function room_mt:get_affiliation(jid) |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
536 | local node, host, resource = jid_split(jid); |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
537 | 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
|
538 | 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
|
539 | 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
|
540 | return result; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
541 | end |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
542 | function room_mt:set_affiliation(actor, jid, affiliation, callback) |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
543 | jid = jid_bare(jid); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
544 | 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
|
545 | 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
|
546 | return nil, "modify", "not-acceptable"; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
547 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
548 | if self:get_affiliation(actor) ~= "owner" then return nil, "cancel", "not-allowed"; end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
549 | if jid_bare(actor) == jid then return nil, "cancel", "not-allowed"; end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
550 | self._affiliations[jid] = affiliation; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
551 | local role = self:get_default_role(affiliation); |
1750
a1c18470eeee
MUC: Fixed: Unavailable presence was being sent for all role and affiliation changes. Now sent only for kicked occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
1749
diff
changeset
|
552 | local p = st.presence() |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
553 | :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"}) |
1744
265863a5612b
MUC: Added support for requesting various lists (owner, admin, voice, etc).
Waqas Hussain <waqas20@gmail.com>
parents:
1743
diff
changeset
|
554 | :tag("item", {affiliation=affiliation or "none", role=role or "none"}):up(); |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
555 | local x = p.tags[1]; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
556 | local item = x.tags[1]; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
557 | if not role then -- getting kicked |
1750
a1c18470eeee
MUC: Fixed: Unavailable presence was being sent for all role and affiliation changes. Now sent only for kicked occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
1749
diff
changeset
|
558 | p.attr.type = "unavailable"; |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
559 | if affiliation == "outcast" then |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
560 | 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
|
561 | else |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
562 | 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
|
563 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
564 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
565 | local modified_nicks = {}; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
566 | 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
|
567 | 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
|
568 | if not role then -- getting kicked |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
569 | self._occupants[nick] = nil; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
570 | else |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
571 | t_insert(modified_nicks, nick); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
572 | occupant.affiliation, occupant.role = affiliation, role; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
573 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
574 | p.attr.from = nick; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
575 | 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
|
576 | if not role then self._jid_nick[jid] = nil; end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
577 | p.attr.to = jid; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
578 | self:route_stanza(p); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
579 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
580 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
581 | end |
1755
1614e8e62ad5
MUC: Fixed an undefined global access.
Waqas Hussain <waqas20@gmail.com>
parents:
1754
diff
changeset
|
582 | 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
|
583 | if callback then callback(); end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
584 | for _, nick in ipairs(modified_nicks) do |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
585 | p.attr.from = nick; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
586 | self:broadcast_except_nick(p, nick); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
587 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
588 | return true; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
589 | end |
1734 | 590 | |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
591 | function room_mt:get_role(nick) |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
592 | local session = self._occupants[nick]; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
593 | 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
|
594 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
595 | function room_mt:set_role(actor, nick, role, callback) |
1752
4db786919805
MUC: Added kicking support.
Waqas Hussain <waqas20@gmail.com>
parents:
1751
diff
changeset
|
596 | 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
|
597 | if role and role ~= "moderator" and role ~= "participant" and role ~= "visitor" then return nil, "modify", "not-acceptable"; end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
598 | if self:get_affiliation(actor) ~= "owner" then return nil, "cancel", "not-allowed"; end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
599 | local occupant = self._occupants[nick]; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
600 | if not occupant then return nil, "modify", "not-acceptable"; end |
1743
d00b144f4bcf
MUC: An admin or owner MUST NOT be able to revoke moderation privileges from another admin or owner.
Waqas Hussain <waqas20@gmail.com>
parents:
1742
diff
changeset
|
601 | if occupant.affiliation == "owner" or occupant.affiliation == "admin" then return nil, "cancel", "not-allowed"; end |
1750
a1c18470eeee
MUC: Fixed: Unavailable presence was being sent for all role and affiliation changes. Now sent only for kicked occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
1749
diff
changeset
|
602 | local p = st.presence({from = nick}) |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
603 | :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"}) |
1744
265863a5612b
MUC: Added support for requesting various lists (owner, admin, voice, etc).
Waqas Hussain <waqas20@gmail.com>
parents:
1743
diff
changeset
|
604 | :tag("item", {affiliation=occupant.affiliation or "none", nick=nick, role=role or "none"}):up(); |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
605 | if not role then -- kick |
1750
a1c18470eeee
MUC: Fixed: Unavailable presence was being sent for all role and affiliation changes. Now sent only for kicked occupants.
Waqas Hussain <waqas20@gmail.com>
parents:
1749
diff
changeset
|
606 | p.attr.type = "unavailable"; |
1742
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
607 | self._occupants[nick] = nil; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
608 | 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
|
609 | self._jid_nick[jid] = nil; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
610 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
611 | p:tag("status", {code = "307"}):up(); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
612 | else |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
613 | occupant.role = role; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
614 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
615 | for jid in pairs(occupant.sessions) do -- send to all sessions of the nick |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
616 | p.attr.to = jid; |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
617 | self:route_stanza(p); |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
618 | end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
619 | if callback then callback(); end |
1483a62d69bb
MUC: Owners can now modify roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1740
diff
changeset
|
620 | self:broadcast_except_nick(p, nick); |
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
621 | return true; |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
622 | end |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
623 | |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
624 | local _M = {}; -- module "muc" |
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
625 | |
1749
cf2ade983e12
MUC: Changed a MUC library method into a function.
Waqas Hussain <waqas20@gmail.com>
parents:
1746
diff
changeset
|
626 | function _M.new_room(jid) |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
627 | return setmetatable({ |
1734 | 628 | jid = jid; |
629 | _jid_nick = {}; | |
1739
393abf245322
MUC: Renamed _participants table to _occupants
Waqas Hussain <waqas20@gmail.com>
parents:
1737
diff
changeset
|
630 | _occupants = {}; |
1734 | 631 | _data = {}; |
1737
31c3eb5797c7
MUC: Initial support for roles and affiliations
Waqas Hussain <waqas20@gmail.com>
parents:
1736
diff
changeset
|
632 | _affiliations = {}; |
1735
81406277279e
MUC: The MUC lib is now metatable based. Cleaned up code, etc.
Waqas Hussain <waqas20@gmail.com>
parents:
1734
diff
changeset
|
633 | }, room_mt); |
1734 | 634 | end |
635 | ||
636 | return _M; |