merge: resolve conflict in xmpp_agent_core.py (keep unified version)

2026-06-21 16:17:21 +08:00
parent babbc46801 90ed30dd36
commit 5d35d97f0a
3 changed files with 291 additions and 0 deletions
@@ -804,6 +804,7 @@ class AgentBot(slixmpp.ClientXMPP):
            log("(MAM: no plugin)")
            _set_mam_done()
            return
+        # MAM recovery used in _on_session_start
        try:
            for room_jid in cfg["muc_rooms"]:
                log(f"(MAM: querying {room_jid} for last 50 messages...)")