fix: /untrack crashing

Author: GalvinPython

src/commands.ts

@@ -2,7 +2,7 @@ import { heapStats } from 'bun:jsc';
 import client from '.';
 import { ChannelType, GuildMember, type CommandInteraction } from 'discord.js';
 import checkIfChannelIdIsValid from './utils/youtube/checkIfChannelIdIsValid';
-import { addNewChannelToTrack, addNewGuildToTrackChannel, checkIfChannelIsAlreadyTracked, checkIfGuildIsTrackingChannelAlready, stopGuildTrackingChannel, twitchAddNewChannelToTrack, twitchAddNewGuildToTrackChannel, twitchCheckIfChannelIsAlreadyTracked, twitchCheckIfGuildIsTrackingChannelAlready, twitchStopGuildTrackingChannel } from './database';
+import { addNewChannelToTrack, addNewGuildToTrackChannel, checkIfChannelIsAlreadyTracked, checkIfGuildIsTrackingChannelAlready, stopGuildTrackingChannel, twitchAddNewChannelToTrack, twitchAddNewGuildToTrackChannel, twitchCheckIfChannelIsAlreadyTracked, twitchCheckIfGuildIsTrackingChannelAlready, twitchStopGuildTrackingChannel } from './utils/database';
 import getChannelDetails from './utils/youtube/getChannelDetails';
 import { PermissionFlagsBits } from 'discord-api-types/v8';
 import { getStreamerId } from './utils/twitch/getStreamerId';

src/index.ts

@@ -42,7 +42,7 @@ import { Client, GatewayIntentBits, REST, Routes, type APIApplicationCommand } f
 import commandsMap from './commands.ts';
 import fs from 'fs/promises';
 import path from 'path';
-import { initTables } from './database.ts';
+import { initTables } from './utils/database.ts';
 import { getTwitchToken } from './utils/twitch/auth.ts';
 
 const client = new Client({

src/database.ts renamed to src/utils/database.ts

@@ -1,5 +1,5 @@
 import mysql from 'mysql2';
-import type { dbYouTube } from './types/database';
+import type { dbYouTube } from '../types/database';
 
 const pool = mysql.createPool({
 	host: process.env.MYSQL_ADDRESS as string,
@@ -177,7 +177,7 @@ export async function updateVideoId(channelId: string, videoId: string) {
 }
 
 export async function stopGuildTrackingChannel(guild_id: string, channelId: string) {
-	const query = `DELETE FROM discord WHERE guild_id = ? AND discord_youtube_channel_id = ?`;
+	const query = `DELETE FROM discord WHERE guild_id = ? AND platform_user_id = ?`;
 	return new Promise<boolean>((resolve, reject) =>
 		pool.query(query, [guild_id, channelId], (err) => {
 			if (err) {

src/utils/twitch/checkIfStreamerIsLive.ts

@@ -1,6 +1,6 @@
 import { twitchToken } from "./auth";
 import { env } from "../../config";
-import { twitchGetAllChannelsToTrack, twitchGetGuildsTrackingChannel, twitchUpdateIsLive } from "../../database";
+import { twitchGetAllChannelsToTrack, twitchGetGuildsTrackingChannel, twitchUpdateIsLive } from "../database";
 import type { dbTwitch } from "../../types/database";
 import client from "../..";
 import type { TextChannel } from "discord.js";
@@ -71,11 +71,11 @@ export async function checkIfStreamersAreLive(): Promise<void> {
 				// Update the database
 				console.log(`Updating ${streamerId.twitch_channel_id} to be ${isLive ? "live" : "offline"}`);
 				await twitchUpdateIsLive(streamerId.twitch_channel_id, isLive);
-				
+
 				if (isLive) {
 					// Get the streamer's name
 					const streamerName = await getStreamerName(streamerId.twitch_channel_id);
-					
+
 					// Get all guilds that are tracking this streamer
 					const guildsTrackingStreamer = await twitchGetGuildsTrackingChannel(streamerId.twitch_channel_id)
 					for (const guild of guildsTrackingStreamer) {

src/utils/youtube/fetchLatestUploads.ts

@@ -1,5 +1,5 @@
 import { env } from "../../config";
-import { getAllChannelsToTrack, getGuildsTrackingChannel, updateVideoId } from "../../database";
+import { getAllChannelsToTrack, getGuildsTrackingChannel, updateVideoId } from "../database";
 import { ChannelType, TextChannel } from "discord.js";
 import client from "../..";
 import getChannelDetails from "./getChannelDetails";