chore(bot): continue db migration

Author: GalvinPython

.gitignore

@@ -10,4 +10,5 @@ target/
 *.sqlite
 *.sqlite3*
 *.sql
-dbtests.ts
+dbtests.ts
+perftesting.ts

src/commands.ts

@@ -15,9 +15,7 @@ import { PermissionFlagsBits } from "discord-api-types/v8";
 
 import checkIfChannelIdIsValid from "./utils/youtube/checkIfChannelIdIsValid";
 import {
-    addNewChannelToTrack,
     addNewGuildToTrackChannel,
-    checkIfChannelIsAlreadyTracked,
     checkIfGuildIsTrackingChannelAlready,
     getAllTrackedInGuild,
     stopGuildTrackingChannel,
@@ -30,6 +28,10 @@ import {
 import getChannelDetails from "./utils/youtube/getChannelDetails";
 import { getStreamerId } from "./utils/twitch/getStreamerId";
 import { checkIfStreamerIsLive } from "./utils/twitch/checkIfStreamerIsLive";
+import {
+    checkIfChannelIsAlreadyTracked,
+    addNewChannelToTrack,
+} from "./utils/db/youtube";
 
 import client from ".";
 

src/types/innertube.d.ts renamed to src/types/youtube.d.ts

@@ -1,3 +1,60 @@
+export interface YouTubePlaylistResponse {
+    kind: string;
+    etag: string;
+    nextPageToken: string;
+    items: Array<{
+        kind: string;
+        etag: string;
+        id: string;
+        snippet: {
+            publishedAt: string;
+            channelId: string;
+            title: string;
+            description: string;
+            thumbnails: {
+                default: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                medium: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                high: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                standard: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                maxres: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+            };
+            channelTitle: string;
+            playlistId: string;
+            position: number;
+            resourceId: {
+                kind: string;
+                videoId: string;
+            };
+            videoOwnerChannelTitle: string;
+            videoOwnerChannelId: string;
+        };
+    }>;
+    pageInfo: {
+        totalResults: number;
+        resultsPerPage: number;
+    };
+}
+
 export interface InnertubeSearchRequest {
     contents: {
         twoColumnSearchResultsRenderer: {

src/utils/database.ts

@@ -27,51 +27,6 @@ export const pool: Pool = new Pool({
 });
 
 // #region YouTube
-// These two functions are for checking/adding a new channel to the youtube table
-export async function checkIfChannelIsAlreadyTracked(channelId: string) {
-    const query = `SELECT * FROM youtube WHERE youtube_channel_id = ?`;
-
-    try {
-        const statement = db.prepare(query);
-        const result = statement.all(channelId);
-
-        return result.length > 0;
-    } catch (err) {
-        console.error("Error checking if channel is already tracked:", err);
-        throw err;
-    }
-}
-
-export async function addNewChannelToTrack(channelId: string) {
-    console.log("Adding channel to track:", channelId);
-    const res = await fetch(
-        `https://youtube.googleapis.com/youtube/v3/playlists?part=snippet&id=${channelId.replace("UC", "UU")}&key=${env.youtubeApiKey}`,
-    );
-
-    if (!res.ok) {
-        return false;
-    }
-
-    const data = await res.json();
-    const videoId =
-        data.items?.[0]?.snippet?.thumbnails?.default?.url?.split("/")[4] ||
-        null;
-
-    const query = `INSERT INTO youtube (youtube_channel_id, latest_video_id) VALUES (?, ?)`;
-
-    try {
-        const statement = db.prepare(query);
-
-        statement.run(channelId, videoId);
-
-        return true;
-    } catch (err) {
-        console.error("Error adding channel to track:", err);
-
-        return false;
-    }
-}
-
 export async function checkIfGuildIsTrackingChannelAlready(
     channelId: string,
     guild_id: string,

src/utils/db/init.ts

@@ -5,7 +5,8 @@ export default async function initTables(): Promise<boolean> {
         CREATE TABLE IF NOT EXISTS discord (
             guild_id TEXT PRIMARY KEY,
             is_dm BOOLEAN NOT NULL DEFAULT FALSE,
-            allowed_public_sharing BOOLEAN NOT NULL DEFAULT FALSE
+            allowed_public_sharing BOOLEAN NOT NULL DEFAULT FALSE,
+            feedr_updates_channel_id TEXT
         );
     `;
 

src/utils/db/youtube.ts

@@ -1,6 +1,9 @@
 import type { dbYouTube } from "../../types/database";
 
 import { pool } from "../database";
+import getSinglePlaylistAndReturnVideoId, {
+    PlaylistType,
+} from "../youtube/getSinglePlaylistAndReturnVideoId";
 
 export async function dbYouTubeGetAllChannelsToTrack(): Promise<
     dbYouTube[] | []
@@ -20,3 +23,60 @@ export async function dbYouTubeGetAllChannelsToTrack(): Promise<
         return [];
     }
 }
+
+// These two functions are for checking/adding a new channel to the youtube table
+export async function checkIfChannelIsAlreadyTracked(
+    channelId: string,
+): Promise<boolean> {
+    const query = `SELECT * FROM youtube WHERE youtube_channel_id = ?`;
+
+    try {
+        const client = await pool.connect();
+        const result = await client.query(query, [channelId]);
+
+        return result.rows.length > 0;
+    } catch (err) {
+        console.error("Error checking if channel is already tracked:", err);
+
+        return false;
+    }
+}
+
+// Before adding a new channel, we need to get the latest video, short and stream ID
+export async function addNewChannelToTrack(
+    channelId: string,
+): Promise<boolean> {
+    console.log("Adding channel to track:", channelId);
+
+    const longId = await getSinglePlaylistAndReturnVideoId(
+        channelId,
+        PlaylistType.Video,
+    );
+    const shortId = await getSinglePlaylistAndReturnVideoId(
+        channelId,
+        PlaylistType.Short,
+    );
+    const liveId = await getSinglePlaylistAndReturnVideoId(
+        channelId,
+        PlaylistType.Stream,
+    );
+
+    const query = `INSERT INTO youtube (youtube_channel_id, latest_video_id, latest_short_id, latest_stream_id) VALUES (?, ?, ?, ?)`;
+
+    try {
+        const client = await pool.connect();
+
+        await client.query(query, [
+            channelId,
+            longId || null,
+            shortId || null,
+            liveId || null,
+        ]);
+
+        return true;
+    } catch (err) {
+        console.error("Error adding channel to track:", err);
+
+        return false;
+    }
+}

src/utils/youtube/getSinglePlaylistAndReturnVideoId.ts

@@ -0,0 +1,47 @@
+import type { YouTubePlaylistResponse } from "../../types/youtube";
+
+import { env } from "../../config";
+
+export enum PlaylistType {
+    Video = "video",
+    Short = "short",
+    Stream = "stream",
+}
+
+const playlistIdPrefixes: Record<PlaylistType, string> = {
+    [PlaylistType.Video]: "UULF",
+    [PlaylistType.Short]: "UUSH",
+    [PlaylistType.Stream]: "UULV",
+};
+
+export default async function (
+    channelId: string,
+    playlistType?: PlaylistType,
+): Promise<string | null> {
+    const playlistIdPrefix = !playlistType
+        ? "UU"
+        : playlistIdPrefixes[playlistType];
+
+    if (!channelId.startsWith("UC")) {
+        return null;
+    }
+
+    const playlistId = playlistIdPrefix + channelId.slice(2);
+
+    const res = await fetch(
+        `https://youtube.googleapis.com/youtube/v3/playlists?part=snippet&id=${playlistId}&key=${env.youtubeApiKey}`,
+    );
+
+    if (!res.ok) {
+        return null;
+    }
+
+    const json = (await res.json()) as YouTubePlaylistResponse;
+
+    if (!json.items || json.items.length === 0) {
+        return null;
+    }
+
+    // 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];
+}

src/utils/youtube/search.ts

@@ -1,5 +1,5 @@
 // NOTE: Experimental
-import type { InnertubeSearchRequest } from "../../types/innertube";
+import type { InnertubeSearchRequest } from "../../types/youtube";
 
 export default async function (query: string) {
     try {