i forgot what my code does

Author: GalvinPython

new.dbml

@@ -60,11 +60,10 @@ Table twitch {
 }
 
 Table bot_info {
+  time datetime [not null, default: `now()`]
   guilds_total int [not null, default: 0]
   channels_tracked int [not null, default: 0]
   total_members int [not null, default: 0]
-  updated_at datetime [not null, default: `now()`]
-  extended_info_updated_at datetime [not null, default: `now()`]
 }
 
 Table bot_info_notifications {

src/utils/db/botinfo.ts

@@ -1,16 +1,20 @@
 import type { PoolClient, QueryResult } from "pg";
-import { pool } from "../database";
 import type { dbBotInfo } from "../../types/database";
 
+import { pool } from "../database";
+
 export async function updateBotInfo(
     guilds_total: number = 0,
     channels_tracked: number = 0,
     total_members: number = 0,
 ): Promise<void> {
     const query = `
-        UPDATE bot_info
-        SET guilds_total = $1, channels_tracked = $2, total_members = $3, updated_at = NOW()
-        WHERE locked_row = true;
+        INSERT INTO bot_info (guilds_total, channels_tracked, total_members, time)
+        VALUES ($1, $2, $3, NOW())
+        ON CONFLICT (time) DO UPDATE
+        SET guilds_total = EXCLUDED.guilds_total,
+            channels_tracked = EXCLUDED.channels_tracked,
+            total_members = EXCLUDED.total_members;
     `;
 
     try {

src/utils/db/cron.ts

@@ -0,0 +1,22 @@
+import { pool } from "../database";
+
+export async function cronUpdateTopChannels(): Promise<void> {
+    const query = `
+        TRUNCATE TABLE bot_info_top_channels;
+
+        INSERT INTO bot_info_top_channels (youtube_channel_id, guilds_tracking)
+        SELECT youtube_channel_id, COUNT(*) AS guilds_tracking
+        FROM guild_youtube_subscriptions
+        GROUP BY youtube_channel_id
+        ORDER BY guilds_tracking DESC;
+    `;
+
+    try {
+        const client = await pool.connect();
+
+        await client.query(query);
+        client.release();
+    } catch (error) {
+        console.error("Error updating top channels:", error);
+    }
+}

src/utils/db/init.ts

@@ -77,12 +77,10 @@ export default async function initTables(): Promise<boolean> {
 
     const createBotInfoTable = `
         CREATE TABLE IF NOT EXISTS bot_info (
-            locked_row BOOLEAN NOT NULL DEFAULT TRUE,
             guilds_total INTEGER NOT NULL DEFAULT 0,
             channels_tracked INTEGER NOT NULL DEFAULT 0,
             total_members INTEGER NOT NULL DEFAULT 0,
-            updated_at TIMESTAMP NOT NULL DEFAULT now(),
-            extended_info_updated_at TIMESTAMP NOT NULL DEFAULT now()
+            time TIMESTAMP NOT NULL DEFAULT now()
         );
     `;
 
@@ -128,7 +126,7 @@ export default async function initTables(): Promise<boolean> {
     `;
 
     const seedBotInfoTable = `
-        INSERT INTO bot_info (locked_row, guilds_total, channels_tracked, total_members) VALUES (true, 0, 0, 0)
+        INSERT INTO bot_info (time, guilds_total, channels_tracked, total_members) VALUES (now(), 0, 0, 0)
     `;
 
     try {

src/utils/db/youtube.ts

@@ -3,7 +3,7 @@ import type { dbYouTube } from "../../types/database";
 import { pool } from "../database";
 import getSinglePlaylistAndReturnVideoId, {
     PlaylistType,
-} from "../youtube/getSinglePlaylistAndReturnVideoId";
+} from "../youtube/getSinglePlaylistAndReturnVideoData";
 
 export async function dbYouTubeGetAllChannelsToTrack(): Promise<
     dbYouTube[] | []
@@ -38,7 +38,8 @@ export async function checkIfChannelIsAlreadyTracked(
     } catch (err) {
         console.error("Error checking if channel is already tracked:", err);
 
-        return false;
+        // Return true if there's an error as we don't want to add the channel if we can't check it
+        return true;
     }
 }
 
@@ -61,16 +62,19 @@ export async function addNewChannelToTrack(
         PlaylistType.Stream,
     );
 
-    const query = `INSERT INTO youtube (youtube_channel_id, latest_video_id, latest_short_id, latest_stream_id) VALUES (?, ?, ?, ?)`;
+    const query = `INSERT INTO youtube (youtube_channel_id, latest_video_id_updated, latest_video_id, latest_short_id, latest_short_id_updated, latest_stream_id, latest_stream_id_updated) VALUES (?, ?, ?, ?, ?, ?, ?)`;
 
     try {
         const client = await pool.connect();
 
         await client.query(query, [
             channelId,
-            longId || null,
-            shortId || null,
-            liveId || null,
+            longId?.videoId || null,
+            longId?.datePublished || null,
+            shortId?.videoId || null,
+            shortId?.datePublished || null,
+            liveId?.videoId || null,
+            liveId?.datePublished || null,
         ]);
 
         return true;

src/utils/migratedb.ts

@@ -122,8 +122,8 @@ if (botInfoData.length > 0) {
 
     await client.query(
         `
-    INSERT INTO bot_info (guilds_total, channels_tracked, total_members, updated_at, extended_info_updated_at)
-    VALUES ($1, 0, $2, now(), now())
+    INSERT INTO bot_info (guilds_total, channels_tracked, total_members, time)
+    VALUES ($1, 0, $2, now())
   `,
         [row.total_servers, row.total_members],
     );

src/utils/youtube/getSinglePlaylistAndReturnVideoId.ts renamed to src/utils/youtube/getSinglePlaylistAndReturnVideoData.ts

@@ -17,7 +17,7 @@ const playlistIdPrefixes: Record<PlaylistType, string> = {
 export default async function (
     channelId: string,
     playlistType?: PlaylistType,
-): Promise<string | null> {
+): Promise<{ videoId: string; datePublished: Date } | null> {
     const playlistIdPrefix = !playlistType
         ? "UU"
         : playlistIdPrefixes[playlistType];
@@ -43,5 +43,8 @@ export default async function (
     }
 
     // Yes this does actually return the video ID, you'll be surprised how weird YouTube's API is
-    return atob(json.items[0].id).split(".")[1];
+    return {
+        videoId: atob(json.items[0].id).split(".")[1],
+        datePublished: new Date(json.items[0].snippet.publishedAt),
+    };
 }