adding message support

dorasto · Jul 23, 2024 · 296830d · 296830d
1 parent 6cd78d2
commit 296830d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/commands/add.ts b/commands/add.ts
@@ -32,6 +32,12 @@ export default {
         .addRoleOption((option) =>
             option.setName("mention").setDescription("Role to notify")
         )
+        .addStringOption((option) =>
+            option
+                .setName("message")
+                .setDescription("Message to send")
+                .setRequired(false)
+        )
         .addBooleanOption((option) =>
             option
                 .setName("keep_vod")
@@ -48,6 +54,7 @@ export default {
             const channel = inter.options.getChannel("channel");
             const keep_vod = inter.options.getBoolean("keep_vod");
             const mention = inter.options.getRole("mention");
+            const message = inter.options.getString("message");
             try {
                 const dataLiveReq = await fetch(
                     process.env.API_SERVER + "/v2/live/twitch/" + username,
@@ -99,9 +106,9 @@ export default {
                     channel: channel?.id || "",
                     server: inter.guild?.id || "",
                     account: inter.user.id,
-                    message: data.id,
                     keep_vod: keep_vod || false,
                     mention: mention?.id || null,
+                    message: message || null,
                 });
             } catch (error) {
                 console.error("Error executing add command: ", error);

diff --git a/db/schema.ts b/db/schema.ts
@@ -34,4 +34,5 @@ export const discordBotTwitch = pgTable("discord_bot_twitch", {
     social_links: boolean("social_links").default(false).notNull(),
     keep_vod: boolean("keep_vod").default(false).notNull(),
     mention: text("mention"),
+    message: text("message"),
 });
diff --git a/events/interactionCreate.ts b/events/interactionCreate.ts
@@ -34,6 +34,7 @@ discord.on(
                                 social_links: false,
                                 keep_vod: data.keep_vod || false,
                                 mention: data.mention || null,
+                                message: data.message || null,
                             })
                             .returning();
                         if (!dataDB) {

diff --git a/index.ts b/index.ts
@@ -46,6 +46,7 @@ discord.on(Events.ClientReady, async () => {
     console_log.colour(discord?.user?.username + " bot is ready", "green");
     await registerSlashCommands();
     setInterval(timeCheck, 1000);
+    TwitchEmbedLoop();
 });
 import "./events/interactionCreate";
 function timeCheck() {
@@ -141,10 +142,10 @@ const twitchLiveEmbeds = async (item: ITwitch, index: number) => {
             .setLabel("Watch Stream")
             .setStyle(ButtonStyle.Link)
             .setURL(`https://www.twitch.tv/${item.username.toLowerCase()}`);
-        let buttonLinks = new ButtonBuilder()
-            .setLabel("Social Links")
-            .setStyle(ButtonStyle.Link)
-            .setURL("https://doras.to/trent");
+        // let buttonLinks = new ButtonBuilder()
+        //     .setLabel("Social Links")
+        //     .setStyle(ButtonStyle.Link)
+        //     .setURL("https://doras.to");
         let row: any = new ActionRowBuilder().addComponents(buttonWatch);
         if (!dataLive.live) {
             buttonWatch.setLabel("Watch Vod");
@@ -184,7 +185,7 @@ const twitchLiveEmbeds = async (item: ITwitch, index: number) => {
             return;
         }
         if (!channel.isTextBased()) return;
-        if (item.social_links) row.addComponents(buttonLinks);
+        // if (item.social_links) row.addComponents(buttonLinks);
         let mention: any =
             item.mention && discordServer.roles.cache.get(item.mention);
         if (
@@ -193,7 +194,8 @@ const twitchLiveEmbeds = async (item: ITwitch, index: number) => {
         ) {
             mention = mention.name;
         } else {
-            mention = mention ? `<@&${item.mention}>` : "";
+            const message = item.message ? item.message : "";
+            mention = mention ? `<@&${item.mention}> ${message}` : message;
         }
         if (!item.message_id) {
             const message = await channel.send({