# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1582828971 -3600
# Node ID 5376f882cf82f5d5732c69671fd468e6d1634149
# Parent  69acda92d5a97abba6b812e79397c1e625da5ea3
mod_muc_mam: Fix traceback saving message from non-occupant (fixes #1497)

Caused by a plugin sending a message from the room itself.

diff -r 69acda92d5a9 -r 5376f882cf82 plugins/mod_muc_mam.lua
--- a/plugins/mod_muc_mam.lua	Mon Feb 24 23:16:08 2020 +0100
+++ b/plugins/mod_muc_mam.lua	Thu Feb 27 19:42:51 2020 +0100
@@ -335,11 +335,14 @@
 	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