TheLovinator/discord-reminder-bot
1
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Make error messages ephemeral

Browse Source
This commit is contained in:
Joakim Hellsén
2022-09-18 02:09:58 +02:00
parent 95a8acf19a
commit 8e6aedc1e2
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
discord_reminder_bot/create_pages.py
View File

@ -122,12 +122,11 @@ def create_pages(ctx) -> list[Page]:
async def callback(self: Paginator, ctx: ComponentContext):
"""Callback for the paginator."""
job_id = self.component_ctx.message.embeds[0].title
job_id = self.component_ctx.message.embeds[0].title # type: ignore
job = scheduler.get_job(job_id)
if job is None:
await ctx.send("Job not found.")
return
return await ctx.send("Job not found.", ephemeral=True)
channel_id = job.kwargs.get("channel_id")
old_message = job.kwargs.get("message")
@ -168,23 +167,22 @@ async def callback(self: Paginator, ctx: ComponentContext):
modal = interactions.Modal(
title=f"Edit {job_type} reminder.",
custom_id="edit_modal",
components=components,
components=components, # type: ignore
)
await ctx.popup(modal)
print(ctx.data)
elif ctx.custom_id == "pause":
await self.end_paginator()
# TODO: Add unpause button if user paused the wrong job
paused_job = scheduler.pause_job(job_id)
print(f"Paused job: {paused_job}")
scheduler.pause_job(job_id)
await ctx.send(f"Job {job_id} paused.")
elif ctx.custom_id == "unpause":
await self.end_paginator()
# TODO: Add pause button if user unpauses the wrong job
scheduler.resume_job(job_id)
await ctx.send(f"Job {job_id} unpaused.")
elif ctx.custom_id == "remove":
await self.end_paginator()
# TODO: Add recreate button if user removed the wrong job

40
discord_reminder_bot/main.py
View File

@ -8,7 +8,6 @@ from apscheduler.triggers.date import DateTrigger
from dateparser.conf import SettingValidationError
from interactions import CommandContext, Embed, Option, OptionType
from interactions.ext.paginator import Paginator
from interactions.ext.wait_for import setup
from discord_reminder_bot.countdown import calculate
from discord_reminder_bot.create_pages import create_pages
@ -22,9 +21,6 @@ from discord_reminder_bot.settings import (
bot = interactions.Client(token=bot_token)
# Initialize the wait_for extension.
setup(bot)
@bot.command(name="remind")
async def base_command(ctx: interactions.CommandContext):
@ -44,7 +40,7 @@ async def modal_response_edit(ctx: CommandContext, *response: str):
Returns:
A Discord message with changes.
"""
job_id = ctx.message.embeds[0].title
job_id = ctx.message.embeds[0].title # type: ignore
old_date = None
old_message = None
@ -52,14 +48,15 @@ async def modal_response_edit(ctx: CommandContext, *response: str):
job = scheduler.get_job(job_id)
except JobLookupError as e:
return await ctx.send(
f"Failed to get the job after the modal.\nJob ID: {job_id}\nError: {e}"
f"Failed to get the job after the modal.\nJob ID: {job_id}\nError: {e}",
ephemeral=True,
)
if job is None:
return await ctx.send("Job not found.")
return await ctx.send("Job not found.", ephemeral=True)
if not response:
return await ctx.send("No changes made.")
return await ctx.send("No changes made.", ephemeral=True)
if type(job.trigger) is DateTrigger:
new_message = response[0]
@ -68,9 +65,9 @@ async def modal_response_edit(ctx: CommandContext, *response: str):
new_message = response[0]
new_date = None
message_embeds: List[Embed] = ctx.message.embeds
message_embeds: List[Embed] = ctx.message.embeds # type: ignore
for embeds in message_embeds:
for field in embeds.fields:
for field in embeds.fields: # type: ignore
if field.name == "**Channel:**":
continue
elif field.name == "**Message:**":
@ -95,9 +92,13 @@ async def modal_response_edit(ctx: CommandContext, *response: str):
},
)
except SettingValidationError as e:
return await ctx.send(f"Timezone is possible wrong?: {e}", ephemeral=True)
return await ctx.send(
f"Timezone is possible wrong?: {e}", ephemeral=True
)
except ValueError as e:
return await ctx.send(f"Failed to parse date. Unknown language: {e}", ephemeral=True)
return await ctx.send(
f"Failed to parse date. Unknown language: {e}", ephemeral=True
)
if not parsed_date:
return await ctx.send("Could not parse the date.", ephemeral=True)
@ -125,7 +126,8 @@ async def modal_response_edit(ctx: CommandContext, *response: str):
)
except JobLookupError as e:
return await ctx.send(
f"Failed to modify the job.\nJob ID: {job_id}\nError: {e}"
f"Failed to modify the job.\nJob ID: {job_id}\nError: {e}",
ephemeral=True,
)
msg += f"**Old message**: {old_message}\n**New message**: {new_message}\n"
@ -210,9 +212,11 @@ async def command_add(
except SettingValidationError as e:
return await ctx.send(f"Timezone is possible wrong?: {e}", ephemeral=True)
except ValueError as e:
return await ctx.send(f"Failed to parse date. Unknown language: {e}", ephemeral=True)
return await ctx.send(
f"Failed to parse date. Unknown language: {e}", ephemeral=True
)
if not parsed_date:
return await ctx.send("Could not parse the date.")
return await ctx.send("Could not parse the date.", ephemeral=True)
channel_id = int(ctx.channel_id)
@ -232,7 +236,7 @@ async def command_add(
},
)
except ValueError as e:
await ctx.send(str(e))
await ctx.send(str(e), ephemeral=True)
return
message = (
@ -402,7 +406,7 @@ async def remind_cron(
},
)
except ValueError as e:
await ctx.send(str(e))
await ctx.send(str(e), ephemeral=True)
return
# TODO: Add what arguments we used in the job to the message
@ -542,7 +546,7 @@ async def remind_interval(
},
)
except ValueError as e:
await ctx.send(str(e))
await ctx.send(str(e), ephemeral=True)
return
# TODO: Add what arguments we used in the job to the message