From c854e7faa072c22d61cc4ba9850239afeb946f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= Date: Sun, 21 May 2023 20:07:24 +0200 Subject: [PATCH] Fix not being able to remove interval reminders --- discord_reminder_bot/create_pages.py | 5 ++++- discord_reminder_bot/main.py | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/discord_reminder_bot/create_pages.py b/discord_reminder_bot/create_pages.py index 447e9fb..51e632b 100644 --- a/discord_reminder_bot/create_pages.py +++ b/discord_reminder_bot/create_pages.py @@ -179,7 +179,10 @@ def _remove_job(job: Job) -> str: # TODO: Add button to undo the removal? channel_id: int = job.kwargs.get("channel_id") old_message: str = job.kwargs.get("message") - trigger_time: datetime | None = job.trigger.run_date + try: + trigger_time: datetime | str = job.trigger.run_date + except AttributeError: + trigger_time = "N/A" scheduler.remove_job(job.id) return f"Job {job.id} removed.\n**Message:** {old_message}\n**Channel:** {channel_id}\n**Time:** {trigger_time}" diff --git a/discord_reminder_bot/main.py b/discord_reminder_bot/main.py index e3a9e6f..57c6234 100644 --- a/discord_reminder_bot/main.py +++ b/discord_reminder_bot/main.py @@ -7,7 +7,16 @@ from apscheduler.events import EVENT_JOB_ERROR, EVENT_JOB_MISSED, JobExecutionEv from apscheduler.jobstores.base import JobLookupError from apscheduler.triggers.date import DateTrigger from discord_webhook import DiscordWebhook -from interactions import Channel, Client, CommandContext, Embed, Member, Message, OptionType, autodefer +from interactions import ( + Channel, + Client, + CommandContext, + Embed, + Member, + Message, + OptionType, + autodefer, +) from interactions.ext.paginator import Page, Paginator from discord_reminder_bot.countdown import calculate