fix twitch /untrack

Author: GalvinPython

.gitignore

@@ -1,175 +1,5 @@
-# Based on https://raw.githubusercontent.com/github/gitignore/main/Node.gitignore
-
-# Logs
-
-logs
-_.log
-npm-debug.log_
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-.pnpm-debug.log*
-
-# Caches
-
-.cache
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-
-report.[0-9]_.[0-9]_.[0-9]_.[0-9]_.json
-
-# Runtime data
-
-pids
-_.pid
-_.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-
-lib-cov
-
-# Coverage directory used by tools like istanbul
-
-coverage
-*.lcov
-
-# nyc test coverage
-
-.nyc_output
-
-# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
-
-.grunt
-
-# Bower dependency directory (https://bower.io/)
-
-bower_components
-
-# node-waf configuration
-
-.lock-wscript
-
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-
-build/Release
-
-# Dependency directories
-
 node_modules/
-jspm_packages/
-
-# Snowpack dependency directory (https://snowpack.dev/)
-
-web_modules/
-
-# TypeScript cache
-
-*.tsbuildinfo
-
-# Optional npm cache directory
-
-.npm
-
-# Optional eslint cache
-
-.eslintcache
-
-# Optional stylelint cache
-
-.stylelintcache
-
-# Microbundle cache
-
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
-# Optional REPL history
-
-.node_repl_history
-
-# Output of 'npm pack'
-
-*.tgz
-
-# Yarn Integrity file
-
-.yarn-integrity
-
-# dotenv environment variable files
-
 .env
-.env.development.local
-.env.test.local
-.env.production.local
-.env.local
-
-# parcel-bundler cache (https://parceljs.org/)
-
-.parcel-cache
-
-# Next.js build output
-
-.next
-out
-
-# Nuxt.js build / generate output
-
-.nuxt
-dist
-
-# Gatsby files
-
-# Comment in the public line in if your project uses Gatsby and not Next.js
-
-# https://nextjs.org/blog/next-9-1#public-directory-support
-
-# public
-
-# vuepress build output
-
-.vuepress/dist
-
-# vuepress v2.x temp and cache directory
-
-.temp
-
-# Docusaurus cache and generated files
-
-.docusaurus
-
-# Serverless directories
-
-.serverless/
-
-# FuseBox cache
-
-.fusebox/
-
-# DynamoDB Local files
-
-.dynamodb/
-
-# TernJS port file
-
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-
-.vscode-test
-
-# yarn v2
-
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*
-
-# IntelliJ based IDEs
-.idea
 
-# Finder (MacOS) folder config
-.DS_Store
+# backups of database
+*.sql

package-lock.json

@@ -2,7 +2,7 @@
   "name": "videonotifier",
   "module": "src/index.ts",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "devDependencies": {
     "@types/bun": "1.1.6"
   },

package.json

@@ -395,18 +395,18 @@ const commands: Record<string, Command> = {
 				return;
 			}
 
-			// Check if the channel is not being tracked in the guild
-			if (!await checkIfGuildIsTrackingChannelAlready(youtubeChannelId, guildId)) {
-				await interaction.reply({
-					ephemeral: true,
-					content: 'This channel is not being tracked in this guild!',
-				});
-				return;
-			}
 
 			// Remove the guild from the database
 			switch (platform) {
 				case 'youtube':
+					// Check if the channel is not being tracked in the guild
+					if (!await checkIfGuildIsTrackingChannelAlready(youtubeChannelId, guildId)) {
+						await interaction.reply({
+							ephemeral: true,
+							content: 'This channel is not being tracked in this guild!',
+						});
+						return;
+					}
 					if (await stopGuildTrackingChannel(guildId, youtubeChannelId)) {
 						await interaction.reply({
 							ephemeral: true,
@@ -430,7 +430,16 @@ const commands: Record<string, Command> = {
 						return;
 					}
 
-					if (await twitchStopGuildTrackingChannel(guildId, youtubeChannelId)) {
+					// check if the channel is not being tracked in the guild
+					if (!await twitchCheckIfGuildIsTrackingChannelAlready(streamerId, guildId)) {
+						await interaction.reply({
+							ephemeral: true,
+							content: 'This streamer is not being tracked in this guild!',
+						});
+						return;
+					}
+
+					if (await twitchStopGuildTrackingChannel(guildId, streamerId)) {
 						await interaction.reply({
 							ephemeral: true,
 							content: 'Successfully stopped tracking the streamer!',