iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Maybe actually fix time comparison

Browse Source
This commit is contained in:
Tulir Asokan
2022-10-12 22:09:23 +03:00
parent f2d0489488
commit fef03ddec0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/user.py
+3 -3
View File
@@ -695,12 +695,12 @@ class User(DBUser, AbstractUser, BaseUser):
self.log.exception(f"Error while creating {portal.tgid_log}") self.log.exception(f"Error while creating {portal.tgid_log}")
if portal.mxid and puppet and puppet.is_real_user: if portal.mxid and puppet and puppet.is_real_user:
tg_space = portal.tgid if portal.peer_type == "channel" else self.tgid tg_space = portal.tgid if portal.peer_type == "channel" else self.tgid
last_message_date: datetime = cast(datetime, dialog.date) last_message_date: float = cast(datetime, dialog.date).timestamp()
unread_threshold_hours = self.config["bridge.backfill.unread_hours_threshold"] unread_threshold_hours = self.config["bridge.backfill.unread_hours_threshold"]
force_read = ( force_read = (
was_created was_created
and unread_threshold_hours >= 0 and unread_threshold_hours >= 0
and last_message_date + timedelta(hours=unread_threshold_hours) < datetime.utcnow() and last_message_date + (unread_threshold_hours * 60 * 60) < time.time()
) )
if dialog.unread_count == 0 or force_read: if dialog.unread_count == 0 or force_read:
# This is usually more reliable than finding a specific message # This is usually more reliable than finding a specific message
@@ -709,7 +709,7 @@ class User(DBUser, AbstractUser, BaseUser):
if force_read: if force_read:
self.log.debug( self.log.debug(
f"Marking {portal.tgid_log} as read because the last message is from " f"Marking {portal.tgid_log} as read because the last message is from "
f"{last_message_date} (unread threshold is {unread_threshold_hours} hours)" f"{dialog.date} (unread threshold is {unread_threshold_hours} hours)"
) )
else: else:
last_read = await DBMessage.get_one_by_tgid( last_read = await DBMessage.get_one_by_tgid(