chore: cleanup

Author: ToastedDev

src/events/ready.ts

@@ -2,13 +2,11 @@ import { Events } from "discord.js";
 import { CronJob } from "cron";
 
 import client from "../index";
-import {
-    fetchLatestUploads,
-    sendLatestUploads,
-} from "../utils/youtube/fetchLatestUploads";
 import { config } from "../config";
 // import { checkIfStreamersAreLive } from "../utils/twitch/checkIfStreamerIsLive";
 import { cronUpdateBotInfo } from "../utils/cronJobs";
+import sendLatestUploads from "../utils/youtube/sendLatestUploads";
+import fetchLatestUploads from "../utils/youtube/fetchLatestUploads";
 
 // Log into the bot
 client.once(Events.ClientReady, async (bot) => {

src/utils/youtube/fetchLatestUploads.ts

@@ -1,23 +1,20 @@
 import type { dbDiscordTable, dbYouTube } from "../../types/database";
 
-import { ChannelType, type TextChannel } from "discord.js";
-
 import { env } from "../../config";
 import { getGuildsTrackingChannel, updateVideoId } from "../database";
 import { dbYouTubeGetAllChannelsToTrack } from "../db/youtube";
-import client from "../..";
 
 import getChannelDetails from "./getChannelDetails";
 
-const updates = new Map<
+export const updates = new Map<
     string,
     {
         channelInfo: Awaited<ReturnType<typeof getChannelDetails>>;
         discordGuildsToUpdate: dbDiscordTable[];
     }
 >();
 
-export async function fetchLatestUploads() {
+export default async function fetchLatestUploads() {
     console.log("Fetching latest uploads...");
 
     const channels: dbYouTube[] | [] = await dbYouTubeGetAllChannelsToTrack();
@@ -152,46 +149,3 @@ export async function fetchLatestUploads() {
         }
     }
 }
-
-export async function sendLatestUploads() {
-    for (const [videoId, update] of updates.entries()) {
-        const channelInfo = update.channelInfo;
-        const discordGuildsToUpdate = update.discordGuildsToUpdate;
-
-        console.log("Discord guilds to update:", discordGuildsToUpdate);
-        for (const guild of discordGuildsToUpdate) {
-            try {
-                const channelObj = await client.channels.fetch(
-                    guild.guild_channel_id,
-                );
-
-                if (
-                    !channelObj ||
-                    (channelObj.type !== ChannelType.GuildText &&
-                        channelObj.type !== ChannelType.GuildAnnouncement)
-                ) {
-                    console.error(
-                        "Invalid channel or not a text channel in fetchLatestUploads",
-                    );
-                    continue;
-                }
-
-                await (channelObj as TextChannel).send({
-                    content:
-                        guild.guild_ping_role && channelInfo
-                            ? `<@&${guild.guild_ping_role}> New video uploaded for ${channelInfo?.channelName}! https://www.youtube.com/watch?v=${videoId}`
-                            : guild.guild_ping_role
-                              ? `<@&${guild.guild_ping_role}> New video uploaded! https://www.youtube.com/watch?v=${videoId}`
-                              : channelInfo
-                                ? `New video uploaded for ${channelInfo.channelName}! https://www.youtube.com/watch?v=${videoId}`
-                                : `New video uploaded! https://www.youtube.com/watch?v=${videoId}`,
-                });
-            } catch (error) {
-                console.error(
-                    "Error fetching or sending message to channel in fetchLatestUploads:",
-                    error,
-                );
-            }
-        }
-    }
-}

src/utils/youtube/sendLatestUploads.ts

@@ -0,0 +1,48 @@
+import { ChannelType, TextChannel } from "discord.js";
+
+import client from "../..";
+
+import { updates } from "./fetchLatestUploads";
+
+export default async function sendLatestUploads() {
+    for (const [videoId, update] of updates.entries()) {
+        const channelInfo = update.channelInfo;
+        const discordGuildsToUpdate = update.discordGuildsToUpdate;
+
+        console.log("Discord guilds to update:", discordGuildsToUpdate);
+        for (const guild of discordGuildsToUpdate) {
+            try {
+                const channelObj = await client.channels.fetch(
+                    guild.guild_channel_id,
+                );
+
+                if (
+                    !channelObj ||
+                    (channelObj.type !== ChannelType.GuildText &&
+                        channelObj.type !== ChannelType.GuildAnnouncement)
+                ) {
+                    console.error(
+                        "Invalid channel or not a text channel in fetchLatestUploads",
+                    );
+                    continue;
+                }
+
+                await (channelObj as TextChannel).send({
+                    content:
+                        guild.guild_ping_role && channelInfo
+                            ? `<@&${guild.guild_ping_role}> New video uploaded for ${channelInfo?.channelName}! https://www.youtube.com/watch?v=${videoId}`
+                            : guild.guild_ping_role
+                              ? `<@&${guild.guild_ping_role}> New video uploaded! https://www.youtube.com/watch?v=${videoId}`
+                              : channelInfo
+                                ? `New video uploaded for ${channelInfo.channelName}! https://www.youtube.com/watch?v=${videoId}`
+                                : `New video uploaded! https://www.youtube.com/watch?v=${videoId}`,
+                });
+            } catch (error) {
+                console.error(
+                    "Error fetching or sending message to channel in fetchLatestUploads:",
+                    error,
+                );
+            }
+        }
+    }
+}