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

Dont use getTimestamp()

Browse source 
getTimestamp() generates always a timestring with a resolution of seconds and
this means time gets always rounded down.
Because we use a resolution of .00000 precision for outgoing messages this
can lead to wrongly sorted messages.
This commit is contained in:
Philipp Hörist 2018-02-12 21:18:49 +01:00
parent c02af8f517
commit fb4b262477
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gajim/common/connection_handlers_events.py
View file

@ -99,7 +99,7 @@ class HelperEvent:
def _generate_timestamp(self, tag): def _generate_timestamp(self, tag):
# Make sure we use only int/float Epoch time # Make sure we use only int/float Epoch time
if not isinstance(tag, str): if tag is None:
self.timestamp = time_time() self.timestamp = time_time()
return return
try: try:
@ -771,7 +771,7 @@ PresenceHelperEvent):
# XEP-0203 # XEP-0203
delay_tag = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2) delay_tag = self.stanza.getTag('delay', namespace=nbxmpp.NS_DELAY2)
if delay_tag: if delay_tag:
self._generate_timestamp(self.stanza.getTimestamp2()) self._generate_timestamp(self.stanza.timestamp)
# XEP-0319 # XEP-0319
self.idle_time = None self.idle_time = None
idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE) idle_tag = self.stanza.getTag('idle', namespace=nbxmpp.NS_IDLE)
@ -791,7 +791,7 @@ PresenceHelperEvent):
self.contact_nickname = x.getTagData('nickname') self.contact_nickname = x.getTagData('nickname')
elif namespace == nbxmpp.NS_DELAY and not self.timestamp: elif namespace == nbxmpp.NS_DELAY and not self.timestamp:
# XEP-0091 # XEP-0091
self._generate_timestamp(self.stanza.getTimestamp()) self._generate_timestamp(self.stanza.timestamp)
elif namespace == 'http://delx.cjb.net/protocol/roster-subsync': elif namespace == 'http://delx.cjb.net/protocol/roster-subsync':
# see http://trac.gajim.org/ticket/326 # see http://trac.gajim.org/ticket/326
agent = app.get_server_from_jid(self.jid) agent = app.get_server_from_jid(self.jid)
@ -1401,7 +1401,7 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
self.session.last_receive = time_time() self.session.last_receive = time_time()
self._generate_timestamp(self.stanza.getTimestamp()) self._generate_timestamp(self.stanza.timestamp)
return True return True