Merge branch 'no-gaming' into 'master'

Checks whether the gaming payload is empty or not

See merge request poezio/poezio!118
This commit is contained in:
Maxime Buquet 2020-05-24 22:19:30 +02:00
commit cf131af4a8
2 changed files with 18 additions and 5 deletions

View file

@ -4,6 +4,12 @@ https://dev.louiz.org/projects/poezio/roadmap
* Poezio 0.14 - dev
* Poezio 0.13.1 - dev
# Bug fixes
- Contacts wont be seen playing games or music when they actually stop doing
so.
* Poezio 0.13

View file

@ -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'],