hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Adapt to nbxmpp changes

Browse Source 
Correctly determine session JID after nbxmpp changes
This commit is contained in:
Philipp Hörist
2019-10-06 00:02:17 +02:00
parent 7c96a19945
commit 5ade5cb0b3
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
omemo/modules/omemo.py
View File

@@ -206,10 +206,15 @@ class OMEMO(BaseModule):
if not properties.is_omemo: if not properties.is_omemo:
return 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) from_jid = self._process_mam_message(properties)
elif properties.from_muc: elif properties.from_muc:
from_jid = self._process_muc_message(properties) from_jid = self._process_muc_message(properties)
else: else:
from_jid = properties.jid.getBare() from_jid = properties.jid.getBare()
@@ -266,14 +271,13 @@ class OMEMO(BaseModule):
def _process_mam_message(self, properties): def _process_mam_message(self, properties):
self._log.info('Message received, archive: %s', properties.mam.archive) self._log.info('Message received, archive: %s', properties.mam.archive)
from_jid = properties.jid.getBare()
if properties.from_muc: if properties.from_muc:
self._log.info('MUC MAM Message received') self._log.info('MUC MAM Message received')
if properties.muc_user.jid is None: if properties.muc_user.jid is None:
self._log.info('No real jid found') self._log.info('No real jid found')
return return
from_jid = properties.muc_user.jid.getBare() return properties.muc_user.jid.getBare()
return from_jid return properties.from_.getBare()
def _on_muc_user_presence(self, _con, _stanza, properties): def _on_muc_user_presence(self, _con, _stanza, properties):
if properties.type == PresenceType.ERROR: if properties.type == PresenceType.ERROR: