From eaf871384336f8899ccfbe597328ce9f5f97b9af Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 24 May 2020 22:10:09 +0200
Subject: Checks whether the gaming payload is empty or not

Fixes a long-standing bug where a gaming stop event would be interpreted
as starting a game.

Also does the same for mood, activity and tune.
---
 poezio/core/handlers.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 445d8b74..cad4d47e 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -557,7 +557,9 @@ class HandlerCore:
             return
         item = message['pubsub_event']['items']['item']
         old_gaming = contact.gaming
-        if item.xml.find('{urn:xmpp:gaming:0}game') is not None:
+        xml_node = item.xml.find('{urn:xmpp:gaming:0}game')
+        # list(xml_node) checks whether there are children or not.
+        if xml_node is not None and list(xml_node):
             item = item['gaming']
             # only name and server_address are used for now
             contact.gaming = {
@@ -599,7 +601,9 @@ class HandlerCore:
         roster.modified()
         item = message['pubsub_event']['items']['item']
         old_mood = contact.mood
-        if item.xml.find('{http://jabber.org/protocol/mood}mood') is not None:
+        xml_node = item.xml.find('{http://jabber.org/protocol/mood}mood')
+        # list(xml_node) checks whether there are children or not.
+        if xml_node is not None and list(xml_node):
             mood = item['mood']['value']
             if mood:
                 mood = pep.MOODS.get(mood, mood)
@@ -637,8 +641,9 @@ class HandlerCore:
         roster.modified()
         item = message['pubsub_event']['items']['item']
         old_activity = contact.activity
-        if item.xml.find(
-                '{http://jabber.org/protocol/activity}activity') is not None:
+        xml_node = item.xml.find('{http://jabber.org/protocol/activity}activity')
+        # list(xml_node) checks whether there are children or not.
+        if xml_node is not None and list(xml_node):
             try:
                 activity = item['activity']['value']
             except ValueError:
@@ -683,7 +688,9 @@ class HandlerCore:
         roster.modified()
         item = message['pubsub_event']['items']['item']
         old_tune = contact.tune
-        if item.xml.find('{http://jabber.org/protocol/tune}tune') is not None:
+        xml_node = item.xml.find('{http://jabber.org/protocol/tune}tune')
+        # list(xml_node) checks whether there are children or not.
+        if xml_node is not None and list(xml_node):
             item = item['tune']
             contact.tune = {
                 'artist': item['artist'],
-- 
cgit v1.2.3


From e840590c735070ee4300baa86adb583c3a111fc2 Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Sun, 24 May 2020 22:18:53 +0200
Subject: Add a ChangeLog entry for the gaming fix.

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 59c6ae66..8c5484f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,12 @@ https://dev.louiz.org/projects/poezio/roadmap
 
 * Poezio 0.14 - dev
 
+* Poezio 0.13.1 - dev
+
+# Bug fixes
+
+- Contacts won’t be seen playing games or music when they actually stop doing
+  so.
 
 * Poezio 0.13
 
-- 
cgit v1.2.3