Philipp Hörist pushed to branch master at gajim / gajim
Commits:
e85bc52c by Philipp Hörist at 2018-09-16T10:58:37Z
Fix sending empty pep data
- - - - -
5 changed files:
- gajim/common/modules/pep.py
- gajim/common/modules/user_activity.py
- gajim/common/modules/user_mood.py
- gajim/common/modules/user_nickname.py
- gajim/gtk/profile.py
Changes:
=====================================
gajim/common/modules/pep.py
=====================================
--- a/gajim/common/modules/pep.py
+++ b/gajim/common/modules/pep.py
@@ -106,7 +106,7 @@ class PEP:
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
=====================================
gajim/common/modules/user_activity.py
=====================================
--- a/gajim/common/modules/user_activity.py
+++ b/gajim/common/modules/user_activity.py
@@ -89,7 +89,7 @@ class UserActivity(AbstractPEPModule):
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)
=====================================
gajim/common/modules/user_mood.py
=====================================
--- a/gajim/common/modules/user_mood.py
+++ b/gajim/common/modules/user_mood.py
@@ -88,7 +88,7 @@ class UserMood(AbstractPEPModule):
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)
=====================================
gajim/common/modules/user_nickname.py
=====================================
--- a/gajim/common/modules/user_nickname.py
+++ b/gajim/common/modules/user_nickname.py
@@ -67,9 +67,8 @@ class UserNickname(AbstractPEPModule):
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,
=====================================
gajim/gtk/profile.py
=====================================
--- a/gajim/gtk/profile.py
+++ b/gajim/gtk/profile.py
@@ -331,11 +331,10 @@ class ProfileWindow(Gtk.ApplicationWindow):
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
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/e85bc52c8bf3200689400e571992aade4c653034
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/e85bc52c8bf3200689400e571992aade4c653034
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits
