# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1582829430 -3600
# Node ID 5e1384298e97b7765b29a94126985172f6ff61ea
# Parent  bf81523e2ff43ef4d2f98607305030d8c626009b# Parent  5376f882cf82f5d5732c69671fd468e6d1634149
Merge 0.11->trunk

diff -r bf81523e2ff4 -r 5e1384298e97 plugins/mod_muc_mam.lua
--- a/plugins/mod_muc_mam.lua	Wed Feb 26 22:46:15 2020 +0000
+++ b/plugins/mod_muc_mam.lua	Thu Feb 27 19:50:30 2020 +0100
@@ -361,11 +361,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