mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 05:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_muc_mam: Fix traceback saving message from non-occupant (fixes #1497)

Browse source 
Caused by a plugin sending a message from the room itself.
This commit is contained in:
Kim Alvefur 2020-02-27 19:42:51 +01:00
parent d8fda82e40
commit 2de7db5f8b
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
plugins/mod_muc_mam.lua
View file

@ -335,11 +335,14 @@ local function save_to_history(self, stanza)
if stanza.name == "message" and self:get_whois() == "anyone" then
stored_stanza = st.clone(stanza);
stored_stanza.attr.to = nil;
local actor = jid_bare(self._occupants[stanza.attr.from].jid);
local affiliation = self:get_affiliation(actor) or "none";
local role = self:get_role(actor) or self:get_default_role(affiliation);
stored_stanza:add_direct_child(st.stanza("x", { xmlns = xmlns_muc_user })
:tag("item", { affiliation = affiliation; role = role; jid = actor }));
local occupant = self._occupants[stanza.attr.from];
if occupant then
local actor = jid_bare(occupant.jid);
local affiliation = self:get_affiliation(actor) or "none";
local role = self:get_role(actor) or self:get_default_role(affiliation);
stored_stanza:add_direct_child(st.stanza("x", { xmlns = xmlns_muc_user })
:tag("item", { affiliation = affiliation; role = role; jid = actor }));
end
end
-- Policy check