From c14a08d708678be84de0ef8355ee0d6e5bbedf78 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sat, 12 Dec 2020 17:28:22 +0100
Subject: =?UTF-8?q?Use=20the=20new=20xep=5F0045=20elements=20from=20slixmp?=
 =?UTF-8?q?p=C2=A01.6.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 poezio/core/handlers.py | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'poezio/core/handlers.py')

diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 19394e7d..3b839925 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -112,7 +112,7 @@ class HandlerCore:
         """
 
         # first, look for the x (XEP-0045 version 1.28)
-        if message.xml.find('{http://jabber.org/protocol/muc#user}x') is not None:
+        if message.match('message/muc'):
             log.debug('MUC-PM from %s with <x>', with_jid)
             return True
 
@@ -220,12 +220,7 @@ class HandlerCore:
         jid = message['from']
         if jid.bare in self.core.pending_invites:
             return
-        # there are 2 'x' tags in the messages, making message['x'] useless
-        invite = StanzaBase(
-            self.core.xmpp,
-            xml=message.xml.find(
-                '{http://jabber.org/protocol/muc#user}x/{http://jabber.org/protocol/muc#user}invite'
-            ))
+        invite = message['muc']['invite']
         # TODO: find out why pylint thinks "inviter" is a list
         #pylint: disable=no-member
         inviter = invite['from']
@@ -281,9 +276,7 @@ class HandlerCore:
         When receiving private message from a muc OR a normal message
         (from one of our contacts)
         """
-        if message.xml.find(
-                '{http://jabber.org/protocol/muc#user}x/{http://jabber.org/protocol/muc#user}invite'
-        ) is not None:
+        if message.match('message/muc/invite'):
             return
         if message['type'] == 'groupchat':
             return
@@ -1128,8 +1121,7 @@ class HandlerCore:
     ### Presence-related handlers ###
 
     def on_presence(self, presence):
-        if presence.match('presence/muc') or presence.xml.find(
-                '{http://jabber.org/protocol/muc#user}x') is not None:
+        if presence.match('presence/muc'):
             return
         jid = presence['from']
         contact = roster[jid.bare]
@@ -1168,8 +1160,7 @@ class HandlerCore:
         """
         A JID got offline
         """
-        if presence.match('presence/muc') or presence.xml.find(
-                '{http://jabber.org/protocol/muc#user}x') is not None:
+        if presence.match('presence/muc'):
             return
         jid = presence['from']
         status = presence['status']
@@ -1201,8 +1192,7 @@ class HandlerCore:
         """
         A JID got online
         """
-        if presence.match('presence/muc') or presence.xml.find(
-                '{http://jabber.org/protocol/muc#user}x') is not None:
+        if presence.match('presence/muc'):
             return
         jid = presence['from']
         contact = roster[jid.bare]
-- 
cgit v1.2.3