From aff549b8ce2abc67487cef73f092f836099e7009 Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Tue, 30 Jun 2020 02:18:27 +0400
Subject: [PATCH] Updated reminder.

Signed-off-by: Pavel Kirilin <win10@list.ru>
---
 src/actions/basic.py    |  2 +-
 src/actions/reminder.py | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/actions/basic.py b/src/actions/basic.py
index 1db4574..069af73 100644
--- a/src/actions/basic.py
+++ b/src/actions/basic.py
@@ -32,7 +32,7 @@ async def show_time(event):
     now = datetime.utcnow()
     tz_offset = tz.utcoffset(now)
     current_time = now + tz_offset
-    await event.respond(f"{current_time.strftime('%Y-%M-%d %H:%M:%S')} MSK")
+    await event.respond(f"{current_time.strftime('%Y-%M-%d %H:%M:%S+03')} MSK")
 
 
 @config.telegram_client.on(events.NewMessage(pattern=".*@all.*", forwards=False))
diff --git a/src/actions/reminder.py b/src/actions/reminder.py
index 6290b41..7e1b964 100644
--- a/src/actions/reminder.py
+++ b/src/actions/reminder.py
@@ -34,7 +34,7 @@ async def reminder_help(event):
 @mark_unread
 async def set_reminder(event: events.NewMessage.Event):
     groups = event.pattern_match.groupdict()
-    target_time = datetime.datetime.now()
+    target_time = datetime.datetime.now(datetime.timezone.utc)
     action = groups["action"]
     date = groups["date"] or ""
     target_time += date_translation[date.strip()]
@@ -53,12 +53,13 @@ async def set_reminder(event: events.NewMessage.Event):
     else:
         target_time = target_time.replace(hour=int(time), minute=0)
     target_time = target_time.replace(second=0, microsecond=0)
+
     if time_offset:
-        target_time_delta = (
-            target_time.replace() + time_offset
-        ) - datetime.datetime.utcnow()
+        target_time_delta = (target_time + time_offset) - datetime.datetime.now(
+            datetime.timezone.utc
+        )
     else:
-        target_time_delta = target_time.replace() - datetime.datetime.now()
+        target_time_delta = target_time - datetime.datetime.now()
     chat = await event.get_chat()
     message = event.message
     username = ""
-- 
GitLab