mini changes to db

Author: GalvinPython

package.json

@@ -27,7 +27,10 @@
     "lint:fix": "eslint . --ext .ts -c .eslintrc.json --fix",
     "cargo:api:dev": "cd api && cargo watch -x \"run -- --dev\"",
     "web:dev": "concurrently --names \"WEB,API\" --prefix-colors \"blue,green\" \"cd web && bun dev\" \"cd api && cargo watch -x \\\"run -- --dev\\\"\"",
-    "web:build": "cd web && bun build"
+    "web:build": "cd web && bun build",
+    "start:api": "echo 'Cannot start API without cargo. Reserved for future use' && exit 1",
+    "start:bot": "bun run src/bot.ts",
+    "start:web": "cd web && bun start"
   },
   "dependencies": {
     "cron": "^4.3.0",

perftesting.ts

@@ -43,3 +43,5 @@ export default async function test(
 
 test("UC1234567890", PlaylistType.Video);
 
+// Crash the program
+process.exit(1);

src/commands.ts

@@ -232,7 +232,23 @@ const commands: Record<string, Command> = {
                 return;
             }
 
-            // DMs are currently not supported, so throw back an error
+            // TODO: Embed
+            // For YouTube: Check if the channel ID is in a valid format
+            if (
+                targetPlatform === "youtube" &&
+                (platformUserId.length !== 24 ||
+                    !platformUserId.startsWith("UC"))
+            ) {
+                await interaction.reply({
+                    flags: MessageFlags.Ephemeral,
+                    content:
+                        'Invalid YouTube channel ID format! Each channel ID should be 24 characters long and start with "UC". Need to find the channel ID? We have a guide here: https://github.com/GalvinPython/feedr/wiki/Guide:-How-to-get-the-YouTube-Channel-ID. If this was an issue with the autocomplete, please report it!',
+                });
+
+                return;
+            }
+
+            // TODO: Enable DMs :)
             if (!guildId || interaction.channel?.isDMBased()) {
                 await interaction.reply({
                     flags: MessageFlags.Ephemeral,
@@ -243,6 +259,7 @@ const commands: Record<string, Command> = {
                 return;
             }
 
+            // TODO: Embed
             // Check the permissions of the user
             if (
                 !interaction.memberPermissions?.has(
@@ -258,6 +275,7 @@ const commands: Record<string, Command> = {
                 return;
             }
 
+            // TODO: Embed
             // Check if the bot has the required permissions for the target channel
             const targetChannel = await client.channels.fetch(discordChannelId);
 

src/types/types.d.ts

@@ -0,0 +1,6 @@
+// Generalised types to be used throughout the bot if its not suitable in the other files
+
+export enum Platform {
+    YouTube = "youtube",
+    Twitch = "twitch",
+}

src/utils/db/discord.ts

@@ -0,0 +1,45 @@
+import { Platform } from "../../types/types";
+import { pool } from "../database";
+
+export async function checkIfGuildIsTrackingUserAlready(
+    platform: Platform,
+    userId: string,
+    guildId: string,
+): Promise<boolean> {
+    console.log(
+        `Checking if guild ${guildId} is tracking user ${userId} on platform ${platform}`,
+    );
+
+    let query: string | null = null;
+
+    if (platform === Platform.YouTube) {
+        query = `
+            SELECT * FROM guild_youtube_subscriptions
+            WHERE youtube_channel_id = ? AND guild_id = ?
+        `;
+    } else if (platform === Platform.Twitch) {
+        query = `
+            SELECT * FROM guild_twitch_subscriptions
+            WHERE twitch_user_id = ? AND guild_id = ?
+        `;
+    }
+
+    if (!query) {
+        console.error("Invalid platform provided for tracking check.");
+
+        return false;
+    }
+
+    try {
+        const client = await pool.connect();
+        const result = await client.query(query, [userId, guildId]);
+
+        client.release();
+
+        return result.rows.length > 0;
+    } catch (error) {
+        console.error("Error checking if guild is tracking user:", error);
+
+        return false;
+    }
+}

src/utils/quickEmbed.ts

@@ -1,4 +1,4 @@
-enum EmbedType {
+export enum EmbedType {
     Success = "success",
     Error = "error",
     Warning = "warning",