history time is now correct. fixed #1571

parent 25e82efe
......@@ -33,7 +33,7 @@
"""
various useful functions
"""
from datetime import datetime, timedelta
import base64
import os
import mimetypes
......@@ -44,6 +44,7 @@ import sys
import select
import errno
import xmpp
import time
def debug(string):
"""
......@@ -261,7 +262,8 @@ def datetime_tuple(timestamp):
"""
timestamp = timestamp.split('.')[0]
timestamp = timestamp.replace('-', '')
timestamp = timestamp.replace('z', '')
timestamp = timestamp.replace('Z', '')
from datetime import datetime
return datetime.strptime(timestamp, '%Y%m%dT%H:%M:%S')
ret = datetime.strptime(timestamp, '%Y%m%dT%H:%M:%SZ')
# convert UTC to local time, with DST etc.
dst = timedelta(seconds=time.altzone)
ret -= dst
return ret
......@@ -377,8 +377,7 @@ class Gui(object):
"""
Display the message on the room window
"""
delay_tag = stanza.getTag('delay', namespace='urn:xmpp:delay')
if delay_tag and not date:
if delay_tag:
delayed = True
date = common.datetime_tuple(delay_tag.getAttr('stamp'))
else:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment