Compare commits

..

No commits in common. "af3084ad36e1106af638e11e66a88bca9ef04e75" and "bc94d31a8d2e19a6caee1692c92b1991cb48340d" have entirely different histories.

3 changed files with 8 additions and 4 deletions

View File

@ -20,7 +20,7 @@ class ScheduledEventsCommand(DiscordCommandABC):
self._logger.trace(__name__, f"Loaded command service: {type(self).__name__}")
@commands.hybrid_group(name="scheduled-events")
@commands.group(name="scheduled-events")
@commands.guild_only()
async def scheduled_events(self, ctx: Context):
pass

View File

@ -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")

View File

@ -115,11 +115,15 @@ class EventService:
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 = scheduled_event.start_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
kwargs["start_time"] = start_time
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 = scheduled_event.end_time.replace(tzinfo=ZoneInfo("Europe/Berlin"))
kwargs["end_time"] = end_time
kwargs["entity_type"] = scheduled_event.entity_type
if scheduled_event.location is not None: