Preserve mention permissions in reminders (#11)

* Add explicit allowed_mentions to reminder dispatch

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>

* Preserve mention permissions in reminders

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>

* Store specific mention user/role IDs, rename columns to mention_*

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>

* Always allow pinging reminder creator in dispatch

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>

* Remove mention_user_ids, always allow user mentions

Co-Authored-By: Oliver Ni <oliver.ni@gmail.com>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Oliver Ni <oliver.ni@gmail.com>

Author: devin-ai-integration[bot]

bmt_discord_bot/cogs/reminders.py

@@ -31,7 +31,7 @@ async def reminder(
         *,
         time_and_content: Annotated[
             time.FriendlyTimeResult,
-            time.UserFriendlyTime(commands.clean_content, default="\u2026"),
+            time.UserFriendlyTime(default="\u2026"),
         ],
     ):
         """Sets a reminder for a date or duration of time, e.g.:
@@ -43,11 +43,14 @@ async def reminder(
         Times are parsed as US Pacific Time.
         """
 
+        mention_everyone = ctx.message.mention_everyone
+        mention_role_ids = [r.id for r in ctx.message.role_mentions]
+
         reminder = await ctx.bot.database.pool.fetchrow(
             """
-                INSERT INTO reminders (user_id, event, guild_id, channel_id, message_id, created_at, expires_at)
-                VALUES ($1, $2, $3, $4, $5, $6, $7)
-                RETURNING id, user_id, event, channel_id, message_id, created_at, expires_at
+                INSERT INTO reminders (user_id, event, guild_id, channel_id, message_id, created_at, expires_at, mention_everyone, mention_role_ids)
+                VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)
+                RETURNING id, user_id, event, channel_id, message_id, created_at, expires_at, mention_everyone, mention_role_ids
             """,
             ctx.author.id,
             time_and_content.arg,
@@ -56,10 +59,13 @@ async def reminder(
             ctx.message.id,
             ctx.message.created_at,
             time_and_content.dt,
+            mention_everyone,
+            mention_role_ids,
         )
         self.bot.loop.create_task(self.update_current(reminder))
         await ctx.send(
-            f"Alright, I'll remind you in **{time.human_timedelta(time_and_content.dt, source=ctx.message.created_at)}**: {time_and_content.arg}"
+            f"Alright, I'll remind you in **{time.human_timedelta(time_and_content.dt, source=ctx.message.created_at)}**: {time_and_content.arg}",
+            allowed_mentions=discord.AllowedMentions.none(),
         )
 
     @reminder.command()
@@ -115,7 +121,7 @@ async def delete(self, ctx: Context, ids: commands.Greedy[int]):
     async def get_next_reminder(self):
         return await self.bot.database.pool.fetchrow(
             """
-            SELECT id, user_id, event, channel_id, message_id, created_at, expires_at
+            SELECT id, user_id, event, channel_id, message_id, created_at, expires_at, mention_everyone, mention_role_ids
             FROM reminders
             WHERE NOT is_resolved
             ORDER BY expires_at
@@ -165,12 +171,19 @@ async def dispatch_reminder(self, reminder):
             text = f"<@{reminder['user_id']}> {text}"
             reference = None
 
+        allowed_mentions = discord.AllowedMentions(
+            everyone=reminder["mention_everyone"],
+            roles=[discord.Object(id=r) for r in reminder["mention_role_ids"]],
+            users=True,
+            replied_user=True,
+        )
+
         try:
-            await channel.send(text, reference=reference)
+            await channel.send(text, reference=reference, allowed_mentions=allowed_mentions)
         except (discord.NotFound, discord.Forbidden):
             return await self.bot.database.pool.execute(
                 "UPDATE reminders SET is_failed = True WHERE id = $1",
-                reminder.id,
+                reminder["id"],
             )
 
         self.bot.loop.create_task(self.update_current())

bmt_discord_bot/database.py

@@ -25,6 +25,7 @@ class Database:
         Migration.from_files("0001_reminders"),
         Migration.from_files("0002_math"),
         Migration.from_files("0003_copycat"),
+        Migration.from_files("0004_reminder_allowed_mentions"),
     ]
 
     def __init__(self, pool: asyncpg.Pool):

bmt_discord_bot/migrations/0004_reminder_allowed_mentions.sql

@@ -0,0 +1,3 @@
+ALTER TABLE reminders
+    ADD COLUMN mention_everyone BOOLEAN NOT NULL DEFAULT FALSE,
+    ADD COLUMN mention_role_ids BIGINT[] NOT NULL DEFAULT '{}';

bmt_discord_bot/migrations/0004_reminder_allowed_mentions_down.sql

@@ -0,0 +1,3 @@
+ALTER TABLE reminders
+    DROP COLUMN mention_everyone,
+    DROP COLUMN mention_role_ids;