Merge branch 'dev' into feat/site

Author: GalvinPython

.gitignore

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

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/commands.ts

@@ -15,21 +15,22 @@ import { PermissionFlagsBits } from "discord-api-types/v8";
 
 import checkIfChannelIdIsValid from "./utils/youtube/checkIfChannelIdIsValid";
 import {
-    addNewChannelToTrack,
     addNewGuildToTrackChannel,
-    checkIfChannelIsAlreadyTracked,
     checkIfGuildIsTrackingChannelAlready,
     getAllTrackedInGuild,
     stopGuildTrackingChannel,
     twitchAddNewChannelToTrack,
     twitchAddNewGuildToTrackChannel,
     twitchCheckIfChannelIsAlreadyTracked,
-    twitchCheckIfGuildIsTrackingChannelAlready,
     twitchStopGuildTrackingChannel,
 } from "./utils/database";
 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 ".";
 
@@ -131,7 +132,8 @@ const commands: Record<string, Command> = {
         data: {
             options: [],
             name: "usage",
-            description: "Check the heap size and disk usage of the bot!",
+            description:
+                "Check the heap size and disk usage of the bot! (Stats for nerds)",
             integration_types: [0, 1],
             contexts: [0, 1, 2],
         },
@@ -316,7 +318,7 @@ const commands: Record<string, Command> = {
             }
 
             switch (targetPlatform) {
-                case "youtube":
+                case "youtube": {
                     // Check that the channel ID is in a valid format
                     if (
                         platformUserId.length != 24 ||
@@ -341,16 +343,17 @@ const commands: Record<string, Command> = {
                         return;
                     }
 
-                    // Check if the channel is already being tracked in the guild
-                    if (
+                    const trackedChannels =
                         await checkIfGuildIsTrackingChannelAlready(
                             platformUserId,
                             guildId,
-                        )
-                    ) {
+                        );
+
+                    // Check if the channel is already being tracked in the guild
+                    if (trackedChannels.length) {
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,
-                            content: "This channel is already being tracked!",
+                            content: `This channel is already being tracked in ${trackedChannels.map((channel, index) => `${index > 0 && index === trackedChannels.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
                         });
 
                         return;
@@ -397,6 +400,7 @@ const commands: Record<string, Command> = {
                     }
 
                     return;
+                }
                 case "twitch": {
                     // Check if the streamer exists by getting the ID
                     const streamerId = await getStreamerId(platformUserId);
@@ -410,16 +414,17 @@ const commands: Record<string, Command> = {
                         return;
                     }
 
-                    // Check if the channel is already being tracked in the guild
-                    if (
-                        await twitchCheckIfGuildIsTrackingChannelAlready(
-                            streamerId,
+                    const trackedChannels =
+                        await checkIfGuildIsTrackingChannelAlready(
+                            platformUserId,
                             guildId,
-                        )
-                    ) {
+                        );
+
+                    // Check if the channel is already being tracked in the guild
+                    if (trackedChannels.length) {
                         await interaction.reply({
                             flags: MessageFlags.Ephemeral,
-                            content: "This streamer is already being tracked!",
+                            content: `This channel is already being tracked in ${trackedChannels.map((channel, index) => `${index > 0 && index === trackedChannels.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
                         });
 
                         return;
@@ -622,7 +627,7 @@ const commands: Record<string, Command> = {
 
                     // check if the channel is not being tracked in the guild
                     if (
-                        !(await twitchCheckIfGuildIsTrackingChannelAlready(
+                        !(await checkIfGuildIsTrackingChannelAlready(
                             streamerId,
                             guildId,
                         ))

src/index.ts

@@ -2,20 +2,19 @@
 import fs from "fs/promises";
 import path from "path";
 
+import Bun from "bun";
 import {
     Client,
     GatewayIntentBits,
     REST,
     Routes,
     type APIApplicationCommand,
 } from "discord.js";
-import { CronJob } from "cron";
 
 import { env } from "./config.ts";
 import commandsMap from "./commands.ts";
 import initTables from "./utils/db/init.ts";
 import { getTwitchToken } from "./utils/twitch/auth.ts";
-import backup from "./utils/backup.ts";
 
 if (!env.discordToken || env.discordToken === "YOUR_DISCORD_TOKEN") {
     throw new Error("You MUST provide a discord token in .env!");
@@ -36,15 +35,6 @@ if (
     throw new Error("You MUST provide a Twitch client secret in .env!");
 }
 
-// Start the cron jobs
-await fs.mkdir(path.resolve(process.cwd(), "backups"), { recursive: true });
-new CronJob("0 0 * * *", async () => {
-    await backup(
-        path.resolve(process.cwd(), "db.sqlite3"),
-        `./backups/db-${new Date().toISOString().replace(/[:.]/g, "-")}.sqlite3`,
-    );
-}).start();
-
 const client = new Client({
     intents: [GatewayIntentBits.Guilds, GatewayIntentBits.GuildMessages],
 });
@@ -90,3 +80,11 @@ await Promise.all(
         await import("./events/" + file);
     }),
 );
+
+// Attempt the garbage collection every hour
+setInterval(
+    () => {
+        Bun.gc(true);
+    },
+    60 * 60 * 1000,
+);

src/types/database.d.ts

@@ -1,3 +1,5 @@
+// This file contains TypeScript interfaces for the database schema used in the application.
+// YouTube Table Interface
 export interface dbYouTube {
     youtube_channel_id: string;
     latest_video_id: string | null;
@@ -9,15 +11,27 @@ export interface dbYouTube {
     youtube_channel_is_live: boolean;
 }
 
+// Twitch Table Interface
 export interface dbTwitch {
     twitch_channel_id: string;
     is_live: boolean;
 }
 
-export type dbDiscordTable = {
+// Guild YouTube Subscriptions Table Interface
+export interface dbDiscordTable {
     guild_id: string;
     guild_channel_id: string;
     guild_platform: string;
     platform_user_id: string;
     guild_ping_role: null | string;
-};
+}
+
+// Bot Info Table Interface
+export interface dbBotInfo {
+    locked_row: boolean;
+    guilds_total: number;
+    channels_tracked: number;
+    total_members: number;
+    updated_at: string;
+    extended_info_updated_at: string;
+}

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

@@ -1,3 +1,106 @@
+// This file contains TypeScript interfaces for the YouTube API responses and requests used in the bot.
+// YouTube Playlist API Response Interface
+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;
+    };
+}
+
+// YouTube Channel API Response Interface
+export interface YouTubeChannelResponse {
+    kind: string;
+    etag: string;
+    pageInfo: {
+        totalResults: number;
+        resultsPerPage: number;
+    };
+    items: Array<{
+        kind: string;
+        etag: string;
+        id: string;
+        snippet: {
+            title: string;
+            description: string;
+            customUrl: string;
+            publishedAt: string;
+            thumbnails: {
+                default: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                medium: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+                high: {
+                    url: string;
+                    width: number;
+                    height: number;
+                };
+            };
+            localized: {
+                title: string;
+                description: string;
+            };
+            country: string;
+        };
+    }>;
+}
+
+// YouTube Innertube Search Request Interface
 export interface InnertubeSearchRequest {
     contents: {
         twoColumnSearchResultsRenderer: {

src/utils/backup.ts

@@ -0,0 +1,26 @@
+import { ActivityType, Guild, PresenceUpdateStatus } from "discord.js";
+
+import client from "..";
+
+import { updateBotInfo } from "./db/botinfo";
+
+export async function cronUpdateBotInfo() {
+    if (!client?.user) return;
+
+    const servers: number = client.guilds.cache.size;
+    const members: number = client.guilds.cache.reduce(
+        (acc: number, guild: Guild): number => acc + guild.memberCount,
+        0,
+    );
+
+    await updateBotInfo(servers, members);
+    client.user.setPresence({
+        activities: [
+            {
+                name: `Notifying ${servers.toLocaleString()} servers [${members.toLocaleString()} members]`,
+                type: ActivityType.Custom,
+            },
+        ],
+        status: PresenceUpdateStatus.Online,
+    });
+}