mirror of
https://github.com/markqvist/NomadNet.git
synced 2026-10-26 19:01:44 -04:00
Conversations: make "yesterday/N days ago" respect calendar days and not just hours
This commit is contained in:
parent
193311b4e5
commit
79879c4e77
2 changed files with 14 additions and 13 deletions
|
|
@ -1939,13 +1939,14 @@ def pretty_date(time=False):
|
|||
from datetime import datetime
|
||||
now = datetime.now()
|
||||
if type(time) is int:
|
||||
diff = now - datetime.fromtimestamp(time)
|
||||
then = datetime.fromtimestamp(time)
|
||||
elif isinstance(time,datetime):
|
||||
diff = now - time
|
||||
then = time
|
||||
elif not time:
|
||||
diff = now - now
|
||||
then = now
|
||||
diff = now - then
|
||||
second_diff = diff.seconds
|
||||
day_diff = diff.days
|
||||
day_diff = (now.date() - then.date()).days
|
||||
|
||||
if day_diff < 0:
|
||||
return ''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue