Commit e85bc52c authored by Philipp Hörist's avatar Philipp Hörist

Fix sending empty pep data

parent 1462f892
......@@ -106,7 +106,7 @@ def _pep_event_received(self,
retract = items.getTag('retract')
if retract is not None:
for handler in handlers:
handler[PEPHandlerType.RETRACT](jid, retract.getID())
handler[PEPHandlerType.RETRACT](jid, retract.getAttr('id'))
raise nbxmpp.NodeProcessed
# Check if we have items
......
......@@ -89,7 +89,7 @@ def _extract_info(self, item):
def _build_node(self, data):
item = nbxmpp.Node('activity', {'xmlns': self.namespace})
if data is None:
return
return item
activity, subactivity, message = data
if activity:
i = item.addChild(activity)
......
......@@ -88,7 +88,7 @@ def _extract_info(self, item: nbxmpp.Node) -> Optional[Dict[str, str]]:
def _build_node(self, data: Optional[Tuple[str, str]]) -> nbxmpp.Node:
item = nbxmpp.Node('mood', {'xmlns': nbxmpp.NS_MOOD})
if data is None:
return
return item
mood, text = data
if mood:
item.addChild(mood)
......
......@@ -67,9 +67,8 @@ def _extract_info(self, item: nbxmpp.Node) -> Optional[str]:
def _build_node(self, data: Optional[str]) -> Optional[nbxmpp.Node]:
item = nbxmpp.Node('nick', {'xmlns': nbxmpp.NS_NICK})
if data is None:
return None
item.addData(data)
if data is not None:
item.addData(data)
return item
def _notification_received(self,
......
......@@ -331,11 +331,10 @@ def on_ok_button_clicked(self, widget):
transient_for=self)
return
vcard_, sha = self.make_vcard()
nick = ''
if 'NICKNAME' in vcard_:
nick = vcard_['NICKNAME']
nick = vcard_.get('NICKNAME')
if nick:
app.connections[self.account].get_module('UserNickname').send(nick)
if nick == '':
else:
app.connections[self.account].get_module('UserNickname').retract()
nick = app.config.get_per('accounts', self.account, 'name')
app.nicks[self.account] = nick
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment