From 96c8ed8d2ead72efe4d0f970deed68fa03626c1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Hells=C3=A9n?= <tlovinator@gmail.com>
Date: Wed, 14 Dec 2022 23:57:36 +0100
Subject: [PATCH] Add DMs to /remind list

---
 discord_reminder_bot/create_pages.py | 9 +++------
 discord_reminder_bot/main.py         | 6 +++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/discord_reminder_bot/create_pages.py b/discord_reminder_bot/create_pages.py
index 5f0ba77..90620d3 100644
--- a/discord_reminder_bot/create_pages.py
+++ b/discord_reminder_bot/create_pages.py
@@ -25,10 +25,12 @@ def create_pages(ctx: CommandContext) -> list[Page]:
     jobs: List[Job] = scheduler.get_jobs()
     for job in jobs:
         channel_id = job.kwargs.get("channel_id")
+        guild_id = job.kwargs.get("guild_id")
+
         # Only add reminders from channels in the server we run "/reminder list" in
         # Check if channel is in the Discord server, if not, skip it.
         for channel in ctx.guild.channels:
-            if int(channel.id) == channel_id:
+            if int(channel.id) == channel_id or ctx.guild_id == guild_id:
                 if type(job.trigger) is DateTrigger:
                     # Get trigger time for normal reminders
                     trigger_time = job.trigger.run_date
@@ -107,11 +109,6 @@ def create_pages(ctx: CommandContext) -> list[Page]:
                         pause_or_unpause_button = pause_button
                     components.insert(1, pause_or_unpause_button)
 
-                # Only allow 25 pages
-                if len(pages) == 25:
-                    ctx.channel.send("I haven't added support for more than 25 reminders. Pull requests welcome 🙃")
-                    return pages
-
                 # Add a page to pages list
                 title = f"{message[:87]}..." if len(message) > 90 else message
                 pages.append(
diff --git a/discord_reminder_bot/main.py b/discord_reminder_bot/main.py
index 32e45e6..bec9d42 100644
--- a/discord_reminder_bot/main.py
+++ b/discord_reminder_bot/main.py
@@ -348,7 +348,7 @@ async def command_add(
                 run_date=run_date,
                 kwargs={
                     "user_id": int(send_dm_to_user.id),
-                    "guild_id": int(ctx.guild_id),
+                    "guild_id": ctx.guild_id,
                     "message": message_reason,
                 },
             )
@@ -570,7 +570,7 @@ async def remind_cron(
                 jitter=jitter,
                 kwargs={
                     "user_id": int(send_dm_to_user.id),
-                    "guild_id": int(ctx.guild_id),
+                    "guild_id": ctx.guild_id,
                     "message": message_reason,
                 },
             )
@@ -762,7 +762,7 @@ async def remind_interval(
                 jitter=jitter,
                 kwargs={
                     "user_id": int(send_dm_to_user.id),
-                    "guild_id": int(ctx.guild_id),
+                    "guild_id": ctx.guild_id,
                     "message": message_reason,
                 },
             )