feat(bot): fully implement dm tracking

GalvinPython · GalvinPython · commit 94c227d5b3e6 · 2025-09-08T11:58:11.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,16 +1,14 @@
-# Moving back to npm for package management rather than bun
-# because wow dependabot is so broken for it 😭
 # TODO: Labels on package updates after project restructure
 
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: "bun"
     directory: "/"
     schedule:
       interval: "weekly"
     target-branch: "dev"
 
-  - package-ecosystem: "npm"
+  - package-ecosystem: "bun"
     directory: "/web"
     schedule:
       interval: "weekly"
diff --git a/.gitignore b/.gitignore
@@ -11,4 +11,5 @@ target/
 *.sql
 dbtests.ts
 perftesting.ts
-drizzle/
+drizzle/
+fetchTest.ts
diff --git a/README.md b/README.md
@@ -96,17 +96,26 @@ These guidelines ensure predictable behavior and simplify error handling across
 > [!NOTE]
 > WIP update!
 
-### Bot
+### Fixes
 
 - Fixed the double notification bug
+
+### Changes
+
 - Moved to Postgres as our database engine
+
+### Features
+
 - Improved flow of `/track` command
   - Autocomplete for YouTube
   - Filter by videos, shorts and streams for YouTube!
+- `/tracked` is now improved and is an interactive embed!
+- Can now use search/autocomplete for `/track` for both YouTube and Twitch
 
-### API
+### Known Issues
 
-### Site
+- Twitch channel username doesn't show up in `/track`
+- Unable to subscribe to updates via the bot
 
 ## V1
 
@@ -115,7 +124,7 @@ These guidelines ensure predictable behavior and simplify error handling across
 - Added a new command! `/tracked` ([#50](https://github.com/GalvinPython/feedr/issues/50))
   - See all the tracked channels in your server
   - The channel you ran the command in will appear first as there is no option to only see the current channel for now
-- Locale improvments ([#43](https://github.com/GalvinPython/feedr/issues/43))
+- Locale improvements ([#43](https://github.com/GalvinPython/feedr/issues/43))
 
 ### 1.3.0
 
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "type": "module",
   "version": "2.0.0-dev",
   "devDependencies": {
-    "@types/bun": "1.2.10",
+    "@types/bun": "1.2.21",
     "@types/pg": "^8.11.14",
     "@typescript-eslint/eslint-plugin": "8.11.0",
     "@typescript-eslint/parser": "8.11.0",
diff --git a/src/commands.ts b/src/commands.ts
@@ -33,6 +33,8 @@ import search from "./utils/youtube/search";
 import {
     checkIfGuildIsTrackingUserAlready,
     discordAddGuildTrackingUser,
+    discordAddNewGuild,
+    discordCheckIfDmChannelExists,
     discordGetAllTrackedInGuild,
     discordRemoveGuildTrackingChannel,
 } from "./db/discord";
@@ -273,6 +275,8 @@ const commands: Record<string, Command> = {
             contexts: [0, 1],
         },
         execute: async (interaction: CommandInteraction) => {
+            const isDm = !interaction.inGuild();
+
             // Get the YouTube Channel ID
             const targetPlatform = (
                 interaction as ChatInputCommandInteraction
@@ -284,7 +288,7 @@ const commands: Record<string, Command> = {
             const discordChannelId =
                 (interaction.options.get("updates_channel")?.value as string) ??
                 interaction.channelId;
-            const guildId = interaction.guildId;
+            const guildId = isDm ? discordChannelId : interaction.guildId;
 
             // Log the autocomplete value
             console.log(`Autocomplete value: ${platformUserId}`);
@@ -316,33 +320,26 @@ const commands: Record<string, Command> = {
                 return;
             }
 
-            // TODO: Enable DMs :)
-            const isDm = interaction.channel?.isDMBased();
+            console.log(interaction.channelId);
 
-            if (!guildId || isDm || isDm === undefined) {
-                await interaction.reply({
-                    flags: MessageFlags.Ephemeral,
-                    content:
-                        "This command is not supported in DMs currently!\nNot a DM? Then the bot failed to get the guild info",
-                });
-
-                return;
-            }
+            if (isDm) console.log("DM");
 
             // TODO: Embed
             // Check the permissions of the user
-            if (
-                !interaction.memberPermissions?.has(
-                    PermissionFlagsBits.ManageChannels,
-                )
-            ) {
-                await interaction.reply({
-                    flags: MessageFlags.Ephemeral,
-                    content:
-                        "You do not have the permission to manage channels!",
-                });
+            if (!isDm) {
+                if (
+                    !interaction.memberPermissions?.has(
+                        PermissionFlagsBits.ManageChannels,
+                    )
+                ) {
+                    await interaction.reply({
+                        flags: MessageFlags.Ephemeral,
+                        content:
+                            "You do not have the permission to manage channels!",
+                    });
 
-                return;
+                    return;
+                }
             }
 
             // TODO: Embed
@@ -397,15 +394,30 @@ const commands: Record<string, Command> = {
 
                     return;
                 }
+            } else if (isDm) {
+                // DM channels don't need permission checks
             } else {
                 await interaction.reply({
                     flags: MessageFlags.Ephemeral,
-                    content: "The target channel is not a text channel!",
+                    content: `The target channel is not a text channel! ${isDm}`,
                 });
 
                 return;
             }
 
+            // Before attempting to add the subscription, if it's a DM, check if it's already in the database. If not add it
+            if (isDm) {
+                console.log("CHECKING DM");
+                const data = (
+                    await discordCheckIfDmChannelExists(discordChannelId)
+                ).data;
+
+                if (!data) {
+                    console.log("ADDING DM");
+                    await discordAddNewGuild(discordChannelId, true);
+                }
+            }
+
             switch (targetPlatform) {
                 case "youtube": {
                     const contentType = interaction.options.get("content_type")
@@ -571,7 +583,7 @@ const commands: Record<string, Command> = {
 
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,
-                            content: `Started tracking the channel ${youtubeChannelInfo?.channelName ?? platformUserId} in ${targetChannel.name}!`,
+                            content: `Started tracking the channel ${youtubeChannelInfo?.channelName ?? platformUserId} in <#${targetChannel?.id}>!`,
                         });
                     } else {
                         await interaction.reply({
@@ -698,7 +710,7 @@ const commands: Record<string, Command> = {
                     ) {
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,
-                            content: `Started tracking the streamer ${platformUserId} (${platformUserId}) in ${targetChannel.name}!`,
+                            content: `Started tracking the streamer ${platformUserId} (${platformUserId}) in <#${targetChannel?.id}>!`,
                         });
                     } else {
                         await interaction.reply({
@@ -819,24 +831,15 @@ const commands: Record<string, Command> = {
             contexts: [0, 1],
         },
         execute: async (interaction: CommandInteraction) => {
+            const isDm = !interaction.inGuild();
+
             // Get the YouTube Channel ID
             const platformUserId = interaction.options.get("user_id")
                 ?.value as string;
-            const guildId = interaction.guildId;
-
-            // DMs are currently not supported, so throw back an error
-            if (!guildId || interaction.channel?.isDMBased()) {
-                await interaction.reply({
-                    flags: MessageFlags.Ephemeral,
-                    content:
-                        "This command is not supported in DMs currently!\nNot a DM? Then an error has occurred :(",
-                });
-
-                return;
-            }
 
             // Check the permissions of the user
             if (
+                !isDm &&
                 !interaction.memberPermissions?.has(
                     PermissionFlagsBits.ManageChannels,
                 )
@@ -869,7 +872,7 @@ const commands: Record<string, Command> = {
         },
         autoComplete: async (interaction: AutocompleteInteraction) => {
             const trackedChannels = await discordGetAllTrackedInGuild(
-                interaction.guildId as string,
+                interaction.guildId ?? (interaction.channelId as string),
             );
 
             console.dir(
@@ -916,14 +919,16 @@ const commands: Record<string, Command> = {
             contexts: [0, 1],
         },
         execute: async (interaction: CommandInteraction) => {
-            const guildId = interaction.guildId;
-            const channelId = interaction.channelId;
+            let guildId = interaction.guildId;
+
+            const isDm = !interaction.inGuild();
 
-            if (!guildId || !channelId) {
+            if (isDm) guildId = interaction.channelId;
+
+            if (!guildId) {
                 await interaction.reply({
                     flags: MessageFlags.Ephemeral,
-                    content:
-                        "You are likely in a DM, this command is not supported in DMs!",
+                    content: "An error occurred! Please report",
                 });
 
                 return;
diff --git a/src/db/discord.ts b/src/db/discord.ts
@@ -376,3 +376,28 @@ export async function discordRemoveGuildFromTracking(
         return { success: false, data: [] };
     }
 }
+
+// Check if the DM channel is already in the "guilds" table
+export async function discordCheckIfDmChannelExists(
+    channelId: string,
+): Promise<{ success: boolean; data: (typeof dbDiscordTable.$inferSelect)[] }> {
+    console.log(`Checking if DM channel exists: ${channelId}`);
+
+    try {
+        const result = await db
+            .select()
+            .from(dbDiscordTable)
+            .where(
+                and(
+                    eq(dbDiscordTable.guildId, channelId),
+                    eq(dbDiscordTable.isDm, true),
+                ),
+            );
+
+        return { success: true, data: result };
+    } catch (error) {
+        console.error("Error checking if DM channel exists:", error);
+
+        return { success: false, data: [] };
+    }
+}
diff --git a/src/utils/discord/updateGuildsOnStartup.ts b/src/utils/discord/updateGuildsOnStartup.ts
@@ -31,7 +31,7 @@ export default async function () {
 
     // Find any guilds that are in the database but not in the current guilds
     const missingGuilds = data.filter(
-        (guild) => !currentGuilds.includes(guild.guildId),
+        (guild) => !currentGuilds.includes(guild.guildId) && !guild.isDm,
     );
 
     // Find any guilds that are in the current guilds but not in the database
diff --git a/src/utils/youtube/search.ts b/src/utils/youtube/search.ts
@@ -1,6 +1,6 @@
-import { config } from "../../config";
 import type { InnertubeSearchRequest } from "../../types/youtube";
 
+import { config } from "../../config";
 import formatLargeNumber from "../formatLargeNumber";
 
 export default async function (query: string) {
