From 147ab8d83cf48cf113bce54666c9dc9aaf11e349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 9 Nov 2019 10:59:45 +0100 Subject: [PATCH] [omemo] Correctly handle MAM Messages without real jid Fixes #457 --- omemo/modules/omemo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omemo/modules/omemo.py b/omemo/modules/omemo.py index 6551e97..45651c8 100644 --- a/omemo/modules/omemo.py +++ b/omemo/modules/omemo.py @@ -273,8 +273,9 @@ class OMEMO(BaseModule): self._log.info('Message received, archive: %s', properties.mam.archive) 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') + if properties.muc_user is None or properties.muc_user.jid is None: + self._log.warning('Received MAM Message which can ' + 'not be mapped to a real jid') return return properties.muc_user.jid.getBare() return properties.from_.getBare()