Skip to content

fix(bot): fix and upgrade autocomplete #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 21, 2025
Merged

fix(bot): fix and upgrade autocomplete #148

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0417109
feat(bot): add autocomplete to /untrack
GalvinPython Jul 20, 2025
f2462f4
fix(twitch): add streamerName to database in /track
GalvinPython Jul 20, 2025
bcd5c6b
feat(bot): complete /untrack command improvements
GalvinPython Jul 21, 2025
55eb203
fix(bot): nvm i lied, /untracked is now done
GalvinPython Jul 21, 2025
cc46591
Update src/db/discord.ts
GalvinPython Jul 21, 2025
7a768f8
style: run lint
GalvinPython Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
209 changes: 88 additions & 121 deletions src/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import search from "./utils/youtube/search";
import {
checkIfGuildIsTrackingUserAlready,
discordAddGuildTrackingUser,
discordGetAllTrackedInGuild,
discordRemoveGuildTrackingChannel,
} from "./db/discord";
import { Platform, YouTubeContentType } from "./types/types.d";
import searchTwitch from "./utils/twitch/searchTwitch";
Expand Down Expand Up @@ -476,10 +478,25 @@ const commands: Record<string, Command> = {
trackedChannels.data
) {
// If the channel is already being tracked in the guild, we can just return
await interaction.reply({
flags: MessageFlags.Ephemeral,
content: `This channel is already being tracked in ${trackedChannels.data.map((channel, index) => `${index > 0 && index === trackedChannels.data.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
});
if (Array.isArray(trackedChannels.data)) {
const channelList = trackedChannels.data
.map(
(channel, index, arr) =>
`${index > 0 && index === arr.length - 1 ? "and " : ""}<#${channel.notificationChannelId}>`,
)
.join(", ");

await interaction.reply({
flags: MessageFlags.Ephemeral,
content: `This channel is already being tracked in ${channelList}!`,
});
} else {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"This channel is already being tracked, but the data format is invalid.",
});
}

return;
}
Expand Down Expand Up @@ -589,10 +606,25 @@ const commands: Record<string, Command> = {
trackedChannels.data
) {
// If the channel is already being tracked in the guild, we can just return
await interaction.reply({
flags: MessageFlags.Ephemeral,
content: `This channel is already being tracked in ${trackedChannels.data.map((channel, index) => `${index > 0 && index === trackedChannels.data.length - 1 ? "and " : ""}<#${channel.guild_channel_id}>`).join(", ")}!`,
});
if (Array.isArray(trackedChannels.data)) {
const channelList = trackedChannels.data
.map(
(channel, index, arr) =>
`${index > 0 && index === arr.length - 1 ? "and " : ""}<#${channel.notificationChannelId}>`,
)
.join(", ");

await interaction.reply({
flags: MessageFlags.Ephemeral,
content: `This channel is already being tracked in ${channelList}!`,
});
} else {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"This channel is already being tracked, but the data format is invalid.",
});
}

return;
}
Expand Down Expand Up @@ -624,6 +656,7 @@ const commands: Record<string, Command> = {
const channelAdded = await addNewStreamerToTrack(
platformUserId,
isLive,
streamerName,
);

if (!channelAdded.success) {
Expand Down Expand Up @@ -756,28 +789,14 @@ const commands: Record<string, Command> = {
untrack: {
data: {
options: [
{
name: "platform",
description: "Select a supported platform to track",
type: 3,
required: true,
choices: [
{
name: "Twitch",
value: "twitch",
},
{
name: "YouTube",
value: "youtube",
},
],
},
{
name: "user_id",
// TODO: Searching
description:
"Enter the YouTube/Twitch channel ID to stop tracking",
"Select the channel or streamer to stop tracking. Searching is not supported, use the above options!",
type: 3,
required: true,
autocomplete: true,
},
],
name: "untrack",
Expand All @@ -787,9 +806,7 @@ const commands: Record<string, Command> = {
},
execute: async (interaction: CommandInteraction) => {
// Get the YouTube Channel ID
const youtubeChannelId = interaction.options.get("user_id")
?.value as string;
const platform = interaction.options.get("platform")
const platformUserId = interaction.options.get("user_id")
?.value as string;
const guildId = interaction.guildId;

Expand Down Expand Up @@ -819,110 +836,60 @@ const commands: Record<string, Command> = {
return;
}

// Platform check (to shut up TS)
if (platform != "youtube" && platform != "twitch") {
// Remove the guild from the database
const trackingDeleteSuccess =
await discordRemoveGuildTrackingChannel(platformUserId);

if (!trackingDeleteSuccess || !trackingDeleteSuccess.success) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"Platform not supported! Please select a platform to track!",
content: "Failed to stop tracking the channel.",
});

return;
}

// Remove the guild from the database
switch (platform) {
case "youtube":
// Check if the channel is not being tracked in the guild
if (
!(await checkIfGuildIsTrackingUserAlready(
youtubeChannelId,
guildId,
))
) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"This channel is not being tracked in this guild!",
});

return;
}
if (
await stopGuildTrackingChannel(
guildId,
youtubeChannelId,
)
) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"Successfully stopped tracking the channel!",
});
} else {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"An error occurred while trying to stop tracking the channel! Please report this error!",
});
}

return;
case "twitch": {
// get the twitch id for the streamer
const platformUserId =
await getplatformUserId(youtubeChannelId);

if (!platformUserId) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"An error occurred while trying to get the streamer ID! Please report this error!",
});

return;
}

// check if the channel is not being tracked in the guild
if (
!(await checkIfGuildIsTrackingUserAlready(
platformUserId,
guildId,
))
) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"This streamer is not being tracked in this guild!",
});
await interaction.reply({
content: "Successfully stopped tracking the channel.",
});
},
autoComplete: async (interaction: AutocompleteInteraction) => {
const trackedChannels = await discordGetAllTrackedInGuild(
interaction.guildId as string,
);

return;
}
console.dir(
{ message: "Tracked channels:", data: trackedChannels },
{ depth: null },
);

if (
await twitchStopGuildTrackingChannel(
guildId,
platformUserId,
)
) {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"Successfully stopped tracking the streamer!",
});
} else {
await interaction.reply({
flags: MessageFlags.Ephemeral,
content:
"An error occurred while trying to stop tracking the streamer! Please report this error!",
});
}
if (!trackedChannels || !trackedChannels.success) {
console.error(
"An error occurred while trying to get the tracked channels in this guild!",
);
await interaction.respond([]);

return;
}
default:
return;
return;
}

const trackedYouTubeChannels =
trackedChannels.data.youtubeSubscriptions;
const trackedTwitchChannels =
trackedChannels.data.twitchSubscriptions;

return await interaction.respond(
trackedYouTubeChannels
.map((channel) => ({
name: `YouTube: ${channel.youtubeChannel.youtubeChannelName} (${channel.youtubeChannel.youtubeChannelId}) | <#${channel.subscription.notificationChannelId}>`,
value: `youtube.${String(channel.subscription.id)}`,
}))
.concat(
trackedTwitchChannels.map((channel) => ({
name: `Twitch: ${channel.twitchChannel.twitchChannelName} (${channel.twitchChannel.twitchChannelId}) | <#${channel.subscription.notificationChannelId}>`,
value: `twitch.${String(channel.subscription.id)}`,
})),
),
);
},
},
tracked: {
Expand Down
Loading