From c13612a69d8771e82c1a62112533be9fe88f0add Mon Sep 17 00:00:00 2001 From: manetta Date: Mon, 21 Feb 2022 14:48:56 +0100 Subject: [PATCH] logbot saves post under local timezone now (which is the timezone of the server) --- LogBot/logbot.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/LogBot/logbot.py b/LogBot/logbot.py index 3ced954..f064238 100644 --- a/LogBot/logbot.py +++ b/LogBot/logbot.py @@ -2,7 +2,8 @@ import os import re import shutil import urllib.request -from datetime import datetime +from datetime import datetime, timezone +import pytz from urllib.parse import urlparse from mimetypes import guess_type import jinja2 @@ -102,7 +103,9 @@ class Logbot(Bot): if "@" in folder_name: # hacky folder_name = self._parse_room_name(folder_name) feed_path = os.path.join(self.output, folder_name, "feed.rss.xml") - date = datetime.now() + local_timezone = str(datetime.now(timezone.utc).astimezone().tzinfo) + date = datetime.now(pytz.timezone(local_timezone)).strftime("%a, %d %b %Y %H:%M:%S %Z") # logs are saved with local timezone + print(date) template = jinja2.Template(open("template.rss").read()) # self.feedtemplate would be useful to have in the conf with open(feed_path, "w") as out: feed = template.render( @@ -110,7 +113,7 @@ class Logbot(Bot): feed_path=os.path.join(self.baseurl, folder_name, "feed.rss.xml"), title=self.db[message.room]["title"], db=self.db[message.room], - date=date.strftime("%a, %d %b %Y %H:%M:%S +0100"), # timezone is hardcoded now + date=date, log_folder_url=os.path.join(self.baseurl, folder_name), ) out.write(feed) @@ -120,7 +123,8 @@ class Logbot(Bot): """Save new entry to database.""" keys = [x for x in self.db[message.room]["messages"].keys()] keys.sort(key=int) - date = datetime.now().strftime("%a, %d %b %Y %H:%M:%S +0100") # timezone is hardcoded now + local_timezone = str(datetime.now(timezone.utc).astimezone().tzinfo) + date = datetime.now(pytz.timezone(local_timezone)).strftime("%a, %d %b %Y %H:%M:%S %Z") # logs are saved with local timezone if not keys: new_key = "0" else: