From 1c0b571dbb130d2c845014da69350d5d517ab605 Mon Sep 17 00:00:00 2001
From: lovetox <philipp@hoerist.com>
Date: Mon, 19 Oct 2020 22:37:24 +0200
Subject: [PATCH] [omemo] Adapt to nbxmpp changes

---
 omemo/modules/omemo.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/omemo/modules/omemo.py b/omemo/modules/omemo.py
index c016bc3..0330919 100644
--- a/omemo/modules/omemo.py
+++ b/omemo/modules/omemo.py
@@ -22,7 +22,7 @@ from pathlib import Path
 from nbxmpp.namespaces import Namespace
 from nbxmpp.protocol import NodeProcessed
 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 Affiliation
 from nbxmpp.structs import StanzaHandler
@@ -320,9 +320,12 @@ class OMEMO(BaseModule):
                 callback=self._on_affiliations_received,
                 user_data=room_jid)
 
-    def _on_affiliations_received(self, result, room_jid):
-        if is_error_result(result):
-            self._log.info('Affiliation request failed: %s', result)
+    def _on_affiliations_received(self, task):
+        room_jid = task.get_user_data()
+        try:
+            result = task.finish()
+        except StanzaError as error:
+            self._log.info('Affiliation request failed: %s', error)
             return
 
         for user_jid in result.users: