copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Detect invalid user mood 

Fixes #9546, #9547
This commit is contained in:
Philipp Hörist 2019-01-19 20:52:48 +01:00
parent cf8eafffb2
commit 7c7df9d4a4
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gajim/common/modules/user_mood.py
View File

@ -67,6 +67,9 @@ class UserMood(AbstractPEPModule):
if mood_tag is None: if mood_tag is None:
raise StanzaMalformed('No mood node') raise StanzaMalformed('No mood node')
if not mood_tag.getChildren():
return None
for child in mood_tag.getChildren(): for child in mood_tag.getChildren():
name = child.getName().strip() name = child.getName().strip()
if name == 'text': if name == 'text':
@ -74,15 +77,20 @@ class UserMood(AbstractPEPModule):
else: else:
mood_dict['mood'] = name mood_dict['mood'] = name
return mood_dict or None if 'mood' not in mood_dict:
raise StanzaMalformed('No mood value found')
return mood_dict
def _build_node(self, data: Optional[Tuple[str, str]]) -> nbxmpp.Node: def _build_node(self, data: Optional[Tuple[str, str]]) -> nbxmpp.Node:
item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD}) item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD})
if data is None: if data is None:
return item return item
mood, text = data mood, text = data
if mood: if not mood:
return item
item.addChild(mood) item.addChild(mood)
if text: if text:
item.addChild('text', payload=text) item.addChild('text', payload=text)
return item return item