Mirrored_Repos/houdini
1
0
Fork 0
mirror of https://github.com/solero/houdini.git synced 2024-11-24 22:47:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for PST offset in mail timestamps

Browse Source
This commit is contained in:
Ben 2020-04-06 12:36:56 +01:00
parent e52ae1e6ef
commit d834749ea3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
houdini/handlers/play/mail.py
View File

@ -1,4 +1,5 @@
import time import time
import pytz
from houdini import handlers from houdini import handlers
from houdini.data import db from houdini.data import db
@ -33,13 +34,17 @@ async def handle_get_mail(p):
PenguinPostcard.send_date.desc()) PenguinPostcard.send_date.desc())
postcards = [] postcards = []
pst = pytz.timezone(p.server.config.timezone)
async with p.server.db.transaction(): async with p.server.db.transaction():
async for postcard in mail_query.gino.iterate(): async for postcard in mail_query.gino.iterate():
sender_name, sender_id = ('sys', 0) if postcard.sender_id is None else ( sender_name, sender_id = ('sys', 0) if postcard.sender_id is None else (
postcard.parent.safe_nickname(p.server.config.lang), postcard.sender_id) postcard.parent.safe_nickname(p.server.config.lang), postcard.sender_id)
sent_pst = postcard.send_date.astimezone(pst)
sent_timestamp = int(time.mktime(postcard.send_date.timetuple())) sent_timestamp = int(time.mktime(postcard.send_date.timetuple()))
sent_pst_timestamp = int(time.mktime(sent_pst.timetuple()))
sent_timestamp += sent_timestamp - sent_pst_timestamp
postcards.append(f'{sender_name}|{sender_id}|{postcard.postcard_id}|' postcards.append(f'{sender_name}|{sender_id}|{postcard.postcard_id}|'
f'{postcard.details}|{sent_timestamp}|{postcard.id}|{int(postcard.has_read)}') f'{postcard.details}|{sent_timestamp+1}|{postcard.id}|{int(postcard.has_read)}')
await p.send_xt('mg', *postcards) await p.send_xt('mg', *postcards)