Yadciel/Titan
1
0
Fork 0
mirror of https://github.com/TitanEmbeds/Titan.git synced 2024-11-15 02:21:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Strip timezone information completely for comparing

Browse Source
This commit is contained in:
Jeremy Zhang 2017-09-05 07:29:36 +00:00
parent aa9075f484
commit f5f3423e36
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/titanembeds/database/keyvalue_properties.py
View File

@ -20,14 +20,14 @@ def set_keyvalproperty(key, value, expiration=None):
def get_keyvalproperty(key): def get_keyvalproperty(key):
q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key) q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
now = datetime.now() now = datetime.now()
if q.count() > 0 and (q.first().expiration is None or q.first().expiration.replace(tzinfo=None) > now): if q.count() > 0 and (q.first().expiration.replace(tzinfo=None) is None or q.first().expiration.replace(tzinfo=None) > now.replace(tzinfo=None)):
return q.first().value return q.first().value
return None return None
def getexpir_keyvalproperty(key): def getexpir_keyvalproperty(key):
q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key) q = db.session.query(KeyValueProperties).filter(KeyValueProperties.key == key)
now = datetime.now() now = datetime.now()
if q.count() > 0 and (q.first().expiration is not None and q.first().expiration.replace(tzinfo=None) > now): if q.count() > 0 and (q.first().expiration.replace(tzinfo=None) is not None and q.first().expiration.replace(tzinfo=None) > now.replace(tzinfo=None)):
return int(q.first().expiration.strftime('%s')) return int(q.first().expiration.strftime('%s'))
return 0 return 0