Merge pull request 'staging' (#447) from staging into master

Reviewed-on: #447

bot/src/modules/base/events/base_on_scheduled_event_update_event.py

@@ -37,10 +37,10 @@ class BaseOnScheduledEventUpdateEvent(OnScheduledEventUpdateABC):
         if before.status != after.status and (
             after.status.value == EventStatus.cancelled.value or after.status.value == EventStatus.completed.value
         ):
-            await self._events.check_and_create_scheduled_events(before.guild)
             event = self._events.get_active_event(after)
             if event is None:
                 return
             self._events.remove_event(event)
 
+        await self._events.check_and_create_scheduled_events(before.guild)
         self._logger.debug(__name__, f"Module {type(self)} stopped")

bot/src/modules/base/service/event_service.py

@@ -74,7 +74,8 @@ class EventService:
         active_event.participants.append(user)
 
     def _append_interval(self, interval: ScheduledEventIntervalEnum, ts: datetime) -> datetime:
-        if ts >= datetime.now():
+        now = datetime.now().replace(tzinfo=ZoneInfo("Europe/Berlin"))
+        if ts >= now:
             return ts
 
         if interval == ScheduledEventIntervalEnum.daily:
@@ -90,7 +91,7 @@ class EventService:
         elif interval == ScheduledEventIntervalEnum.yearly:
             ts = ts + timedelta(days=365)
 
-        while ts < datetime.now():
+        while ts < now:
             ts = self._append_interval(interval, ts)
 
         return ts
@@ -114,12 +115,18 @@ class EventService:
                 kwargs["channel"] = guild.get_channel(scheduled_event.channel_id)
 
             if scheduled_event.start_time is not None:
-                scheduled_event.start_time = self._append_interval(scheduled_event.interval, scheduled_event.start_time)
-                kwargs["start_time"] = scheduled_event.start_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
+                start_time = self._append_interval(
+                    scheduled_event.interval, scheduled_event.start_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
+                )
+                kwargs["start_time"] = start_time
+                scheduled_event.start_time = scheduled_event.start_time.replace(tzinfo=None)
 
             if scheduled_event.end_time is not None:
-                scheduled_event.end_time = self._append_interval(scheduled_event.interval, scheduled_event.end_time)
-                kwargs["end_time"] = scheduled_event.end_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
+                end_time = self._append_interval(
+                    scheduled_event.interval, scheduled_event.end_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
+                )
+                kwargs["end_time"] = end_time
+                scheduled_event.end_time = scheduled_event.end_time.replace(tzinfo=None)
 
             kwargs["entity_type"] = scheduled_event.entity_type
             if scheduled_event.location is not None:

bot/src/modules/base/thread/__init__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-bot sh-edraft.de Discord bot
-~~~~~~~~~~~~~~~~~~~
-
-Discord bot for customers of sh-edraft.de
-
-:copyright: (c) 2022 - 2023 sh-edraft.de
-:license: MIT, see LICENSE for more details.
-
-"""
-
-__title__ = "modules.base.thread"
-__author__ = "Sven Heidemann"
-__license__ = "MIT"
-__copyright__ = "Copyright (c) 2022 - 2023 sh-edraft.de"
-__version__ = "1.2.2"
-
-from collections import namedtuple
-
-
-# imports
-
-VersionInfo = namedtuple("VersionInfo", "major minor micro")
-version_info = VersionInfo(major="1", minor="2", micro="2")