Fixed youtube notification settings for setting and validation.

jesperrichert · jesperrichert · commit c263cb0d78e5 · 2026-05-31T13:28:31.000+02:00
diff --git a/bun.lock b/bun.lock
diff --git a/src/modules/notification/buttons/youtube-manage.ts b/src/modules/notification/buttons/youtube-manage.ts
@@ -13,7 +13,7 @@ import Parser from "rss-parser";
 import {database} from "../../../main/database.js";
 import {sendDefaultMessage} from "../../../helper/utilityHelper.js";
 import {convertToEmojiToPng} from "../../../helper/emojis.js";
-import {PaginationData} from "../../../types/Pagination.js";
+import type {PaginationData} from "../../../types/Pagination.js";
 import {PaginationBuilder} from "../../../helper/paginationHelper.js";
 
 export default {
@@ -25,76 +25,68 @@ export default {
      * @param {ExtendedClient} client
      */
     async execute(interaction: ButtonInteraction, client: ExtendedClient) {
+        const parser = new Parser();
         const [action, uuid, currentIndexStr] = interaction.customId.split(":");
+        // @ts-ignore
         const currentIndex = parseInt(currentIndexStr) || 0;
         const guildId = interaction.guild?.id;
         const pageSize = 5;
 
-        try {
-            const data = await database.guildYoutubeNotifications
-                .findMany({
-                    where: {
-                        GuildId: guildId
-                    }
-                })
+        const data = await database.guildYoutubeNotifications
+            .findMany({
+                where: {
+                    GuildId: guildId
+                }
+            })
 
-            if (!data.length) {
-                return await sendDefaultMessage(`## ${await convertToEmojiToPng("error")} No Twitch Streamer Found`, interaction, true)
-            }
-
-            const list = data.slice(currentIndex, currentIndex + pageSize);
-
-            const embedMessages = new TextDisplayBuilder()
-                .setContent((await Promise.all(list.map(async (l) => {
+        if (!data.length) {
+            return await sendDefaultMessage(`## ${await convertToEmojiToPng("error")} No Youtube Channel Found`, interaction, true)
+        }
 
-                    const parser = new Parser();
-                    const videodata = await parser.parseURL(
-                        `https://www.youtube.com/feeds/videos.xml?channel_id=${l.YoutubeChannelId}`
-                    );
-                    const {author} = videodata.items[0];
+        const list = data.slice(currentIndex, currentIndex + pageSize);
 
-                    return `**Youtube Channel**: ${author} (${l.YoutubeChannelId})\n**Channel Name:** ${l.ChannelId ? `<#${l.ChannelId}>` : "N/A"}\n**UUID:** ${l.UUID}`
-                }))).join("\n\n"))
+        const embedMessages = new TextDisplayBuilder()
+            .setContent((await Promise.all(list.map(async (l) => {
+                const videoData = await parser.parseURL(
+                    `https://www.youtube.com/feeds/videos.xml?channel_id=${l.YoutubeChannelId}`
+                );
+                // @ts-ignore
+                const {author} = videoData.items[0];
 
+                return `**Youtube Channel**: ${author} (${l.YoutubeChannelId})\n**Channel Name:** ${l.ChannelId ? `<#${l.ChannelId}>` : "N/A"}\n**UUID:** ${l.UUID}`
+            }))).join("\n\n"))
 
-            const selectMenu = new StringSelectMenuBuilder()
-                .setCustomId("youtube-manage-select")
-                .setPlaceholder("Select a Option to manage")
-                .addOptions(await Promise.all(list.map(async (l) => {
 
-                    const parser = new Parser();
-                    const videodata = await parser.parseURL(
-                        `https://www.youtube.com/feeds/videos.xml?channel_id=${l.YoutubeChannelId}`
-                    );
-                    const {author} = videodata.items[0];
+        const selectMenu = new StringSelectMenuBuilder()
+            .setCustomId("youtube-manage-select")
+            .setPlaceholder("Select a Option to manage")
+            .addOptions(await Promise.all(list.map(async (l) => {
+                const videoData = await parser.parseURL(
+                    `https://www.youtube.com/feeds/videos.xml?channel_id=${l.YoutubeChannelId}`
+                );
+                // @ts-ignore
+                const {author} = videoData.items[0];
 
-                    return {
-                        label: `${author} (${l.YoutubeChannelId})`,
-                        description: `UUID: ${l.UUID}`,
-                        value: l.UUID,
-                        emoji: "<:youtube:1432486146868510720>",
-                    }
-                })));
+                return {
+                    label: `${author} (${l.YoutubeChannelId})`,
+                    description: `UUID: ${l.UUID}`,
+                    value: l.UUID,
+                    emoji: "<:youtube:1432486146868510720>",
+                }
+            })));
 
-            const paginationData: PaginationData = {
-                interaction: interaction,
-                paginationData: data,
-                buttonCustomId: "youtube-manage:",
-                selectmenu: selectMenu,
-                content: embedMessages,
-                pageSize: pageSize,
-                client: client,
-                currentIndex: currentIndex,
-                latestUUID: uuid
-            };
-            await PaginationBuilder(paginationData);
-        } catch (error) {
-            console.error("Error:", error);
-            await interaction.reply({
-                content:
-                    "## An error occurred while fetching the menus. Please try again later",
-                flags: MessageFlags.Ephemeral
-            });
-        }
+        const paginationData: PaginationData = {
+            interaction: interaction,
+            paginationData: data,
+            buttonCustomId: "youtube-manage:",
+            selectmenu: selectMenu,
+            content: embedMessages,
+            pageSize: pageSize,
+            client: client,
+            currentIndex: currentIndex,
+            // @ts-ignore
+            latestUUID: uuid
+        };
+        await PaginationBuilder(paginationData);
     }
 };
diff --git a/src/modules/notification/modals/youtube-add-channelid-modal.ts b/src/modules/notification/modals/youtube-add-channelid-modal.ts
@@ -18,6 +18,7 @@ import {convertToEmojiToPng} from "../../../helper/emojis.js";
 import {database} from "../../../main/database.js";
 import {randomUUID} from "crypto";
 import {sendDefaultMessage} from "../../../helper/utilityHelper.js";
+import Parser from "rss-parser";
 
 export default {
     id: "youtube-add-channelid-modal",
@@ -33,14 +34,25 @@ export default {
 
         const uuids = randomUUID();
 
-        const getChannelName = interaction.fields.getTextInputValue(
+        const youtubeChannelId = interaction.fields.getTextInputValue(
             "channelid"
         );
 
+        try {
+            const parser = new Parser()
+            const videoData = await parser.parseURL(
+                `https://www.youtube.com/feeds/videos.xml?channel_id=${youtubeChannelId}`
+            );
+            // @ts-ignore
+            const {author} = videoData.items[0];
+        } catch (e) {
+            return await sendDefaultMessage(`## ${await convertToEmojiToPng("error")} No Youtube Channel found with this ID!`, interaction, true)
+        }
+
         const data = await database.guildYoutubeNotifications.findFirst({
             where: {
                 GuildId: interaction.guild?.id,
-                YoutubeChannelId: getChannelName
+                YoutubeChannelId: youtubeChannelId
             }
         });
 
@@ -55,7 +67,7 @@ export default {
                         GuildId: interaction.guild?.id
                     }
                 },
-                YoutubeChannelId: getChannelName,
+                YoutubeChannelId: youtubeChannelId,
                 ChannelId: "",
                 MessageTemplateId: "",
                 PingRoles: [],
@@ -82,7 +94,7 @@ export default {
                         ChannelType.GuildAnnouncement
                     )
                     .setCustomId(
-                        "youtube-add-channel:" + interaction.customId.split(":")[1]
+                        "youtube-add-channel:" + uuids
                     )
                     .setMaxValues(1)
                     .setMinValues(1)
@@ -92,7 +104,7 @@ export default {
         const message = new ActionRowBuilder<ButtonBuilder>().addComponents(
             new ButtonBuilder()
                 .setCustomId(
-                    "youtube-add-message:" + interaction.customId.split(":")[1]
+                    "youtube-add-message:" + uuids
                 )
                 .setStyle(ButtonStyle.Secondary)
                 .setLabel("Message Template")
diff --git a/src/modules/notification/modals/youtube-add-message-modal.ts b/src/modules/notification/modals/youtube-add-message-modal.ts
@@ -33,6 +33,7 @@ export default {
         await database.guildYoutubeNotifications.update(
             {
                 where: {
+                    GuildId: interaction.guild.id,
                     UUID: interaction.customId.split(":")[1]
                 },
                 data: {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ export default {`
`33`	`33`	`await database.guildYoutubeNotifications.update(`
`34`	`34`	`{`
`35`	`35`	`where: {`
	`36`	`+ GuildId: interaction.guild.id,`
`36`	`37`	`UUID: interaction.customId.split(":")[1]`
`37`	`38`	`},`
`38`	`39`	`data: {`