changeset 38868f5ccd7c in /home/hg/repos/gajim

author: tmolitor thilo@eightysoft.de branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=38868f5ccd7c description: Cleaner version of the mam message timestamp fix. Fixes #8277

diffstat:

src/common/connection_handlers_events.py | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-)

diffs (28 lines):

diff -r 2ac97016cc8f -r 38868f5ccd7c src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Mon Apr 18 01:59:20 2016 +0200 +++ b/src/common/connection_handlers_events.py Tue Apr 19 23:43:01 2016 +0200 @@ -1033,19 +1033,17 @@ if not self.stanza: return 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) + delay2 = self.msg_.getTag('delay', namespace=nbxmpp.NS_DELAY2) + if delay2: + delay = delay2 if not delay: return tim = delay.getAttr('stamp') tim = helpers.datetime_tuple(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') if to_: to_ = gajim.get_jid_without_resource(to_)