Comparison

mod_muc_rai: Switch to low-priority pre-* events, which should suffice for per-session tracking

comparison

equal deleted inserted replaced

-:16995e7624f0
+:6690586826e8
 		end
 	end
 	return rooms_with_activity;
 end
---- FIXME:
+module:hook("muc-occupant-pre-join", function(event)
--- 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);
+end, -500);
-module:hook("muc-occupant-left", function(event)
+module:hook("muc-occupant-pre-leave", function(event)
-	local room_jid, user_jid = event.room.jid, event.occupant.jid;
+	local room_jid, user_jid = event.room.jid, event.stanza.attr.from;
 	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);
+end, -500);
 module:hook("presence/host", function (event)
 	local origin, stanza = event.origin, event.stanza;
 	local user_jid = stanza.attr.from;