pep/slixmpp-omemo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xep_0384: Move _fetching_bundle method out of plugin class

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2018-12-29 12:55:41 +01:00
parent be6b0efb0f
commit 71c592d666
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugin.py
View file

@ -98,6 +98,10 @@ def _generate_encrypted_payload(encrypted) -> Encrypted:
return tag return tag
def _fetching_bundle(self, jid: str, exn: Exception, key: str, _val: Any) -> bool:
return isinstance(exn, omemo.exceptions.MissingBundleException) and key == jid
# XXX: This should probably be moved in plugins/base.py? # XXX: This should probably be moved in plugins/base.py?
class PluginCouldNotLoad(Exception): pass class PluginCouldNotLoad(Exception): pass
@ -314,9 +318,6 @@ class XEP_0384(BasePlugin):
finally: finally:
asyncio.ensure_future(self._publish_bundle()) asyncio.ensure_future(self._publish_bundle())
def _fetching_bundle(self, jid: str, exn: Exception, key: str, _val: Any) -> bool:
return isinstance(exn, omemo.exceptions.MissingBundleException) and key == jid
async def encrypt_message(self, plaintext: str, recipients: List[JID]) -> Encrypted: async def encrypt_message(self, plaintext: str, recipients: List[JID]) -> Encrypted:
""" """
Returns an encrypted payload to be placed into a message. Returns an encrypted payload to be placed into a message.
@ -371,7 +372,7 @@ class XEP_0384(BasePlugin):
# do OMEMO, or hasn't published any device list for any # do OMEMO, or hasn't published any device list for any
# other reason. # other reason.
if any(self._fetching_bundle(key, *err) for err in errors): if any(_fetching_bundle(key, *err) for err in errors):
continue continue
no_eligible_devices.add(key) no_eligible_devices.add(key)