From d190185c1225ca835e33697113b2bbfefbfdf1fd Mon Sep 17 00:00:00 2001
From: stijndcl <declercq.stijn@outlook.com>
Date: Wed, 5 Oct 2022 21:04:06 +0200
Subject: [PATCH] Fix announcement timezones

---
 didier/data/embeds/ufora/announcements.py | 12 +++---------
 requirements-dev.txt                      |  1 -
 requirements.txt                          |  1 -
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/didier/data/embeds/ufora/announcements.py b/didier/data/embeds/ufora/announcements.py
index 6d32e43..7ded012 100644
--- a/didier/data/embeds/ufora/announcements.py
+++ b/didier/data/embeds/ufora/announcements.py
@@ -2,11 +2,11 @@ import re
 from dataclasses import dataclass, field
 from datetime import datetime
 from typing import Optional
+from zoneinfo import ZoneInfo
 
 import async_timeout
 import discord
 import feedparser
-import pytz
 from aiohttp import ClientSession
 from markdownify import markdownify as md
 from sqlalchemy.ext.asyncio import AsyncSession
@@ -16,7 +16,7 @@ from database.crud import ufora_announcements as crud
 from database.schemas import UforaCourse
 from didier.data.embeds.base import EmbedBaseModel
 from didier.utils.discord.colours import ghent_university_blue
-from didier.utils.types.datetime import int_to_weekday
+from didier.utils.types.datetime import LOCAL_TIMEZONE, int_to_weekday
 from didier.utils.types.string import leading
 
 __all__ = [
@@ -89,13 +89,7 @@ class UforaNotification(EmbedBaseModel):
         # We will hereby cut it out and pray the timezone will always be UTC+0
         published = self.content["published"].rsplit(" ", 1)[0]
         time_string = "%a, %d %b %Y %H:%M:%S"
-        dt = datetime.strptime(published, time_string).astimezone(pytz.timezone("Europe/Brussels"))
-
-        # Apply timezone offset in a hacky way
-        offset = dt.utcoffset()
-        if offset is not None:
-            dt += offset
-
+        dt = datetime.strptime(published, time_string).replace(tzinfo=ZoneInfo("GMT")).astimezone(LOCAL_TIMEZONE)
         return dt
 
     def _get_published(self) -> str:
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 9307b33..091b275 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -9,7 +9,6 @@ pytest-env==0.6.2
 sqlalchemy2-stubs==0.0.2a23
 types-beautifulsoup4==4.11.3
 types-python-dateutil==2.8.19
-types-pytz==2021.3.8
 
 # Flake8 + plugins
 flake8==4.0.1
diff --git a/requirements.txt b/requirements.txt
index 322d468..a29f1cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,5 +10,4 @@ markdownify==0.11.2
 overrides==6.1.0
 pydantic==1.9.1
 python-dateutil==2.8.2
-pytz==2022.1
 sqlalchemy[asyncio]==1.4.37