From 5ade5cb0b347185ed7cc83cc39f759a6ce3c69f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sun, 6 Oct 2019 00:02:17 +0200 Subject: [PATCH] [omemo] Adapt to nbxmpp changes Correctly determine session JID after nbxmpp changes --- omemo/modules/omemo.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/omemo/modules/omemo.py b/omemo/modules/omemo.py index 0f3adf4..6551e97 100644 --- a/omemo/modules/omemo.py +++ b/omemo/modules/omemo.py @@ -206,10 +206,15 @@ class OMEMO(BaseModule): if not properties.is_omemo: return - if properties.is_mam_message: + if properties.is_carbon_message and properties.carbon.is_sent: + from_jid = self._own_jid + + elif properties.is_mam_message: from_jid = self._process_mam_message(properties) + elif properties.from_muc: from_jid = self._process_muc_message(properties) + else: from_jid = properties.jid.getBare() @@ -266,14 +271,13 @@ class OMEMO(BaseModule): def _process_mam_message(self, properties): self._log.info('Message received, archive: %s', properties.mam.archive) - from_jid = properties.jid.getBare() if properties.from_muc: self._log.info('MUC MAM Message received') if properties.muc_user.jid is None: self._log.info('No real jid found') return - from_jid = properties.muc_user.jid.getBare() - return from_jid + return properties.muc_user.jid.getBare() + return properties.from_.getBare() def _on_muc_user_presence(self, _con, _stanza, properties): if properties.type == PresenceType.ERROR: