From 8bf97e443853a381356f7d201223848ea3ebe013 Mon Sep 17 00:00:00 2001 From: Yuzu Date: Sat, 5 Feb 2022 00:32:02 +0700 Subject: [PATCH] Add NowPlaying command --- src/discord/Help.ts | 2 +- src/discord/MusicPlayer/NowPlaying.ts | 70 +++++++++++++++++++++++++++ src/providers/Discord.ts | 2 + src/providers/DiscordMusicPlayer.ts | 4 ++ 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/discord/MusicPlayer/NowPlaying.ts diff --git a/src/discord/Help.ts b/src/discord/Help.ts index 3c2181c..6596cf3 100644 --- a/src/discord/Help.ts +++ b/src/discord/Help.ts @@ -26,7 +26,7 @@ const EMBEDS = { }, { name: '🎵 Music', - value: `play (p), search, skip, queue, join, leave`, + value: `play (p), search, skip, queue, nowplaying (np), join, leave`, inline: true }, { diff --git a/src/discord/MusicPlayer/NowPlaying.ts b/src/discord/MusicPlayer/NowPlaying.ts new file mode 100644 index 0000000..7e8a3fb --- /dev/null +++ b/src/discord/MusicPlayer/NowPlaying.ts @@ -0,0 +1,70 @@ +import { Message, CommandInteraction, Interaction, MessageActionRow, TextChannel, MessageButton } from "discord.js"; +import { getEmotes, makeSuccessEmbed, makeErrorEmbed, sendMessage, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage"; +import DiscordProvider from "../../providers/Discord"; +import Users from "../../services/Users" +import Environment from "../../providers/Environment"; +import DiscordMusicPlayer, { DiscordMusicPlayerInstance, ValidTracks, Queue } from "../../providers/DiscordMusicPlayer"; + +const EMBEDS = { + NOW_PLAYING: (data: Message | Interaction, track: ValidTracks) => { + const embed = makeInfoEmbed({ + title: ' Now playing', + icon: '🎵', + description: `${track.title}`, + user: DiscordProvider.client.user + }); + + embed.setImage(track.thumbnails[0].url); + return embed; + }, + NO_MUSIC_PLAYING: (data: Message | Interaction) => { + return makeErrorEmbed({ + title: `There are no music playing`, + user: (data instanceof Interaction) ? data.user : data.author + }); + } +} + +export default class NowPlaying { + + async onCommand(command: string, args: any, message: Message) { + if(command.toLowerCase() !== 'nowplaying' && command.toLowerCase() !== 'np') return; + await this.process(message, args); + } + + async interactionCreate(interaction: CommandInteraction) { + if(interaction.isCommand()) { + if(typeof interaction.commandName === 'undefined') return; + if((interaction.commandName).toLowerCase() !== 'nowplaying') return; + await this.process(interaction, interaction.options); + } + } + + async process(data: Interaction | Message, args: any) { + const isSlashCommand = data instanceof CommandInteraction && data.isCommand(); + const isMessage = data instanceof Message; + + if(!isSlashCommand && !isMessage) return; + + if(!data.member) return; + if(!data.guildId) return; + if(!(data.channel instanceof TextChannel)) return; + + //const channel: any = isMessage ? data.member.voice.channel : DiscordProvider.client.guilds.cache.get((data as Interaction).guildId!)!.members.cache.get((data as Interaction).user.id)?.voice.channel; + //if(!channel) return; + + const instance = DiscordMusicPlayer.getGuildInstance(data.guildId); + if(!instance || !instance.queue.track[0]) return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] }); + + const row = new MessageActionRow() + .addComponents( + new MessageButton() + .setEmoji('▶️') + .setLabel(' Open on YouTube') + .setURL(encodeURI(`https://www.youtube.com/watch?v=${instance.queue.track[0].id}`)) + .setStyle('LINK'), + ) + + return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NOW_PLAYING(data, instance.queue.track[0])], components: [row] }); + } +} \ No newline at end of file diff --git a/src/providers/Discord.ts b/src/providers/Discord.ts index 30ac372..8bd69e9 100644 --- a/src/providers/Discord.ts +++ b/src/providers/Discord.ts @@ -19,6 +19,7 @@ import Discord_MusicPlayer_Join from "../discord/MusicPlayer/Join"; import Discord_MusicPlayer_Leave from "../discord/MusicPlayer/Leave"; import Discord_MusicPlayer_Queue from "../discord/MusicPlayer/Queue"; import Discord_MusicPlayer_Search from "../discord/MusicPlayer/Search"; +import Discord_MusicPlayer_Search_NowPlaying from "../discord/MusicPlayer/NowPlaying"; import Discord_Developer_ServiceAnnouncement from "../discord/developer/ServiceAnnouncement" @@ -59,6 +60,7 @@ class Discord { this.loaded_module["Discord_MusicPlayer_Leave"] = new Discord_MusicPlayer_Leave(); this.loaded_module["Discord_MusicPlayer_Queue"] = new Discord_MusicPlayer_Queue(); this.loaded_module["Discord_MusicPlayer_Search"] = new Discord_MusicPlayer_Search(); + this.loaded_module["Discord_MusicPlayer_Search_NowPlaying"] = new Discord_MusicPlayer_Search_NowPlaying(); this.loaded_module["MembershipScreening"] = new Discord_MembershipScreening(); diff --git a/src/providers/DiscordMusicPlayer.ts b/src/providers/DiscordMusicPlayer.ts index fa5fc94..7fb24fa 100644 --- a/src/providers/DiscordMusicPlayer.ts +++ b/src/providers/DiscordMusicPlayer.ts @@ -111,6 +111,10 @@ export class DiscordMusicPlayerInstance { this.voiceChannel = currentVC; } }); + + this.voiceConnection.on(VoiceConnectionStatus.Disconnected, (oldState: VoiceConnectionState, newState: VoiceConnectionState) => { + // TODO: Handle on Disconnect by user (Right-click > Disconnect) + }); } public async leaveVoiceChannel() {