aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-02-21 17:17:01 -0500
committerdaurnimator <quae@daurnimator.com>2014-02-21 17:17:01 -0500
commit87f32d9c9a8f07c453b7adec9253a3a2e6630716 (patch)
tree9b79d43f367a34182908ff48e211b05e456dcf54
parent126212dee38bcfdd5f516bbefceecf2621b0ec95 (diff)
downloadprosody-87f32d9c9a8f07c453b7adec9253a3a2e6630716.tar.gz
prosody-87f32d9c9a8f07c453b7adec9253a3a2e6630716.zip
plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`
It is the only place they were used; and I left the old function names in as comments. One reason for doing this was to reduce accesses to _occupants; which may be in a database in future revisions
-rw-r--r--plugins/muc/muc.lib.lua57
1 files changed, 22 insertions, 35 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 54511ede..ce4fa923 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -380,30 +380,6 @@ function room_mt:get_whois()
return self._data.whois;
end
-local function construct_stanza_id(room, stanza)
- local from_jid, to_nick = stanza.attr.from, stanza.attr.to;
- local from_nick = room._jid_nick[from_jid];
- local occupant = room._occupants[to_nick];
- local to_jid = occupant.jid;
-
- return from_nick, to_jid, base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from_jid));
-end
-local function deconstruct_stanza_id(room, stanza)
- local from_jid_possiblybare, to_nick = stanza.attr.from, stanza.attr.to;
- local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
- local from_nick = room._jid_nick[from_jid];
-
- if not(from_nick) then return; end
- if not(from_jid_possiblybare == from_jid or from_jid_possiblybare == jid_bare(from_jid)) then return; end
-
- local occupant = room._occupants[to_nick];
- for to_jid in pairs(occupant and occupant.sessions or {}) do
- if md5(to_jid) == to_jid_hash then
- return from_nick, to_jid, id;
- end
- end
-end
-
function room_mt:handle_presence_error_to_occupant(origin, stanza)
local current_nick = self._jid_nick[stanza.attr.from];
if not current_nick then
@@ -607,33 +583,45 @@ function room_mt:handle_iq_to_occupant(origin, stanza)
local from, to = stanza.attr.from, stanza.attr.to;
local type = stanza.attr.type;
local id = stanza.attr.id;
+ local current_nick = self._jid_nick[from];
+ local o_data = self._occupants[to];
if (type == "error" or type == "result") then
- stanza.attr.from, stanza.attr.to, stanza.attr.id = deconstruct_stanza_id(self, stanza);
- log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
- if stanza.attr.id then
- self:_route_stanza(stanza);
+ do -- deconstruct_stanza_id
+ if not current_nick or not o_data then return nil; end
+ local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$");
+ if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
+ local session_jid
+ for to_jid in pairs(o_data.sessions) do
+ if md5(to_jid) == to_jid_hash then
+ session_jid = to_jid;
+ break;
+ end
+ end
+ if session_jid == nil then return nil; end
+ stanza.attr.from, stanza.attr.to, stanza.attr.id = current_nick, session_jid, id
end
+ log("debug", "%s sent private iq stanza to %s (%s)", from, to, stanza.attr.to);
+ self:_route_stanza(stanza);
stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
return true;
else -- Type is "get" or "set"
- local current_nick = self._jid_nick[from];
if not current_nick then
origin.send(st.error_reply(stanza, "cancel", "not-acceptable"));
return true;
end
- local o_data = self._occupants[to];
if not o_data then -- recipient not in room
origin.send(st.error_reply(stanza, "cancel", "item-not-found", "Recipient not in room"));
return true;
end
- stanza.attr.from, stanza.attr.to, stanza.attr.id = construct_stanza_id(self, stanza);
+ do -- construct_stanza_id
+ stanza.attr.id = base64.encode(to_jid.."\0"..stanza.attr.id.."\0"..md5(from));
+ end
+ stanza.attr.from, stanza.attr.to = current_nick, o_data.jid;
log("debug", "%s sent private iq stanza to %s (%s)", from, to, o_data.jid);
if stanza.tags[1].attr.xmlns == 'vcard-temp' then
stanza.attr.to = jid_bare(stanza.attr.to);
end
- if stanza.attr.id then
- self:_route_stanza(stanza);
- end
+ self:_route_stanza(stanza);
stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
return true;
end
@@ -1027,7 +1015,6 @@ function room_mt:handle_groupchat_to_room(origin, stanza)
end
end
-
function room_mt:handle_kickable_to_room(origin, stanza)
local current_nick = self._jid_nick[stanza.attr.from];
log("debug", "%s kicked from %s for sending an error message", current_nick, self.jid);