From 994244c91097374fbed3828465c05cf2664f3d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Thu, 22 Feb 2018 22:03:55 +0100
Subject: [PATCH] MAM: Check muc#user namespace before we disco
1. Check if the message has the muc#user namespace
2. Check if we have this jid already in the DB
3. Last resort disco the jid
---
gajim/common/connection_handlers_events.py | 36 +++++++++++++---------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/gajim/common/connection_handlers_events.py b/gajim/common/connection_handlers_events.py
index ddc8aacacb..93a6b9844d 100644
--- a/gajim/common/connection_handlers_events.py
+++ b/gajim/common/connection_handlers_events.py
@@ -1127,6 +1127,8 @@ class MamGcMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
:stanza: Complete stanza Node
:forwarded: Forwarded Node
:result: Result Node
+ :muc_pm: True, if this is a MUC PM
+ propagated to MamDecryptedMessageReceivedEvent
'''
self._set_base_event_vars_as_attributes(base_event)
self.additional_data = {}
@@ -1207,23 +1209,27 @@ class MamDecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
if self.groupchat:
return True
- self.is_pm = app.logger.jid_is_room_jid(self.with_.getStripped())
- if self.is_pm is None:
- # Check if this event is triggered after a disco, so we dont
- # run into an endless loop
- if hasattr(self, 'disco'):
- log.error('JID not known even after sucessful disco')
+ if not self.muc_pm:
+ # muc_pm = False, means only there was no muc#user namespace
+ # This could still be a muc pm, we check the database if we
+ # know this jid. If not we disco it.
+ self.muc_pm = app.logger.jid_is_room_jid(self.with_.getStripped())
+ if self.muc_pm is None:
+ # Check if this event is triggered after a disco, so we dont
+ # run into an endless loop
+ if hasattr(self, 'disco'):
+ log.error('JID not known even after sucessful disco')
+ return
+ # we don't know this JID, we need to disco it.
+ server = self.with_.getDomain()
+ if server not in self.conn.mam_awaiting_disco_result:
+ self.conn.mam_awaiting_disco_result[server] = [self]
+ self.conn.discoverInfo(server)
+ else:
+ self.conn.mam_awaiting_disco_result[server].append(self)
return
- # we don't know this JID, we need to disco it.
- server = self.with_.getDomain()
- if server not in self.conn.mam_awaiting_disco_result:
- self.conn.mam_awaiting_disco_result[server] = [self]
- self.conn.discoverInfo(server)
- else:
- self.conn.mam_awaiting_disco_result[server].append(self)
- return
- if self.is_pm:
+ if self.muc_pm:
self.with_ = str(self.with_)
else:
self.with_ = self.with_.getStripped()
--
GitLab