nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Can use countdown without timezone

Browse Source
This commit is contained in:
nemunaire 2014-10-09 07:30:04 +02:00
parent dfde4c5f49
commit f9ee1fe898
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/birthday.py
View File

@ -4,8 +4,7 @@
import re import re
import sys import sys
from datetime import datetime from datetime import date, datetime
from datetime import date
from hooks import hook from hooks import hook
from tools.countdown import countdown_format from tools.countdown import countdown_format

21
tools/countdown.py
View File

@ -67,12 +67,21 @@ def countdown_format(date, msg_before, msg_after, tz=None):
time.tzset() time.tzset()
#Calculate time before the date #Calculate time before the date
if datetime.now(timezone.utc) > date: try:
sentence_c = msg_after if datetime.now(timezone.utc) > date:
delta = datetime.now(timezone.utc) - date sentence_c = msg_after
else: delta = datetime.now(timezone.utc) - date
sentence_c = msg_before else:
delta = date - datetime.now(timezone.utc) sentence_c = msg_before
delta = date - datetime.now(timezone.utc)
except TypeError:
if datetime.now() > date:
sentence_c = msg_after
delta = datetime.now() - date
else:
sentence_c = msg_before
delta = date - datetime.now()
if tz != None: if tz != None:
os.environ['TZ'] = oldtz os.environ['TZ'] = oldtz