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/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;
}