From: Julian Fietkau <git@fietkau.software>
Date: Fri, 1 Nov 2024 13:20:23 +0000 (+0100)
Subject: Update bot core to no longer rely on deprecated datetime.utcnow()
X-Git-Url: https://fietkau.software/TimberBot.git/commitdiff_plain?repo=TimberBot;h=92a1b788cccbf1d46c82c4fde014dbd4b82e6cac;p=TimberBot;a=commitdiff_plain

Update bot core to no longer rely on deprecated datetime.utcnow()
---

diff --git a/timberbot.py b/timberbot.py
index 181520d..3e8a2af 100755
--- a/timberbot.py
+++ b/timberbot.py
@@ -84,10 +84,10 @@ class TimberBot:
     def error_log(self, line, timestamp = True):
         logstr = ''
         if timestamp:
-            logstr = '[' + datetime.datetime.utcnow().strftime('%H:%M:%S') + '] '
+            logstr = '[' + datetime.datetime.now(datetime.UTC).strftime('%H:%M:%S') + '] '
         logstr = logstr + line
         print('[' + self.config_calls['get']('main', 'channel') + '] ' + logstr)
-        log_path = os.path.join(self.data_dir, 'error_logs', datetime.datetime.utcnow().strftime('%Y-%m-%d')+'.txt')
+        log_path = os.path.join(self.data_dir, 'error_logs', datetime.datetime.now(datetime.UTC).strftime('%Y-%m-%d')+'.txt')
         if not os.path.exists(os.path.dirname(log_path)):
             os.makedirs(os.path.dirname(log_path))
         with codecs.open(log_path, 'a', 'utf-8') as log_file:
diff --git a/twitch.py b/twitch.py
index de59869..432eeed 100644
--- a/twitch.py
+++ b/twitch.py
@@ -109,7 +109,7 @@ class ConnectorTwitch():
     def socket_send(self, message):
         if self.ws == None:
             return
-        while len(self.sent_timestamps) > 0 and self.sent_timestamps[0] + datetime.timedelta(seconds = 30) < datetime.datetime.utcnow():
+        while len(self.sent_timestamps) > 0 and self.sent_timestamps[0] + datetime.timedelta(seconds = 30) < datetime.datetime.now(datetime.UTC):
             self.sent_timestamps.pop(0)
         if len(self.sent_timestamps) < 20: # ensures we do not send >20 msgs per 30 seconds.
             msg = 'PRIVMSG #' + self.config['channel'].lower() + ' :' + message
@@ -122,7 +122,7 @@ class ConnectorTwitch():
                 # Twitch's tolerance for quick messages may be changing,
                 # this default used to be 0.5.
                 time.sleep(1.0)
-            self.sent_timestamps.append(datetime.datetime.utcnow())
+            self.sent_timestamps.append(datetime.datetime.now(datetime.UTC))
         else:
             raise IOError('Message queue full, outgoing message skipped: ' + message)