kirameki-cafe-mirror/Yumi
1
0
Fork 0
mirror of https://github.com/kirameki-cafe/Yumi.git synced 2026-09-13 18:59:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code refactor

Browse Source
This commit is contained in:
yuzu
2022-03-03 20:56:49 +07:00
parent 18b0739592
commit 2c26c363ff
23 changed files with 1244 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/MusicPlayer/Join.ts
+20 -53
View File
@@ -1,5 +1,7 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, VoiceChannel, Permissions, GuildMember, DMChannel, StageChannel, MessageActionRow, MessageButton, TextChannel } from "discord.js";
import { makeSuccessEmbed, makeErrorEmbed, sendMessage, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import { makeSuccessEmbed, makeErrorEmbed, sendMessage, sendMessageOrInteractionResponse, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer, { PlayerPlayingEvent, PlayerErrorEvent, VoiceDisconnectedEvent, ValidTracks, DiscordMusicPlayerInstance } from "../../providers/DiscordMusicPlayer";
@@ -177,68 +179,33 @@ export async function joinVoiceChannelProcedure (data: Interaction | Message, in
});
}
export default class Join {
export default class Join extends DiscordModule {
public id = "Discord_MusicPlayer_Join";
public commands = ["join"];
public commandInteractionName = "join";
async onCommand(command: string, args: any, message: Message) {
if (command.toLowerCase() !== 'join') return;
await this.process(message, args);
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: CommandInteraction) {
if (interaction.isCommand()) {
if (typeof interaction.commandName === 'undefined') return;
if ((interaction.commandName).toLowerCase() !== 'join') return;
await this.process(interaction, interaction.options);
}
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isMessage = data instanceof Message;
async run(data: HybridInteractionMessage, args: any) {
if (!isSlashCommand && !isMessage) return;
const guild = data.getGuild();
const member = data.getMember();
if (!data.member) return;
if(!guild || !member) return;
this.joinCommands(data, args);
const voiceChannel = member.voice.channel;
}
public async joinCommands(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.channel) return;
if (!data.guildId) return;
if (data.channel instanceof DMChannel) 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;
if (!data.member.voice.channel)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data)] });
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
let voiceChannel = data.member.voice.channel;
//if(!DiscordMusicPlayer.isGuildInstanceExists(data.guildId)) {
// DiscordMusicPlayer.createGuildInstance(data.guildId, voiceChannel);
//}
let instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
await joinVoiceChannelProcedure(data, instance!, voiceChannel);
//if(!instance.isConnected())
// instance.joinVoiceChannel(voiceChannel, data.channel ? data.channel : undefined);
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
await joinVoiceChannelProcedure(data.getRaw(), instance, voiceChannel);
}
}
src/discord/MusicPlayer/Leave.ts
+26 -30
View File
@@ -1,5 +1,7 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeErrorEmbed, sendMessageOrInteractionResponse } from "../../utils/DiscordMessage";
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
@@ -31,47 +33,41 @@ const EMBEDS = {
}
}
export default class Leave {
export default class Leave extends DiscordModule {
async onCommand(command: string, args: any, message: Message) {
if(command.toLowerCase() !== 'leave') return;
await this.process(message, args);
public id = "Discord_MusicPlayer_Leave";
public commands = ["leave", "disconnect", "dc"];
public commandInteractionName = "leave";
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: CommandInteraction) {
if(interaction.isCommand()) {
if(typeof interaction.commandName === 'undefined') return;
if((interaction.commandName).toLowerCase() !== 'leave') return;
await this.process(interaction, interaction.options);
}
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isMessage = data instanceof Message;
async run(data: HybridInteractionMessage, args: any) {
if(!isSlashCommand && !isMessage) return;
const guild = data.getGuild();
const member = data.getMember();
if(!data.member) return;
if(!data.guildId) return;
if(!guild || !member) 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 (!data.member.voice.channel)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data)] });
if(!channel) return;
let instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
if(instance.voiceChannel.id !== data.member.voice.channel.id)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data)] });
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] });
DiscordMusicPlayer.destoryGuildInstance(data.guild?.id!);
await sendMessageOrInteractionResponse(data, { embeds:[EMBEDS.VOICECHANNEL_LEFT(data)] });
DiscordMusicPlayer.destoryGuildInstance(guild.id);
await sendHybridInteractionMessageResponse(data, { embeds:[EMBEDS.VOICECHANNEL_LEFT(data.getRaw())] });
return;
}
src/discord/MusicPlayer/NowPlaying.ts
+18 -25
View File
@@ -1,5 +1,7 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, MessageActionRow, TextChannel, MessageButton } from "discord.js";
import { makeErrorEmbed, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import { makeErrorEmbed, makeInfoEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer, { ValidTracks } from "../../providers/DiscordMusicPlayer";
@@ -23,36 +25,27 @@ const EMBEDS = {
}
}
export default class NowPlaying {
export default class NowPlaying extends DiscordModule {
public id = "Discord_MusicPlayer_NowPlaying";
public commands = ["nowplaying", "np"];
public commandInteractionName = "nowplaying";
async onCommand(command: string, args: any, message: Message) {
if(command.toLowerCase() !== 'nowplaying' && command.toLowerCase() !== 'np') return;
await this.process(message, args);
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(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 GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isMessage = data instanceof Message;
async run(data: HybridInteractionMessage, args: any) {
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 guild = data.getGuild();
if(!guild) return;
const instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
if(!instance || !instance.queue.track[0]) return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance || !instance.queue.track[0]) return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
const row = new MessageActionRow()
.addComponents(
@@ -63,6 +56,6 @@ export default class NowPlaying {
.setStyle('LINK'),
)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NOW_PLAYING(data, instance.queue.track[0])], components: [row] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOW_PLAYING(data.getRaw(), instance.queue.track[0])], components: [row] });
}
}
src/discord/MusicPlayer/Play.ts
+152 -160
View File
@@ -1,5 +1,7 @@
import { Message, CommandInteraction, Interaction, VoiceChannel, MessageActionRow, MessageButton, TextChannel } from "discord.js";
import { makeErrorEmbed, makeSuccessEmbed, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, VoiceChannel, MessageActionRow, MessageButton, SelectMenuInteraction, ButtonInteraction } from "discord.js";
import { makeErrorEmbed, makeSuccessEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer, { ValidTracks } from "../../providers/DiscordMusicPlayer";
import { joinVoiceChannelProcedure } from "./Join";
@@ -60,195 +62,190 @@ const EMBEDS = {
});
},
}
export default class Play extends DiscordModule {
public id = "Discord_MusicPlayer_Play";
public commands = ["play", "p"];
public commandInteractionName = "play";
export default class Play {
async onCommand(command: string, args: any, message: Message) {
if (command.toLowerCase() !== 'play' && command.toLowerCase() !== 'p') return;
await this.process(message, args);
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: Interaction) {
if (interaction.isCommand()) {
if (typeof interaction.commandName === 'undefined') return;
if ((interaction.commandName).toLowerCase() !== 'play') return;
await this.process(interaction, interaction.options);
}
else if (interaction.isSelectMenu()) {
if (!interaction.guild || !interaction.guildId) return;
if (!this.tryParseJSONObject(interaction.customId)) return;
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
let payload = JSON.parse(interaction.customId);
if (!interaction.member?.user?.id) return;
async GuildButtonInteractionCreate(interaction: ButtonInteraction) {
const hybridData = new HybridInteractionMessage(interaction);
const guild = hybridData.getGuild();
const member = hybridData.getMember();
const user = hybridData.getUser();
if (typeof payload.m === 'undefined' || typeof payload.a === 'undefined') return;
if (!guild || !member || !user) return;
if (!this.isJSONValid(interaction.customId)) return;
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_SM stands for MusicPlayer_SearchMenu
data.r stands for data.requester
data.v stands for data.voiceChannel
*/
let payload = JSON.parse(interaction.customId);
if (payload.m === 'MP_SM' && payload.a === 'play') {
if (typeof payload.m === 'undefined' || typeof payload.a === 'undefined') return;
await interaction.deferReply();
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_P stands for MusicPlayer_Play
data.v stands for data.videoId
data.l stands for data.listId
*/
let voiceChannel = DiscordProvider.client.guilds.cache.get(interaction.guildId)?.channels.cache.get(payload.d.v);
let member = DiscordProvider.client.guilds.cache.get(interaction.guildId)?.members.cache.get(interaction.member?.user?.id);
if (payload.m === 'MP_P' && payload.a === 'arp') {
if (!member) return;
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (typeof payload.d === 'undefined') return;
let data = payload.d.split('$');
if (data.length !== 3) return;
if (!member.voice.channel)
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(interaction)] }, true);
if (!DiscordMusicPlayer.isGuildInstanceExists(interaction.guildId)) {
await joinVoiceChannelProcedure(interaction, null, voiceChannel);
}
let instance = DiscordMusicPlayer.getGuildInstance(interaction.guildId);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(interaction)] }, true);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(interaction, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(interaction.guildId);
}
if (!instance) return;
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(DiscordMusicPlayer.parseYouTubeLink(interaction.values[0]));
if (!result) return;
instance.addTrackToQueue(result);
//interaction.editReply({ embeds: [EMBEDS.ADDED_QUEUE(interaction, result)] });
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.ADDED_QUEUE(interaction, result)] }, true);
payload.d = {
c: data[0],
v: data[1],
l: data[2]
}
}
else if (interaction.isButton()) {
if (!interaction.guild || !interaction.guildId) return;
if (!this.tryParseJSONObject(interaction.customId)) return;
await interaction.deferReply();
let payload = JSON.parse(interaction.customId);
if (!interaction.member?.user?.id) return;
let voiceChannel = DiscordProvider.client.guilds.cache.get(guild.id)?.channels.cache.get(payload.d.c);
//let member = DiscordProvider.client.guilds.cache.get(guild.id)?.members.cache.get(interaction.member?.user?.id);
if (typeof payload.m === 'undefined' || typeof payload.a === 'undefined') return;
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_P stands for MusicPlayer_Play
data.v stands for data.videoId
data.l stands for data.listId
*/
if (payload.m === 'MP_P' && payload.a === 'arp') {
if (typeof payload.d === 'undefined') return;
let data = payload.d.split('$');
if(data.length !== 3) return;
payload.d = {
c: data[0],
v: data[1],
l: data[2]
}
await interaction.deferReply();
let voiceChannel = DiscordProvider.client.guilds.cache.get(interaction.guildId)?.channels.cache.get(payload.d.c);
let member = DiscordProvider.client.guilds.cache.get(interaction.guildId)?.members.cache.get(interaction.member?.user?.id);
if (!member) return;
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (!member.voice.channel)
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(interaction)] }, true);
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(hybridData.getRaw())] }, true);
if (!DiscordMusicPlayer.isGuildInstanceExists(interaction.guildId)) {
await joinVoiceChannelProcedure(interaction, null, voiceChannel);
}
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
await joinVoiceChannelProcedure(interaction, null, voiceChannel);
let instance = DiscordMusicPlayer.getGuildInstance(interaction.guildId);
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(interaction)] }, true);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(hybridData.getRaw())] }, true);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(interaction, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(interaction.guildId);
}
if (!instance) return;
let playlist = await DiscordMusicPlayer.getYouTubeSongsInPlayList(`https://www.youtube.com/watch?v=${payload.d.v}&list=${payload.d.l}`);
const songs = (await playlist.all_videos()).filter((song) => {
return payload.d.v !== song.id;
});
for(let song of songs) {
instance.addTrackToQueue(song);
}
await (interaction.message as Message).edit({ components: [] });
return await sendMessageOrInteractionResponse(interaction, { embeds: [EMBEDS.ADDED_SONGS_QUEUE(interaction, songs)] }, true);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(interaction, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(guild.id);
}
if (!instance) return;
let playlist = await DiscordMusicPlayer.getYouTubeSongsInPlayList(`https://www.youtube.com/watch?v=${payload.d.v}&list=${payload.d.l}`);
const songs = (await playlist.all_videos()).filter((song) => {
return payload.d.v !== song.id;
});
for (let song of songs) {
instance.addTrackToQueue(song);
}
if(hybridData.getSelectMenu().message instanceof Message)
await (hybridData.getSelectMenu().message as Message).edit({ components: [] });
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.ADDED_SONGS_QUEUE(hybridData.getRaw(), songs)] }, true);
}
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isMessage = data instanceof Message;
async GuildSelectMenuInteractionCreate(interaction: SelectMenuInteraction) {
if (!isSlashCommand && !isMessage) return;
const hybridData = new HybridInteractionMessage(interaction);
const guild = hybridData.getGuild();
const member = hybridData.getMember();
const user = hybridData.getUser();
if (!data.member) return;
if (!data.guild) return;
if (!data.guildId) return;
if (!guild || !member || !user) return;
if (!this.isJSONValid(interaction.customId)) return;
let payload = JSON.parse(interaction.customId);
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_SM stands for MusicPlayer_SearchMenu
data.r stands for data.requester
data.v stands for data.voiceChannel
*/
if (typeof payload.m === 'undefined' || typeof payload.a === 'undefined') return;
if (payload.m === 'MP_SM' && payload.a === 'play') {
await interaction.deferReply();
const voiceChannel = DiscordProvider.client.guilds.cache.get(guild.id)?.channels.cache.get(payload.d.v);
//let member = DiscordProvider.client.guilds.cache.get(guild.id)?.members.cache.get(user.id);
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(interaction)] }, true);
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
await joinVoiceChannelProcedure(interaction, null, voiceChannel);
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(interaction)] }, true);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(interaction, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(guild.id);
}
if (!instance) return;
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(DiscordMusicPlayer.parseYouTubeLink(interaction.values[0]));
if (!result) return;
instance.addTrackToQueue(result);
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.ADDED_QUEUE(interaction, result)] }, true);
}
}
async run(data: HybridInteractionMessage, args: any) {
let query;
const guild = data.getGuild();
const channel = data.getChannel();
const member = data.getMember();
if (isMessage) {
if (data === null || !data.guildId || data.member === null || data.guild === null) return;
if (data.isMessage()) {
if (args.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.PLAY_INFO(data.getRaw())] });
if (args.length === 0) {
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.PLAY_INFO(data)] });
}
query = args.join(' ');
}
else if (isSlashCommand) {
else if (data.isSlashCommand()) {
query = args.getSubcommand();
}
if (!query) return;
if (!(data.channel instanceof TextChannel)) return;
if (!query || !guild || !channel || !member) return;
if (!data.member.voice.channel)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data)] });
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
let voiceChannel = data.member.voice.channel;
const voiceChannel = member.voice.channel;
if (!DiscordMusicPlayer.isGuildInstanceExists(data.guildId)) {
await joinVoiceChannelProcedure(data, null, voiceChannel);
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id)) {
await joinVoiceChannelProcedure(data.getRaw(), null, voiceChannel);
}
let instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (instance!.voiceChannel.id !== data.member.voice.channel.id)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data)] }, true);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(data, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
await joinVoiceChannelProcedure(data.getRaw(), instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(guild.id);
}
if (!instance) return;
@@ -256,22 +253,22 @@ export default class Play {
if (DiscordMusicPlayer.isYouTubeLink(query)) {
let linkData = DiscordMusicPlayer.parseYouTubeLink(query);
if(linkData.videoId === "" && linkData.list) {
if (linkData.videoId === "" && linkData.list) {
let playlist = await DiscordMusicPlayer.getYouTubeSongsInPlayList(query);
const songs = await playlist.all_videos();
for(let song of songs) {
for (let song of songs) {
instance.addTrackToQueue(song);
}
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, songs)] }, true);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_SONGS_QUEUE(data.getRaw(), songs)] }, true);
}
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(linkData);
if (!result) return;
if (isMessage && (data as Message).embeds.length > 0) {
(data as Message).suppressEmbeds(true);
if (data.isMessage() && data.getMessage().embeds.length > 0) {
data.getMessage().suppressEmbeds(true);
}
instance.addTrackToQueue(result);
@@ -290,10 +287,10 @@ export default class Play {
.setStyle('PRIMARY')
)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data, result)], components: [row] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result)], components: [row] });
}
else
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data, result)] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result)] });
} else {
let result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
@@ -325,27 +322,22 @@ export default class Play {
.setStyle('PRIMARY')
)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data, result[0])], components: [row] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result[0])], components: [row] });
}
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data, result[0])] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result[0])] });
}
return;
}
tryParseJSONObject(jsonString: string) {
isJSONValid(jsonString: string) {
try {
let o = JSON.parse(jsonString);
if (o && typeof o === "object") {
return true;
//return o;
}
}
catch (e) { }
return false;
}
}
src/discord/MusicPlayer/Queue.ts
+18 -24
View File
@@ -1,5 +1,7 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, TextChannel } from "discord.js";
import { makeErrorEmbed, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import { makeErrorEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordMusicPlayer, { Queue } from "../../providers/DiscordMusicPlayer";
@@ -46,38 +48,30 @@ const EMBEDS = {
}
}
export default class QueueCommand {
export default class QueueCommand extends DiscordModule {
public id = "Discord_MusicPlayer_Queue";
public commands = ["queue", "q"];
public commandInteractionName = "queue";
async onCommand(command: string, args: any, message: Message) {
if(command.toLowerCase() !== 'queue') return;
await this.process(message, args);
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: CommandInteraction) {
if(interaction.isCommand()) {
if(typeof interaction.commandName === 'undefined') return;
if((interaction.commandName).toLowerCase() !== 'queue') return;
await this.process(interaction, interaction.options);
}
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isMessage = data instanceof Message;
async run(data: HybridInteractionMessage, args: any) {
if(!isSlashCommand && !isMessage) return;
const guild = data.getGuild();
if(!data.member) return;
if(!data.guildId) return;
if(!(data.channel instanceof TextChannel)) return;
if(!guild) 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) return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance) return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
await sendMessageOrInteractionResponse(data, { embeds:[EMBEDS.QUEUE(data, instance.queue)] });
await sendHybridInteractionMessageResponse(data, { embeds:[EMBEDS.QUEUE(data.getRaw(), instance.queue)] });
return;
}
src/discord/MusicPlayer/Search.ts
+64 -84
View File
@@ -1,11 +1,13 @@
import { Message, CommandInteraction, Interaction, MessageActionRow, TextChannel, MessageSelectMenu, MessageSelectOptionData } from "discord.js";
import { makeErrorEmbed, makeSuccessEmbed, sendMessageOrInteractionResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, MessageActionRow, ButtonInteraction, MessageSelectMenu, MessageSelectOptionData } from "discord.js";
import { makeErrorEmbed, makeSuccessEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordMusicPlayer, { ValidTracks } from "../../providers/DiscordMusicPlayer";
import { joinVoiceChannelProcedure } from "./Join";
const EMBEDS = {
SEARCH_INFO: (data: Message | Interaction) => {
return makeInfoEmbed ({
return makeInfoEmbed({
title: 'Search',
description: `Search for a song`,
fields: [
@@ -52,108 +54,88 @@ const EMBEDS = {
});
}
}
export default class Search extends DiscordModule {
public id = "Discord_MusicPlayer_Search";
public commands = ["search"];
public commandInteractionName = "search";
export default class Search {
async onCommand(command: string, args: any, message: Message) {
if (command.toLowerCase() !== 'search') return;
await this.process(message, args);
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: Interaction) {
if (interaction.isCommand()) {
if (typeof interaction.commandName === 'undefined') return;
if ((interaction.commandName).toLowerCase() !== 'search') return;
await this.process(interaction, interaction.options);
}
else if (interaction.isButton()) {
if(!interaction.guild || !interaction.guildId) return;
if (!this.tryParseJSONObject(interaction.customId)) return;
let payload = JSON.parse(interaction.customId);
if(!interaction.member?.user?.id) return;
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_P stands for MusicPlayer_Search
data.q stands for data.query
*/
if (typeof payload.m === 'undefined' ||
typeof payload.a === 'undefined' ||
payload.m !== 'MP_S' ||
payload.a !== 'search') return;
await this.process(interaction, payload.d.q);
}
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(interaction), interaction.options);
}
async process(data: Interaction | Message, args: any) {
const isSlashCommand = data instanceof CommandInteraction && data.isCommand();
const isButton = data instanceof Interaction && data.isButton();
const isMessage = data instanceof Message;
async GuildButtonInteractionCreate(interaction: ButtonInteraction) {
if (!this.isJsonValid(interaction.customId)) return;
const payload = JSON.parse(interaction.customId);
if (!isSlashCommand && !isMessage && !isButton) return;
/*
Discord have 100 char custom id char limit
So we need to shorten our json.
MP_P stands for MusicPlayer_Search
data.q stands for data.query
*/
if (!data.member) return;
if (!data.guild) return;
if (!data.guildId) return;
if (typeof payload.m === 'undefined' ||
typeof payload.a === 'undefined' ||
payload.m !== 'MP_S' ||
payload.a !== 'search') return;
await this.run(new HybridInteractionMessage(interaction), payload.d.q);
}
async run(data: HybridInteractionMessage, args: any) {
const guild = data.getGuild();
const user = data.getUser();
const member = data.getMember();
const channel = data.getChannel();
if (!guild || !user || !member || !channel) return;
let query;
if (isMessage) {
if (data === null || !data.guildId || data.member === null || data.guild === null) return;
if (data.isMessage()) {
if (args.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_INFO(data.getRaw())] });
if (args.length === 0) {
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.SEARCH_INFO(data)] });
}
query = args.join(' ');
}
else if (isSlashCommand) {
else if (data.isSlashCommand())
query = args.getSubcommand();
}
else if (isButton) {
else if (data.isButton())
query = args;
}
if (!query) return;
if (!(data.channel instanceof TextChannel)) return;
let guildMember = data.member;
const voiceChannel = member.voice.channel;
if(isButton)
guildMember = data.guild.members.cache.get(data.user.id)!
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
if (!guildMember.voice.channel)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data)] });
let voiceChannel = guildMember.voice.channel;
if (!DiscordMusicPlayer.isGuildInstanceExists(data.guildId)) {
await joinVoiceChannelProcedure(data, null, voiceChannel);
}
let instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
if (instance!.voiceChannel.id !== voiceChannel.id)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data)] });
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(data, instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
}
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
await joinVoiceChannelProcedure(data.getRaw(), null, voiceChannel);
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (!instance) return;
let result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
if (instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] });
if (!result) return;
if (!instance.isConnected()) {
await joinVoiceChannelProcedure(data.getRaw(), instance!, voiceChannel);
instance = DiscordMusicPlayer.getGuildInstance(guild.id);
}
let result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
if (!result) return; // TODO: Handle when search returned nothing
const menuOptions: MessageSelectOptionData[] = [];
const messageSelectMenu = new MessageSelectMenu();
/*
Discord have 100 char custom id char limit
@@ -166,14 +148,14 @@ export default class Search {
m: 'MP_SM',
a: 'play',
d: {
r: guildMember.id,
r: user.id,
v: voiceChannel.id
}
}))
messageSelectMenu.setPlaceholder('Nothing selected');
for(let song of result) {
if(!song.title) continue;
for (let song of result) {
if (!song.title) continue;
menuOptions.push({
label: song.title,
description: `${song.durationInSec} sec | ${song.views} views`,
@@ -186,13 +168,11 @@ export default class Search {
const row = new MessageActionRow();
row.addComponents(messageSelectMenu);
await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data, result)], components: [row] });
return;
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data.getRaw(), result)], components: [row] });
}
tryParseJSONObject(jsonString: string) {
isJsonValid(jsonString: string) {
try {
let o = JSON.parse(jsonString);
if (o && typeof o === "object") {
src/discord/MusicPlayer/Skip.ts
+32 -37
View File
@@ -1,5 +1,7 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeErrorEmbed, sendMessageOrInteractionResponse } from "../../utils/DiscordMessage";
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
@@ -36,55 +38,48 @@ const EMBEDS = {
}
}
export default class Skip {
export default class Skip extends DiscordModule{
async onCommand(command: string, args: any, message: Message) {
if (command.toLowerCase() !== 'skip') return;
await this.process(message, args);
public id = "Discord_MusicPlayer_Skip";
public commands = ["skip"];
public commandInteractionName = "skip";
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
async interactionCreate(interaction: CommandInteraction) {
if (interaction.isCommand()) {
if (typeof interaction.commandName === 'undefined') return;
if ((interaction.commandName).toLowerCase() !== 'skip') return;
await this.process(interaction, interaction.options);
}
async GuildModuleCommandInteractionCreate(interaction: CommandInteraction) {
await this.run(new HybridInteractionMessage(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;
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 (!data.member.voice.channel)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data)] });
async run(data: HybridInteractionMessage, args: any) {
if (!channel) return;
const guild = data.getGuild();
const member = data.getMember();
let voiceChannel = data.member.voice.channel;
if (!guild || !member) return;
if(!DiscordMusicPlayer.isGuildInstanceExists(data.guildId))
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] });
const voiceChannel = member.voice.channel;
const instance = DiscordMusicPlayer.getGuildInstance(data.guildId);
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
if(instance!.voiceChannel.id !== data.member.voice.channel.id)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data)] }, true);
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(instance?.queue.track.length === 0)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data)] });
if(!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
instance!.skipTrack();
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
if(instance?.queue.track.length === 0)
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.SKIPPED_LASTSONG(data)] });
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
instance.skipTrack();
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED_LASTSONG(data.getRaw())] });
else
return await sendMessageOrInteractionResponse(data, { embeds: [EMBEDS.SKIPPED(data)] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED(data.getRaw())] });
}
}