From b45bc31997c5810d60474bf57a6c8d25b29e992e Mon Sep 17 00:00:00 2001
From: toast-ts <96593068+toast-ts@users.noreply.github.com>
Date: Wed, 27 Dec 2023 11:21:30 +1100
Subject: [PATCH] Move stuff inside the for loop

---
 src/modules/YTModule.ts | 60 ++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/modules/YTModule.ts b/src/modules/YTModule.ts
index 8afdd51..d070773 100644
--- a/src/modules/YTModule.ts
+++ b/src/modules/YTModule.ts
@@ -9,42 +9,42 @@ export default async(client:TClient)=>{
   let Data:any;
   const cacheExpiry:number = 7200; // Invalidate cache after sitting in Redis for 2 hours
 
-  let YTChannelID:string;
-  let YTChannelName:string;
-  let DiscordChannelID:string;
-  let DiscordRoleID:string;
-
   const YTDB = await client.ytChannels.getChannels();
   for (const channel of YTDB) {
+    let YTChannelID:string;
+    let YTChannelName:string;
+    let DiscordChannelID:string;
+    let DiscordRoleID:string;
+
     YTChannelID = channel.dataValues.ytchannel;
     DiscordChannelID = channel.dataValues.dcchannel;
     DiscordRoleID = channel.dataValues.dcrole;
-  };
 
-  try {
-    await Undici.request(`https://youtube.googleapis.com/youtube/v3/activities?part=snippet&channelId=${YTChannelID}&maxResults=2&key=${(await TSClient()).youtube}`, {
-      signal: AbortSignal.timeout(10000),
-      headers: {'User-Agent':`${client.user.username} - YTModule/undici`},
-    }).then(async resp=>Data = await resp.body.json());
-    YTChannelName = Data.items[0].snippet.channelTitle;
-  } catch {
-    Logger.console('log', 'YTModule', `Failed to get video data for "${YTChannelName}" from YouTube API`);
-  }
-  if (!Data) return;
+    try {
+      await Undici.request(`https://youtube.googleapis.com/youtube/v3/activities?part=snippet&channelId=${YTChannelID}&maxResults=2&key=${(await TSClient()).youtube}`, {
+        signal: AbortSignal.timeout(10000),
+        headers: {'User-Agent':`${client.user.username} - YTModule/undici`},
+      }).then(async resp=>Data = await resp.body.json());
+      YTChannelName = Data.items[0].snippet.channelTitle;
+    } catch {
+      Logger.console('log', 'YTModule', `Failed to get video data for "${YTChannelName}" from YouTube API`);
+    }
+    if (!Data) return;
 
-  const getVideoId = (index:number)=>Data.items[index].snippet.thumbnails.default.url.split('/')[4];
-  const videoUrl = `https://www.youtube.com/watch?v=${getVideoId(0)}`;
-  const cacheKey = `YTCache:${YTChannelID}`;
-  const cachedVideoId = await CacheServer.get(cacheKey, false);
-  if (!cachedVideoId) {
-    await CacheServer.set(cacheKey, getVideoId(0), false).then(async()=>await CacheServer.expiry(cacheKey, cacheExpiry));
-    return;
-  }
-  if (getVideoId(1) === cachedVideoId) {
-    await CacheServer.delete(cacheKey).then(async()=>await CacheServer.set(cacheKey, getVideoId(0), false).then(async()=>await CacheServer.expiry(cacheKey, cacheExpiry)));
+    const getVideoId = (index:number)=>Data.items[index].snippet.thumbnails.default.url.split('/')[4];
+    const videoUrl = `https://www.youtube.com/watch?v=${getVideoId(0)}`;
+    const cacheKey = `YTCache:${YTChannelID}`;
+    const cachedVideoId = await CacheServer.get(cacheKey, false);
+    if (!cachedVideoId) {
+      await CacheServer.set(cacheKey, getVideoId(0), false).then(async()=>await CacheServer.expiry(cacheKey, cacheExpiry));
+      return;
+    }
+    if (getVideoId(1) === cachedVideoId) {
+      await CacheServer.delete(cacheKey).then(async()=>await CacheServer.set(cacheKey, getVideoId(0), false).then(async()=>await CacheServer.expiry(cacheKey, cacheExpiry)));
 
-    (client.channels.resolve(DiscordChannelID) as TextChannel).send({
-      content: `${MessageTool.formatMention(DiscordRoleID, 'role')}\n**${YTChannelName}** just uploaded a video!\n${videoUrl}`, allowedMentions: {parse: ['roles']},
-    });
+      (client.channels.resolve(DiscordChannelID) as TextChannel).send({
+        content: `${MessageTool.formatMention(DiscordRoleID, 'role')}\n**${YTChannelName}** just uploaded a video!\n${videoUrl}`, allowedMentions: {parse: ['roles']},
+      });
+    }
   }
-}
+};