From 77be67f6a8fa2568007631f7e62d38edac29764b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 25 Feb 2018 22:02:39 +0100
Subject: [PATCH] Only use fallback duplicate search on MAM < 2
---
gajim/common/message_archiving.py | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/gajim/common/message_archiving.py b/gajim/common/message_archiving.py
index affeaca164..ec03bf94f5 100644
--- a/gajim/common/message_archiving.py
+++ b/gajim/common/message_archiving.py
@@ -200,13 +200,19 @@ class ConnectionArchive313:
def _nec_mam_decrypted_message_received(self, obj):
if obj.conn.name != self.name:
return
- # if self.archiving_namespace != nbxmpp.NS_MAM_2:
- # Fallback duplicate search without stanza-id
- duplicate = app.logger.search_for_duplicate(
- self.name, obj.with_, obj.timestamp, obj.msgtxt)
- if duplicate:
- # dont propagate the event further
- return True
+
+ namespace = self.archiving_namespace
+ if obj.groupchat:
+ namespace = muc_caps_cache.get_mam_namespace(obj.room_jid)
+
+ if namespace != nbxmpp.NS_MAM_2:
+ # Fallback duplicate search without stanza-id
+ duplicate = app.logger.search_for_duplicate(
+ self.name, obj.with_, obj.timestamp, obj.msgtxt)
+ if duplicate:
+ # dont propagate the event further
+ return True
+
app.logger.insert_into_logs(self.name,
obj.with_,
obj.timestamp,
--
GitLab