Comparison

mod_muc_rai: Get user JID from event.occupant `event.stanza` isn't always available.

comparison

equal deleted inserted replaced

-:d90ce7dc3f88
+:e03dadd4f2d1
 		end
 	end
 	return rooms_with_activity;
 end
+--- FIXME:
+-- The subscribe/unsubscribe code below doesn't work in the case where
+-- the user joins from multiple resources with the same nick.
+--
+-- For example, resource A joining, followed by resource B joining, followed
+-- by A leaving and B leaving will ultimately trigger muc-occupant-joined for
+-- resource A and muc-occupant-left for resource B.
 module:hook("muc-occupant-joined", function(event)
 	local room_jid, user_jid = event.room.jid, event.stanza.attr.from;
 	local ok, _ = unsubscribe_room(user_jid, room_jid);
 	if ok then
 		module:log("debug", "Unsubscribed %s to %s Reason: muc-occupant-joined", user_jid, room_jid)
 	end
 end);
 module:hook("muc-occupant-left", function(event)
-	local room_jid, user_jid = event.room.jid, event.stanza.attr.from;
+	local room_jid, user_jid = event.room.jid, event.occupant.jid;
 	local ok, _ = subscribe_room(user_jid, room_jid);
 	if ok then
 		module:log("debug", "Subscribed %s to %s Reason: muc-occupant-left", user_jid, room_jid)
 	end
 end);