fixed sql

Author: GalvinPython

README.md

@@ -52,22 +52,24 @@ These rules are what to follow when working and developing on Feedr. There aren'
 
 ### Database Function Return Guidelines
 
-Each database function should **always** return a success indicator (`true`/`false`) along with associated data. To avoid confusion, here are the expected return types:
+Each database function (located in `/src/utils/db`) should **always** return a success indicator (`true`/`false`) along with associated data. To avoid confusion, here are the expected return types:
 
 - **Success with data:** `true` should always return populated data, even if the data is not used. For example:
-    ```ts
-    return { success: true, data: Data as Data };
-    ```
+
+  ```ts
+  return { success: true, data: Data as Data };
+  ```
 
 - **Success without data:** `true` can also indicate a successful operation where no data is returned. In this case, an empty array (`[]`) should be provided:
-    ```ts
-    return { success: true, data: [] };
-    ```
+
+  ```ts
+  return { success: true, data: [] };
+  ```
 
 - **Failure:** `false` should indicate an error or unsuccessful operation. This should always return an empty array (`[]`) to ensure consistency:
-    ```ts
-    return { success: false, data: [] };
-    ```
+  ```ts
+  return { success: false, data: [] };
+  ```
 
 These guidelines ensure predictable behavior and simplify error handling across the application.
 

src/commands.ts

@@ -372,10 +372,23 @@ const commands: Record<string, Command> = {
 
                     // Check if the channel is already being tracked in the guild
                     console.log(trackedChannels);
-                    if (trackedChannels) {
+                    if (!trackedChannels || !trackedChannels.success) {
+                        // TODO: Embed
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,
-                            content: `This channel is already being tracked in ${trackedChannels.map((channel, index) => `${index > 0 && index === trackedChannels.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
+                            content:
+                                "An error occurred while trying to check if the channel is already being tracked in this guild! Please report this error!",
+                        });
+
+                        return;
+                    } else if (
+                        trackedChannels.success &&
+                        trackedChannels.data
+                    ) {
+                        // If the channel is already being tracked in the guild, we can just return
+                        await interaction.reply({
+                            flags: MessageFlags.Ephemeral,
+                            content: `This channel is already being tracked in ${trackedChannels.data.map((channel, index) => `${index > 0 && index === trackedChannels.data.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
                         });
 
                         return;
@@ -423,6 +436,7 @@ const commands: Record<string, Command> = {
 
                     return;
                 }
+
                 case "twitch": {
                     // Check if the streamer exists by getting the ID
                     const streamerId = await getStreamerId(platformUserId);
@@ -436,13 +450,13 @@ const commands: Record<string, Command> = {
                         return;
                     }
 
+                    // Check if the channel is already being tracked in the guild
                     const trackedChannels =
                         await checkIfGuildIsTrackingUserAlready(
                             platformUserId,
                             guildId,
                         );
 
-                    // Check if the channel is already being tracked in the guild
                     if (trackedChannels.length) {
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,

src/utils/db/discord.ts

@@ -39,7 +39,7 @@ export async function checkIfGuildIsTrackingUserAlready(
         if (result.rows.length > 0) {
             return { success: true, data: result.rows };
         } else {
-            return { success: false, data: null };
+            return { success: true, data: null };
         }
     } catch (error) {
         console.error("Error checking if guild is tracking user:", error);

src/utils/db/youtube.ts

@@ -27,19 +27,26 @@ export async function dbYouTubeGetAllChannelsToTrack(): Promise<
 // These two functions are for checking/adding a new channel to the youtube table
 export async function checkIfChannelIsAlreadyTracked(
     channelId: string,
-): Promise<boolean> {
-    const query = `SELECT * FROM youtube WHERE youtube_channel_id = ?`;
+): Promise<{ success: boolean; data: dbYouTube[] | [] }> {
+    const query = `SELECT * FROM youtube WHERE youtube_channel_id = $1`;
 
     try {
         const client = await pool.connect();
         const result = await client.query(query, [channelId]);
 
-        return result.rows.length > 0;
+        client.release();
+
+        return {
+            success: true,
+            data: result.rows as dbYouTube[],
+        };
     } catch (err) {
         console.error("Error checking if channel is already tracked:", err);
 
-        // Return true if there's an error as we don't want to add the channel if we can't check it
-        return true;
+        return {
+            success: false,
+            data: [],
+        };
     }
 }