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

Cleaner version of the mam message timestamp fix. Fixes #8277

Browse source
This commit is contained in:
tmolitor 2016-04-19 23:43:01 +02:00
parent eba838bdac
commit 7afbe5706e
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/connection_handlers_events.py
View file

@ -1029,19 +1029,17 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
if not self.stanza: if not self.stanza:
return return
account = self.conn.name account = self.conn.name
self.msg_ = self.stanza.getTag('message')
# use timestamp of archived message, if available and archive timestamp otherwise
delay = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) delay = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2)
delay2 = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2)
if delay2:
delay = delay2
if not delay: if not delay:
return return
tim = delay.getAttr('stamp') tim = delay.getAttr('stamp')
tim = helpers.datetime_tuple(tim) tim = helpers.datetime_tuple(tim)
self.tim = localtime(timegm(tim)) self.tim = localtime(timegm(tim))
self.msg_ = self.stanza.getTag('message')
# use delay of archived message, if possible
delay = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2)
if delay:
tim = delay.getAttr('stamp')
tim = helpers.datetime_tuple(tim)
self.tim = localtime(timegm(tim))
to_ = self.msg_.getAttr('to') to_ = self.msg_.getAttr('to')
if to_: if to_:
to_ = gajim.get_jid_without_resource(to_) to_ = gajim.get_jid_without_resource(to_)