Matsubaa/adventurelandX
1
0
Fork 0
mirror of https://github.com/gooba42/adventureland.git synced 2026-10-14 18:39:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

python3 fixes and patches

Browse Source
This commit is contained in:
Kaan Soral
2024-02-06 23:38:44 +03:00
parent c9c28e7be6
commit 889e3b2ac2
12 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api.py
+5 -4
View File
@@ -979,12 +979,13 @@ def pull_mail_api(**args):
else:
mails,new_cursor,new_more=Mail.query(Mail.owner==user.k()).order(-Mail.created).fetch_page(page)
for mail in mails:
mail_data={"fro":mail.fro,"to":mail.to,"message":mail.info.message,"subject":mail.info.subject,"sent":"%s"%mail.created,"id":mail.k()}
#logging.info("%s"%mail.created)
mail_data={"fro":py3_safe_string(mail.fro),"to":py3_safe_string(mail.to),"message":py3_safe_string(mail.info.message),"subject":py3_safe_string(mail.info.subject),"sent":"%s"%mail.created,"id":mail.k()}
if mail.item:
mail_data["item"]=simplify_item(mail.info.item)
mail_data["taken"]=mail.taken
data["mail"].append(mail_data)
if new_cursor: data["cursor"]=new_cursor.urlsafe()
if new_cursor: data["cursor"]=py3_safe_string(new_cursor.urlsafe())
if new_more: data["more"]=True
jhtml(self,[data])
@@ -1073,10 +1074,10 @@ def pull_messages_api(**args):
else:
messages,new_cursor,new_more=query.fetch_page(page)
for message in messages:
m_data={"fro":message.fro,"to":message.to,"message":message.info.message,"type":message.type,"id":message.k(),"server":message.server,"date":"%s"%message.created.strftime('%Y-%m-%dT%H:%M:%SZ')}
m_data={"fro":py3_safe_string(message.fro),"to":py3_safe_string(message.to),"message":py3_safe_string(message.info.message),"type":py3_safe_string(message.type),"id":message.k(),"server":py3_safe_string(message.server),"date":"%s"%message.created.strftime('%Y-%m-%dT%H:%M:%SZ')}
data["messages"].append(m_data)
#logging.info(m_data)
if new_cursor: data["cursor"]=new_cursor.urlsafe()
if new_cursor: data["cursor"]=py3_safe_string(new_cursor.urlsafe())
if new_more: data["more"]=True
jhtml(self,[data])