From eba838bdac51dd38cfa1d385bed97f22fbc7c27d Mon Sep 17 00:00:00 2001 From: tmolitor Date: Mon, 18 Apr 2016 01:59:20 +0200 Subject: [PATCH] Use the timestamp of the forwarded message in mam processing if possible. Fixes #8277 --- src/common/connection_handlers_events.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py index 4ffdbf5bf..50d257e2b 100644 --- a/src/common/connection_handlers_events.py +++ b/src/common/connection_handlers_events.py @@ -1036,6 +1036,12 @@ class MamMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): 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_)