a3x
/
transpub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update nickname in groups if nickname is unset.

This commit is contained in:
moyamo 2015-12-30 09:46:39 +02:00
parent fae4c648ee
commit bbf5a08697
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
session.py
View File

@ -280,7 +280,7 @@ class Session(YowsupApp):
if participant is not None: # Group message if participant is not None: # Group message
partname = participant.split(u'@')[0] partname = participant.split(u'@')[0]
self.sendGroupMessageToXMPP(buddy, partname, messageContent, self.sendGroupMessageToXMPP(buddy, partname, messageContent,
timestamp) timestamp, participant)
else: else:
self.sendMessageToXMPP(buddy, messageContent, timestamp) self.sendMessageToXMPP(buddy, messageContent, timestamp)
# isBroadcast always returns false, Iu'm not sure how to get a broadcast # isBroadcast always returns false, Iu'm not sure how to get a broadcast
@ -636,7 +636,7 @@ class Session(YowsupApp):
self.backend.handleMessage(self.user, buddy, messageContent, u"", self.backend.handleMessage(self.user, buddy, messageContent, u"",
u"", timestamp) u"", timestamp)
def sendGroupMessageToXMPP(self, room, number, messageContent, timestamp = u""): def sendGroupMessageToXMPP(self, room, number, messageContent, timestamp = u"", defaultname = u""):
if timestamp: if timestamp:
timestamp = time.strftime(u"%Y%m%dT%H%M%S", time.gmtime(timestamp)) timestamp = time.strftime(u"%Y%m%dT%H%M%S", time.gmtime(timestamp))
@ -657,6 +657,8 @@ class Session(YowsupApp):
group = self.groups[room] group = self.groups[room]
# Update nickname # Update nickname
try: try:
if defaultname != u"" and group.participants[number].nick == number:
group.changeNick(number, defaultname)
if self.buddies[number].nick != u"": if self.buddies[number].nick != u"":
group.changeNick(number, self.buddies[number].nick) group.changeNick(number, self.buddies[number].nick)
except KeyError: except KeyError: