Merge branch 'dev' into dependabot/bun/dev/discord.js-14.22.1

Author: GalvinPython

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Galvin
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

Makefile

@@ -1,10 +1,10 @@
 # Just to make life a bit easier :P
 
 setup:
-	./scripts/setup.sh
+	bash ./scripts/setup.sh
 
 delete:
-	./scripts/setup_delete.sh
+	bash ./scripts/setup_delete.sh
 
 update:
-	./scripts/update.sh
+	bash ./scripts/update.sh

package.json

@@ -2,7 +2,7 @@
   "name": "feedr",
   "module": "src/index.ts",
   "type": "module",
-  "version": "2.0.0-dev",
+  "version": "2.0.0-hotfix.1",
   "devDependencies": {
     "@types/bun": "1.2.21",
     "@types/pg": "^8.11.14",

scripts/setup.sh

@@ -32,8 +32,8 @@ Description=Feedr Bot Service
 After=network.target
 
 [Service]
-WorkingDirectory=${WORKDIR}/src
-ExecStart=${BUN_PATH} run index.ts
+WorkingDirectory=${WORKDIR}
+ExecStart=${BUN_PATH} run src/index.ts
 Restart=on-failure
 User=$USER
 Environment=NODE_ENV=production

src/events/ready.ts

@@ -18,6 +18,10 @@ client.once(Events.ClientReady, async (bot) => {
     //     await cronUpdateBotInfo();
     // }).start();
 
+    console.log(
+        `Setting intervals: YouTube - ${config.updateIntervalYouTube}ms, Twitch - ${config.updateIntervalTwitch}ms`,
+    );
+
     fetchLatestUploads();
     setInterval(fetchLatestUploads, config.updateIntervalYouTube as number);
 

src/utils/youtube/fetchLatestUploads.ts

@@ -79,19 +79,26 @@ export default async function fetchLatestUploads() {
             const videoId =
                 playlist.snippet.thumbnails.default.url.split("/")[4];
 
+            if (!channelDict[channelId]) {
+                console.error(
+                    "Channel ID not found in channelDict:",
+                    channelId,
+                );
+                continue;
+            }
+
             const requiresUpdate =
                 channelDict[channelId].latestAllId !== videoId;
 
-            console.log(
-                "Channel ID:",
-                channelId,
-                "Video ID:",
-                videoId,
-                "Requires update?",
-                requiresUpdate,
-            );
-
             if (requiresUpdate) {
+                console.log(
+                    "Channel ID:",
+                    channelId,
+                    "Video ID:",
+                    videoId,
+                    "Requires update?",
+                    requiresUpdate,
+                );
                 const [longVideoId, shortVideoId, streamVideoId] =
                     await Promise.all([
                         getSinglePlaylistAndReturnVideoData(
@@ -117,15 +124,26 @@ export default async function fetchLatestUploads() {
 
                 let contentType: PlaylistType | null = null;
 
+                if (videoId == longVideoId.videoId) {
+                    contentType = PlaylistType.Video;
+                } else if (videoId == shortVideoId.videoId) {
+                    contentType = PlaylistType.Short;
+                } else if (videoId == streamVideoId.videoId) {
+                    contentType = PlaylistType.Stream;
+                } else {
+                    console.error(
+                        "Video ID does not match any fetched video IDs for channel",
+                        channelId,
+                    );
+                }
+
                 const videoIdMap = {
                     [PlaylistType.Video]: longVideoId,
                     [PlaylistType.Short]: shortVideoId,
                     [PlaylistType.Stream]: streamVideoId,
                 };
 
-                contentType = Object.entries(videoIdMap).find(
-                    ([, id]) => id,
-                )?.[0] as PlaylistType | null;
+                console.log("Determined content type:", contentType);
 
                 if (contentType) {
                     console.log(