prosody
3c4799467dae
plugins/muc/muc.lib.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

plugins/muc/muc.lib.lua @ 6925:3c4799467dae

Merge 0.10->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 17 Nov 2015 17:12:45 +0000
parent 6909:494938dec5d8
parent 6924:c37ad3e1fdd9
child 6988:329d5fb8a9d3
comparison
equal deleted inserted replaced
6920:7596c37e0a63 6925:3c4799467dae
544 local id = stanza.attr.id; 544 local id = stanza.attr.id;
545 local occupant = self:get_occupant_by_nick(to); 545 local occupant = self:get_occupant_by_nick(to);
546 if (type == "error" or type == "result") then 546 if (type == "error" or type == "result") then
547 do -- deconstruct_stanza_id 547 do -- deconstruct_stanza_id
548 if not occupant then return nil; end 548 if not occupant then return nil; end
549 local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$"); 549 local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$");
550 if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end 550 if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end
551 local from_occupant_jid = self:get_occupant_jid(from_jid); 551 local from_occupant_jid = self:get_occupant_jid(from_jid);
552 if from_occupant_jid == nil then return nil; end 552 if from_occupant_jid == nil then return nil; end
553 local session_jid 553 local session_jid
554 for to_jid in occupant:each_session() do 554 for to_jid in occupant:each_session() do