Software / code / prosody
Diff
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 |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Mon Nov 09 22:56:32 2015 +0100 +++ b/plugins/muc/muc.lib.lua Tue Nov 17 17:12:45 2015 +0000 @@ -546,7 +546,7 @@ if (type == "error" or type == "result") then do -- deconstruct_stanza_id if not occupant then return nil; end - local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(.+)%z(.*)%z(.+)$"); + local from_jid, id, to_jid_hash = (base64.decode(stanza.attr.id) or ""):match("^(%Z+)%z(%Z*)%z(.+)$"); if not(from == from_jid or from == jid_bare(from_jid)) then return nil; end local from_occupant_jid = self:get_occupant_jid(from_jid); if from_occupant_jid == nil then return nil; end
