Commit 1c0b571d authored by Philipp Hörist's avatar Philipp Hörist

[omemo] Adapt to nbxmpp changes

parent 266aba14
...@@ -22,7 +22,7 @@ from pathlib import Path ...@@ -22,7 +22,7 @@ from pathlib import Path
from nbxmpp.namespaces import Namespace from nbxmpp.namespaces import Namespace
from nbxmpp.protocol import NodeProcessed from nbxmpp.protocol import NodeProcessed
from nbxmpp.protocol import JID from nbxmpp.protocol import JID
from nbxmpp.util import is_error_result from nbxmpp.errors import StanzaError
from nbxmpp.const import PresenceType from nbxmpp.const import PresenceType
from nbxmpp.const import Affiliation from nbxmpp.const import Affiliation
from nbxmpp.structs import StanzaHandler from nbxmpp.structs import StanzaHandler
...@@ -320,9 +320,12 @@ class OMEMO(BaseModule): ...@@ -320,9 +320,12 @@ class OMEMO(BaseModule):
callback=self._on_affiliations_received, callback=self._on_affiliations_received,
user_data=room_jid) user_data=room_jid)
def _on_affiliations_received(self, result, room_jid): def _on_affiliations_received(self, task):
if is_error_result(result): room_jid = task.get_user_data()
self._log.info('Affiliation request failed: %s', result) try:
result = task.finish()
except StanzaError as error:
self._log.info('Affiliation request failed: %s', error)
return return
for user_jid in result.users: for user_jid in result.users:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment