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

Support localization

Browse Source
This commit is contained in:
yuzu
2022-06-07 03:08:27 +07:00
parent fb6808fa59
commit 6919bb7d90
19 changed files with 932 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/MusicPlayer/Join.ts
+60 -60
View File
@@ -1,5 +1,3 @@
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import {
Message,
CommandInteraction,
@@ -14,6 +12,8 @@ import {
TextChannel,
VoiceBasedChannel
} from 'discord.js';
import { I18n } from 'i18n';
import {
makeSuccessEmbed,
makeErrorEmbed,
@@ -31,65 +31,57 @@ import DiscordMusicPlayer, {
DiscordMusicPlayerLoopMode
} from '../../providers/DiscordMusicPlayer';
const EMBEDS = {
VOICECHANNEL_JOINED: (data: Message | Interaction) => {
return makeSuccessEmbed({
title: `Success`,
description: `Joined voice channel`,
user: data instanceof Interaction ? data.user : data.author
});
},
VOICECHANNEL_DISCONNECTED: (data: Message | Interaction) => {
return makeSuccessEmbed({
title: `Disconnected`,
description: `I got disconnected from the voice channel`,
user: data instanceof Interaction ? data.user : data.author
});
},
VOICECHANNEL_INUSE: (data: Message | Interaction) => {
let haveForceMove =
data instanceof Message
? (data as Message).member!.permissions.has([Permissions.FLAGS.MOVE_MEMBERS])
: ((data as Interaction).member! as GuildMember).permissions.has([Permissions.FLAGS.MOVE_MEMBERS]);
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import Locale from '../../services/Locale';
const EMBEDS = {
VOICECHANNEL_JOINED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: locale.__('musicplayer_join.success'),
user: data.getUser()
});
},
VOICECHANNEL_DISCONNECTED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: locale.__('musicplayer_join.disconnected'),
description: locale.__('musicplayer_join.disconnected_reason_disconnected'),
user: data.getUser()
});
},
VOICECHANNEL_INUSE: (data: HybridInteractionMessage, locale: I18n, haveForceMove: boolean) => {
return makeErrorEmbed({
title: `I can't open portal to parallel universe`,
description: `I can't join mutiple voice channel on the same guild.
I wish I had a superpower, maybe... one day I will.
There are also somebody listening to the music in the voice channel I'm currently in.${
!haveForceMove
? ` Wait until I finish playing there or I'm alone there. Better yet, join them!`
: " Wait until I finish playing there or I'm alone there. Better yet, join them! \n\n**Or... just (ab)use your admin permissions and move me to where you want!**"
title: locale.__('musicplayer_join.error'),
description: `${locale.__('musicplayer_join.in_use')}\n\n${locale.__('musicplayer_join.in_use_wait')}${
haveForceMove ? locale.__('musicplayer_join.can_force_move') : ''
}`,
user: data instanceof Interaction ? data.user : data.author
user: data.getUser()
});
},
VOICECHANNEL_ALREADY_JOINED: (data: Message | Interaction) => {
VOICECHANNEL_ALREADY_JOINED: (data: HybridInteractionMessage, locale: I18n) => {
return makeInfoEmbed({
title: `I'm already here`,
description: `Already in the voice channel you are currently connected to`,
user: data instanceof Interaction ? data.user : data.author
title: locale.__('musicplayer_join.already_joined_title'),
description: locale.__('musicplayer_join.already_joined_description'),
user: data.getUser()
});
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: data instanceof Interaction ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
MUSIC_ERROR: (data: Message | Interaction, err: Error) => {
MUSIC_ERROR: (data: HybridInteractionMessage, locale: I18n, error: Error) => {
return makeErrorEmbed({
title: `Error while playing music, skipping this track`,
description: `${err.message}`,
user: data instanceof Interaction ? data.user : data.author
title: locale.__('musicplayer.track_error'),
description: error.message,
user: data.getUser()
});
},
NOW_PLAYING: (data: Message | Interaction, track: ValidTracks) => {
NOW_PLAYING: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
const embed = makeInfoEmbed({
title: ' Now playing',
icon: '🎵',
description: `${track.title}`,
title: locale.__('musicplayer.now_playing'),
icon: '🎵 ',
description: track.title,
user: DiscordProvider.client.user
});
@@ -101,10 +93,10 @@ const EMBEDS = {
return embed;
},
NOW_REPEATING: (data: Message | Interaction, track: ValidTracks) => {
NOW_REPEATING: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
const embed = makeInfoEmbed({
title: ' Now playing (Repeating)',
icon: '🎵',
title: locale.__('musicplayer.now_playing_repeating'),
icon: '🎵 ',
description: `${track.title}`,
user: DiscordProvider.client.user
});
@@ -144,6 +136,8 @@ export async function joinVoiceChannelProcedure(
const bot = guild.me;
if (!bot) return;
const locale = await Locale.getGuildLocale(guild.id);
// If already in VoiceChannel
if (bot.voice.channelId) {
// But, no music instance yet (The bot might just restarted)
@@ -161,7 +155,7 @@ export async function joinVoiceChannelProcedure(
instance!.joinVoiceChannel(voiceChannel, channel);
if (!isAcceptableInteraction)
await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.VOICECHANNEL_JOINED(data.getRaw())]
embeds: [EMBEDS.VOICECHANNEL_JOINED(data, locale)]
});
}
// And, already have instance on the guild
@@ -170,7 +164,7 @@ export async function joinVoiceChannelProcedure(
if (channel.id === instance.voiceChannel.id) {
if (!isAcceptableInteraction)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.VOICECHANNEL_ALREADY_JOINED(data.getRaw())]
embeds: [EMBEDS.VOICECHANNEL_ALREADY_JOINED(data, locale)]
});
else return;
}
@@ -181,7 +175,13 @@ export async function joinVoiceChannelProcedure(
if (activeMembers.size > 0) {
if (!isAcceptableInteraction)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.VOICECHANNEL_INUSE(data.getRaw())]
embeds: [
EMBEDS.VOICECHANNEL_INUSE(
data,
locale,
member.permissions.has([Permissions.FLAGS.MOVE_MEMBERS])
)
]
});
else return;
}
@@ -191,7 +191,7 @@ export async function joinVoiceChannelProcedure(
await bot.voice.setChannel(voiceChannel);
if (!isAcceptableInteraction)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.VOICECHANNEL_JOINED(data.getRaw())]
embeds: [EMBEDS.VOICECHANNEL_JOINED(data, locale)]
});
else return;
}
@@ -207,7 +207,7 @@ export async function joinVoiceChannelProcedure(
instance!.joinVoiceChannel(voiceChannel, channel);
if (!isAcceptableInteraction)
await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.VOICECHANNEL_JOINED(data.getRaw())] });
await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.VOICECHANNEL_JOINED(data, locale)] });
}
if (!instance) return;
@@ -235,12 +235,12 @@ export async function joinVoiceChannelProcedure(
if (event.instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current) {
isLoopMessageSent = true;
await sendMessage(event.instance.textChannel, undefined, {
embeds: [EMBEDS.NOW_REPEATING(data.getRaw(), event.instance.queue.track[0])],
embeds: [EMBEDS.NOW_REPEATING(data, locale, event.instance.queue.track[0])],
components: [row]
});
} else {
await sendMessage(event.instance.textChannel, undefined, {
embeds: [EMBEDS.NOW_PLAYING(data.getRaw(), event.instance.queue.track[0])],
embeds: [EMBEDS.NOW_PLAYING(data, locale, event.instance.queue.track[0])],
components: [row]
});
}
@@ -250,7 +250,7 @@ export async function joinVoiceChannelProcedure(
instance.events.on('error', async (event: PlayerErrorEvent) => {
if (event.instance.textChannel) {
await sendMessage(event.instance.textChannel, undefined, {
embeds: [EMBEDS.MUSIC_ERROR(data.getRaw(), event.error)]
embeds: [EMBEDS.MUSIC_ERROR(data, locale, event.error)]
});
}
});
@@ -258,7 +258,7 @@ export async function joinVoiceChannelProcedure(
instance.events.on('disconnect', async (event: VoiceDisconnectedEvent) => {
if (event.instance.textChannel) {
await sendMessage(event.instance.textChannel, undefined, {
embeds: [EMBEDS.VOICECHANNEL_DISCONNECTED(data.getRaw())]
embeds: [EMBEDS.VOICECHANNEL_DISCONNECTED(data, locale)]
});
}
@@ -285,15 +285,15 @@ export default class Join extends DiscordModule {
if (!guild || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())]
embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)]
});
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
console.log(data.isButton);
await joinVoiceChannelProcedure(data, instance, voiceChannel);
}
}
src/discord/MusicPlayer/Leave.ts
+25 -22
View File
@@ -1,34 +1,35 @@
import { I18n } from "i18n";
import { Message, CommandInteraction } from "discord.js";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
import Locale from "../../services/Locale";
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
const EMBEDS = {
VOICECHANNEL_LEFT: (data: Message | Interaction) => {
VOICECHANNEL_LEFT: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: `Success`,
description: `Left the voice channel`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_leave.success'),
user: data.getUser()
});
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
}
}
@@ -54,20 +55,22 @@ export default class Leave extends DiscordModule {
if(!guild || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] });
DiscordMusicPlayer.destoryGuildInstance(guild.id);
await sendHybridInteractionMessageResponse(data, { embeds:[EMBEDS.VOICECHANNEL_LEFT(data.getRaw())] });
await sendHybridInteractionMessageResponse(data, { embeds:[EMBEDS.VOICECHANNEL_LEFT(data, locale)] });
return;
}
src/discord/MusicPlayer/Loop.ts
+33 -30
View File
@@ -1,47 +1,49 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { I18n } from "i18n";
import { Message, CommandInteraction, Interaction, MessageActionRow, ButtonInteraction, MessageSelectMenu, MessageSelectOptionData } from "discord.js";
import { makeErrorEmbed, makeSuccessEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from "../../providers/DiscordMusicPlayer";
import DiscordMusicPlayer, { DiscordMusicPlayerLoopMode } from "../../providers/DiscordMusicPlayer";
import Locale from "../../services/Locale";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { makeErrorEmbed, makeSuccessEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
const EMBEDS = {
INVALID_LOOP_MODE: (data: Message | Interaction) => {
INVALID_LOOP_MODE: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `Invalid loop mode`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_loop.invalid'),
user: data.getUser()
});
},
LOOP_STATUS: (data: Message | Interaction, loopMode: DiscordMusicPlayerLoopMode) => {
LOOP_STATUS: (data: HybridInteractionMessage, locale: I18n, loopMode: DiscordMusicPlayerLoopMode) => {
let embed = makeInfoEmbed({
title: `Current loop mode is ${loopMode}`,
description: "Available loop mode: ``None`` ``Current``",
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_loop.info', loopMode),
description: locale.__('musicplayer_loop.valid_args'),
user: data.getUser()
});
return embed;
},
LOOP_SET: (data: Message | Interaction, loopMode: DiscordMusicPlayerLoopMode) => {
LOOP_SET: (data: HybridInteractionMessage, locale: I18n, loopMode: DiscordMusicPlayerLoopMode) => {
let embed = makeSuccessEmbed({
title: `Loop mode is now set to ${loopMode}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_loop.loop_set', loopMode),
user: data.getUser()
});
return embed;
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
}
}
@@ -67,6 +69,7 @@ export default class Loop extends DiscordModule {
const channel = data.getChannel();
if (!guild || !user || !member || !channel) return;
const locale = await Locale.getGuildLocale(guild.id);
let query;
@@ -80,30 +83,30 @@ export default class Loop extends DiscordModule {
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if (instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] }, true);
if (instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if (!query)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOP_STATUS(data.getRaw(), instance.getLoopMode())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOP_STATUS(data, locale, instance.getLoopMode())] });
let enumKey = Object.keys(DiscordMusicPlayerLoopMode)[Object.values(DiscordMusicPlayerLoopMode).indexOf(query.toLowerCase())];
if(enumKey) {
instance.setLoopMode(DiscordMusicPlayerLoopMode[enumKey as keyof typeof DiscordMusicPlayerLoopMode]);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOP_SET(data.getRaw(), instance.getLoopMode())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOP_SET(data, locale, instance.getLoopMode())] });
}
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.INVALID_LOOP_MODE(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.INVALID_LOOP_MODE(data, locale)] });
}
}
src/discord/MusicPlayer/NowPlaying.ts
+16 -12
View File
@@ -1,16 +1,19 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, MessageActionRow, MessageButton } from "discord.js";
import { I18n } from "i18n";
import { Message, CommandInteraction, Interaction, MessageActionRow, TextChannel, MessageButton } from "discord.js";
import { makeErrorEmbed, makeInfoEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer, { ValidTracks } from "../../providers/DiscordMusicPlayer";
import Locale from "../../services/Locale";
import { makeErrorEmbed, makeInfoEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
const EMBEDS = {
NOW_PLAYING: (data: Message | Interaction, track: ValidTracks) => {
NOW_PLAYING: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
const embed = makeInfoEmbed({
title: ' Now playing',
icon: '🎵',
description: `${track.title}`,
title: locale.__('musicplayer.now_playing'),
icon: '🎵 ',
description: track.title,
user: DiscordProvider.client.user
});
@@ -21,10 +24,10 @@ const EMBEDS = {
return embed;
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
}
}
@@ -48,8 +51,9 @@ export default class NowPlaying extends DiscordModule {
const guild = data.getGuild();
if(!guild) return;
const locale = await Locale.getGuildLocale(guild.id);
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance || !instance.queue.track[0]) return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
if(!instance || !instance.queue.track[0]) return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
const row = new MessageActionRow()
.addComponents(
@@ -60,6 +64,6 @@ export default class NowPlaying extends DiscordModule {
.setStyle('LINK'),
)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOW_PLAYING(data.getRaw(), instance.queue.track[0])], components: [row] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOW_PLAYING(data, locale, instance.queue.track[0])], components: [row] });
}
}
src/discord/MusicPlayer/Pause.ts
+29 -24
View File
@@ -1,39 +1,43 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeInfoEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import { I18n } from "i18n";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
import Locale from "../../services/Locale";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { makeSuccessEmbed, makeInfoEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
const EMBEDS = {
PAUSED: (data: Message | Interaction) => {
PAUSED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: `Paused`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_pause.paused'),
user: data.getUser()
});
},
ALREADY_PAUSED: (data: Message | Interaction) => {
ALREADY_PAUSED: (data: HybridInteractionMessage, locale: I18n) => {
return makeInfoEmbed({
title: `Already paused`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_pause.already_paused'),
user: data.getUser()
});
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
}
}
@@ -58,27 +62,28 @@ export default class Pause extends DiscordModule{
const member = data.getMember();
if (!guild || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] }, true);
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(instance.isPaused())
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ALREADY_PAUSED(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ALREADY_PAUSED(data, locale)] });
instance.pausePlayer();
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.PAUSED(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.PAUSED(data, locale)] });
}
}
src/discord/MusicPlayer/Play.ts
+170 -115
View File
@@ -1,92 +1,98 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import {
Message,
CommandInteraction,
Interaction,
VoiceChannel,
MessageActionRow,
MessageButton,
SelectMenuInteraction,
ButtonInteraction
} from 'discord.js';
import { I18n } from 'i18n';
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";
import { joinVoiceChannelProcedure } from './Join';
import DiscordProvider from '../../providers/Discord';
import DiscordMusicPlayer, { ValidTracks } from '../../providers/DiscordMusicPlayer';
import Locale from '../../services/Locale';
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import {
makeErrorEmbed,
makeSuccessEmbed,
sendHybridInteractionMessageResponse,
makeInfoEmbed
} from '../../utils/DiscordMessage';
const EMBEDS = {
PLAY_INFO: (data: Message | Interaction) => {
PLAY_INFO: (data: HybridInteractionMessage, locale: I18n) => {
return makeInfoEmbed({
title: 'Play',
description: `Play a song`,
title: locale.__('musicplayer_play.title'),
description: locale.__('musicplayer_play.info'),
fields: [
{
name: 'Arguments',
value: '``Search query or Link``'
name: locale.__('common.available_args'),
value: locale.__('musicplayer_play.valid_args'),
}
],
user: (data instanceof Interaction) ? data.user : data.author
user: data.getUser()
});
},
YOUTUBE_ONLY: (data: Message | Interaction) => {
return makeErrorEmbed({
title: `Only youtube.com link is supported for now`,
user: (data instanceof Interaction) ? data.user : data.author
});
},
INVALID_LINK: (data: Message | Interaction) => {
return makeErrorEmbed({
title: `Invalid Link`,
user: (data instanceof Interaction) ? data.user : data.author
});
},
ADDED_QUEUE: (data: Message | Interaction, track: ValidTracks) => {
ADDED_QUEUE: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks) => {
let embed = makeSuccessEmbed({
title: `Song added to queue!`,
description: `${track.title}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_play.queue_added_song'),
description: track.title,
user: data.getUser()
});
const highestResolutionThumbnail = track.thumbnails.reduce((prev, current) => (prev.height * prev.width > current.height * current.width) ? prev : current)
const highestResolutionThumbnail = track.thumbnails.reduce((prev, current) =>
prev.height * prev.width > current.height * current.width ? prev : current
);
if (highestResolutionThumbnail) embed.setImage(highestResolutionThumbnail.url);
if(highestResolutionThumbnail)
embed.setImage(highestResolutionThumbnail.url);
return embed;
},
ADDED_SONGS_QUEUE: (data: Message | Interaction, track: ValidTracks[]) => {
ADDED_SONGS_QUEUE: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks[]) => {
let embed = makeSuccessEmbed({
title: `Songs added to queue!`,
description: `Added ${track.length} songs to queue`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_play.queue_added_songs'),
description: locale.__('musicplayer_play.queue_added_songs_description', track.length.toString()),
user: data.getUser()
});
return embed;
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
},
LOOKUP_ERROR: (data: Message | Interaction, error: Error) => {
LOOKUP_ERROR: (data: HybridInteractionMessage, locale: I18n, error: Error) => {
let errorMessage = '';
let errorMessage = "";
if(error.message === "While getting info from url\nPrivate video")
errorMessage = "This is a private video";
if (error.message === 'While getting info from url\nPrivate video') errorMessage = 'This is a private video';
else
errorMessage = error.message.replace("While getting info from url\n", "").replace("While getting info from url", "");
errorMessage = error.message
.replace('While getting info from url\n', '')
.replace('While getting info from url', '');
return makeErrorEmbed({
title: `Error while looking up the song`,
description: `${errorMessage}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_play.error'),
description: errorMessage,
user: data.getUser()
});
},
}
}
};
export default class Play extends DiscordModule {
public id = "Discord_MusicPlayer_Play";
public commands = ["play", "p"];
public commandInteractionName = "play";
public id = 'Discord_MusicPlayer_Play';
public commands = ['play', 'p'];
public commandInteractionName = 'play';
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
@@ -105,6 +111,8 @@ export default class Play extends DiscordModule {
if (!guild || !member || !user) return;
if (!this.isJSONValid(interaction.customId)) return;
const locale = await Locale.getGuildLocale(guild.id);
let payload = JSON.parse(interaction.customId);
if (typeof payload.m === 'undefined' || typeof payload.a === 'undefined') return;
@@ -118,7 +126,6 @@ export default class Play extends DiscordModule {
*/
if (payload.m === 'MP_P' && payload.a === 'arp') {
if (typeof payload.d === 'undefined') return;
let data = payload.d.split('$');
@@ -128,7 +135,7 @@ export default class Play extends DiscordModule {
c: data[0],
v: data[1],
l: data[2]
}
};
await interaction.deferReply();
@@ -137,17 +144,24 @@ export default class Play extends DiscordModule {
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(hybridData.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(hybridData, locale)] },
true
);
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
await joinVoiceChannelProcedure(new HybridInteractionMessage(interaction) , null, voiceChannel);
await joinVoiceChannelProcedure(new HybridInteractionMessage(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(hybridData.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(hybridData, locale)] },
true
);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(new HybridInteractionMessage(interaction), instance!, voiceChannel);
@@ -156,7 +170,9 @@ export default class Play extends DiscordModule {
if (!instance) return;
let playlist = await DiscordMusicPlayer.getYouTubeSongsInPlayList(`https://www.youtube.com/watch?v=${payload.d.v}&list=${payload.d.l}`);
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;
});
@@ -165,15 +181,18 @@ export default class Play extends DiscordModule {
instance.addTrackToQueue(song);
}
if(hybridData.getSelectMenu().message instanceof Message)
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);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.ADDED_SONGS_QUEUE(hybridData, locale, songs)] },
true
);
}
}
async GuildSelectMenuInteractionCreate(interaction: SelectMenuInteraction) {
const hybridData = new HybridInteractionMessage(interaction);
const guild = hybridData.getGuild();
const member = hybridData.getMember();
@@ -182,6 +201,7 @@ export default class Play extends DiscordModule {
if (!guild || !member || !user) return;
if (!this.isJSONValid(interaction.customId)) return;
const locale = await Locale.getGuildLocale(guild.id);
let payload = JSON.parse(interaction.customId);
/*
@@ -194,7 +214,6 @@ export default class Play extends DiscordModule {
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);
@@ -203,16 +222,23 @@ export default class Play extends DiscordModule {
if (!voiceChannel || !(voiceChannel instanceof VoiceChannel)) return;
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(interaction)] }, true);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(new HybridInteractionMessage(interaction), locale)] },
true
);
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
await joinVoiceChannelProcedure(new HybridInteractionMessage(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);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(new HybridInteractionMessage(interaction), locale)] },
true
);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(new HybridInteractionMessage(interaction), instance!, voiceChannel);
@@ -221,39 +247,52 @@ export default class Play extends DiscordModule {
if (!instance) return;
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(DiscordMusicPlayer.parseYouTubeLink(interaction.values[0])).catch((err) => {
sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.LOOKUP_ERROR(hybridData.getRaw(), err)] }, true);
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(
DiscordMusicPlayer.parseYouTubeLink(interaction.values[0])
).catch((err) => {
sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.LOOKUP_ERROR(hybridData, locale, err)] },
true
);
return null;
});
if (!result) return;
instance.addTrackToQueue(result);
return await sendHybridInteractionMessageResponse(hybridData, { embeds: [EMBEDS.ADDED_QUEUE(interaction, result)] }, true);
return await sendHybridInteractionMessageResponse(
hybridData,
{ embeds: [EMBEDS.ADDED_QUEUE(new HybridInteractionMessage(interaction), locale, result)] },
true
);
}
}
async run(data: HybridInteractionMessage, args: any) {
let query;
const guild = data.getGuild();
const channel = data.getChannel();
const member = data.getMember();
if (!guild || !channel || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
if (data.isMessage()) {
if (args.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.PLAY_INFO(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.PLAY_INFO(data, locale)] });
query = args.join(' ');
}
else if (data.isSlashCommand()) {
} else if (data.isSlashCommand()) {
query = args.getSubcommand();
}
if (!query || !guild || !channel || !member) return;
if (!query) return;
if (!member.voice.channel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)]
});
const voiceChannel = member.voice.channel;
@@ -264,7 +303,11 @@ export default class Play extends DiscordModule {
let instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if (instance!.voiceChannel.id !== member.voice.channel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(
data,
{ embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] },
true
);
if (!instance!.isConnected()) {
await joinVoiceChannelProcedure(data, instance!, voiceChannel);
@@ -276,18 +319,22 @@ export default class Play extends DiscordModule {
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) {
instance.addTrackToQueue(song);
}
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_SONGS_QUEUE(data.getRaw(), songs)] }, true);
return await sendHybridInteractionMessageResponse(
data,
{ embeds: [EMBEDS.ADDED_SONGS_QUEUE(data, locale, songs)] },
true
);
}
let result = await DiscordMusicPlayer.searchYouTubeByYouTubeLink(linkData).catch((err) => {
sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOKUP_ERROR(data.getRaw(), err)] }, true);
sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.LOOKUP_ERROR(data, locale, err)] }, true);
return null;
});
@@ -300,23 +347,28 @@ export default class Play extends DiscordModule {
instance.addTrackToQueue(result);
if (linkData.list) {
const row = new MessageActionRow()
.addComponents(
new MessageButton()
.setEmoji('✅')
.setCustomId(JSON.stringify({
const row = new MessageActionRow().addComponents(
new MessageButton()
.setEmoji('✅')
.setCustomId(
JSON.stringify({
m: 'MP_P',
a: 'arp', // Add remaining playlist
d: `${voiceChannel.id}$${linkData.videoId}$${linkData.list}`
}))
.setLabel(' Add the remaining songs in the playlist')
.setStyle('PRIMARY')
)
})
)
.setLabel(' Add the remaining songs in the playlist')
.setStyle('PRIMARY')
);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result)], components: [row] });
}
else
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result)] });
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.ADDED_QUEUE(data, locale, result)],
components: [row]
});
} else
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.ADDED_QUEUE(data, locale, result)]
});
} else {
let result = await DiscordMusicPlayer.searchYouTubeByQuery(query);
@@ -324,7 +376,6 @@ export default class Play extends DiscordModule {
instance.addTrackToQueue(result[0]);
if (result.length > 1) {
// TODO: Find a better logic than this
// If the first result title is exact match with the query or first title contains half the space of the query, it's probably a sentence
// then we don't need to show the search results
@@ -333,37 +384,41 @@ export default class Play extends DiscordModule {
// The query length is too long to fit in json
if (query.length > 100 - 51) return;
const row = new MessageActionRow()
.addComponents(
new MessageButton()
.setEmoji('🔎')
.setCustomId(JSON.stringify({
const row = new MessageActionRow().addComponents(
new MessageButton()
.setEmoji('🔎')
.setCustomId(
JSON.stringify({
m: 'MP_S',
a: 'search',
d: {
q: query
}
}))
.setLabel(' Not this? Search!')
.setStyle('PRIMARY')
)
})
)
.setLabel(' Not this? Search!')
.setStyle('PRIMARY')
);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result[0])], components: [row] });
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.ADDED_QUEUE(data, locale, result[0])],
components: [row]
});
}
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.ADDED_QUEUE(data.getRaw(), result[0])] });
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.ADDED_QUEUE(data, locale, result[0])]
});
}
}
isJSONValid(jsonString: string) {
try {
let o = JSON.parse(jsonString);
if (o && typeof o === "object") {
if (o && typeof o === 'object') {
return true;
}
}
catch (e) { }
} catch (e) {}
return false;
}
}
}
src/discord/MusicPlayer/Queue.ts
+64 -39
View File
@@ -1,62 +1,83 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction, TextChannel } from 'discord.js';
import { I18n } from 'i18n';
import { Message, CommandInteraction, Interaction, TextChannel } from "discord.js";
import { makeErrorEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
import DiscordMusicPlayer, {
DiscordMusicPlayerInstance,
DiscordMusicPlayerLoopMode
} from '../../providers/DiscordMusicPlayer';
import Locale from '../../services/Locale';
import DiscordMusicPlayer, { DiscordMusicPlayerInstance, DiscordMusicPlayerLoopMode } from "../../providers/DiscordMusicPlayer";
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import { makeErrorEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from '../../utils/DiscordMessage';
const EMBEDS = {
QUEUE: (data: Message | Interaction, instance: DiscordMusicPlayerInstance) => {
QUEUE: (data: HybridInteractionMessage, locale: I18n, instance: DiscordMusicPlayerInstance) => {
const queue = instance.queue;
if(!queue.track[0])
if (!queue.track[0])
return makeInfoEmbed({
title: `Queue`,
description: `The queue is empty!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_queue.title'),
description: locale.__('musicplayer_queue.empty'),
user: data.getUser()
});
else {
if(queue.track.length == 1) {
let queueString = `1. [${queue.track[0].title}](${queue.track[0].url})`
const nowPlayingText = `${
instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current
? ` ${locale.__('musicplayer_queue.looping_current')}`
: ''
}: [${queue.track[0].title}](${queue.track[0].url})`;
if (queue.track.length == 1) {
let queueString = `1. [${queue.track[0].title}](${queue.track[0].url})`;
return makeInfoEmbed({
title: `Queue`,
description: `Now playing${instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current ? " (Looping current)" : ""}: [${queue.track[0].title}](${queue.track[0].url})\n\nThere are ${queue.track.length} song in the queue!\n${queueString}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_queue.title'),
description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}\n
There are ${queue.track.length} song in the queue!\n${queueString}`,
user: data.getUser()
});
}
else if(queue.track.length >= 10) {
let first10 = queue.track.slice(0, 10);
let queueString = first10.map((track, index) => `${index + 1}. [${track.title}](${track.url})`).join("\n");
} else if (queue.track.length >= 10) {
const upcomingText = `[${queue.track[1].title}](${queue.track[1].url})`;
const first10 = queue.track.slice(0, 10);
let queueString = first10
.map((track, index) => `${index + 1}. [${track.title}](${track.url})`)
.join('\n');
return makeInfoEmbed({
title: `Queue`,
description: `Now playing${instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current ? " (Looping current)" : ""}: [${queue.track[0].title}](${queue.track[0].url})\nUpcoming song: [${queue.track[1].title}](${queue.track[1].url})\n\nThere are ${queue.track.length} songs in the queue!\n${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ""}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_queue.title'),
description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
${locale.__('musicplayer_queue.song_x_in_queue', queue.track.length.toString())}
${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ''}`,
user: data.getUser()
});
} else {
let queueString = queue.track.map((track, index) => `${index + 1}. [${track.title}](${track.url})`).join("\n");
const upcomingText = `[${queue.track[1].title}](${queue.track[1].url})`;
const queueString = queue.track
.map((track, index) => `${index + 1}. [${track.title}](${track.url})`)
.join('\n');
return makeInfoEmbed({
title: `Queue`,
description: `Now playing${instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current ? " (Looping current)" : ""}: [${queue.track[0].title}](${queue.track[0].url})\nUpcoming song: [${queue.track[1].title}](${queue.track[1].url})\n\nThere are ${queue.track.length} songs in the queue!\n${queueString}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_queue.title'),
description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
${locale.__('musicplayer_queue.song_x_in_queue', queue.track.length.toString())}
${queueString}`,
user: data.getUser()
});
}
}
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
}
}
};
export default class QueueCommand extends DiscordModule {
public id = 'Discord_MusicPlayer_Queue';
public commands = ['queue', 'q'];
public commandInteractionName = 'queue';
public id = "Discord_MusicPlayer_Queue";
public commands = ["queue", "q"];
public commandInteractionName = "queue";
async GuildOnModuleCommand(args: any, message: Message) {
await this.run(new HybridInteractionMessage(message), args);
}
@@ -66,16 +87,20 @@ export default class QueueCommand extends DiscordModule {
}
async run(data: HybridInteractionMessage, args: any) {
const guild = data.getGuild();
if(!guild) return;
if (!guild) return;
const locale = await Locale.getGuildLocale(guild.id);
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance) return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
if (!instance)
return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)]
});
await sendHybridInteractionMessageResponse(data, { embeds:[EMBEDS.QUEUE(data.getRaw(), instance)] });
await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.QUEUE(data, locale, instance)] });
return;
}
}
}
src/discord/MusicPlayer/Resume.ts
+29 -24
View File
@@ -1,39 +1,42 @@
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeInfoEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import { I18n } from "i18n";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { makeSuccessEmbed, makeInfoEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import Locale from "../../services/Locale";
const EMBEDS = {
RESUMED: (data: Message | Interaction) => {
RESUMED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: `Resumed`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_resume.resumed'),
user: data.getUser()
});
},
NOT_PAUSED: (data: Message | Interaction) => {
NOT_PAUSED: (data: HybridInteractionMessage, locale: I18n) => {
return makeInfoEmbed({
title: `The music is not paused`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_resume.not_paused'),
user: data.getUser()
});
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
}
}
@@ -59,26 +62,28 @@ export default class Resume extends DiscordModule{
if (!guild || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] }, true);
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(!instance.isPaused())
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOT_PAUSED(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NOT_PAUSED(data, locale)] });
instance.resumePlayer();
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.RESUMED(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.RESUMED(data, locale)] });
}
}
src/discord/MusicPlayer/Search.ts
+29 -44
View File
@@ -1,61 +1,45 @@
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 { I18n } from "i18n";
import { joinVoiceChannelProcedure } from "./Join";
import DiscordMusicPlayer, { ValidTracks } from "../../providers/DiscordMusicPlayer";
import Locale from "../../services/Locale";
import DiscordModule, { HybridInteractionMessage } from "../../utils/DiscordModule";
import { makeErrorEmbed, makeSuccessEmbed, sendHybridInteractionMessageResponse, makeInfoEmbed } from "../../utils/DiscordMessage";
const EMBEDS = {
SEARCH_INFO: (data: Message | Interaction) => {
SEARCH_INFO: (data: HybridInteractionMessage, locale: I18n) => {
return makeInfoEmbed({
title: 'Search',
description: `Search for a song`,
title: locale.__('musicplayer_search.title'),
description: locale.__('musicplayer_search.info'),
fields: [
{
name: 'Arguments',
value: '``Search query``'
name: locale.__('common.available_args'),
value: locale.__('musicplayer_search.valid_args'),
}
],
user: (data instanceof Interaction) ? data.user : data.author
user: data.getUser()
});
},
SEARCH_RESULT: (data: Message | Interaction, result: ValidTracks[]) => {
SEARCH_RESULT: (data: HybridInteractionMessage, locale: I18n, result: ValidTracks[]) => {
return makeInfoEmbed({
title: `Search result`,
description: `${result.length} results found\n\n${result.map(track => `- [${track.title}](${track.url})`).join('\n')}`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_search.title_result'),
description: `${locale.__('musicplayer_search.x_results_found', result.length.toString())}\n\n${result.map(track => `- [${track.title}](${track.url})`).join('\n')}`,
user: data.getUser()
});
},
INVALID_LINK: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `Invalid Link`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
ADDED_QUEUE: (data: Message | Interaction, track: ValidTracks) => {
let embed = makeSuccessEmbed({
title: `Song added to queue!`,
description: `${track.title}`,
user: (data instanceof Interaction) ? data.user : data.author
});
const highestResolutionThumbnail = track.thumbnails.reduce((prev, current) => (prev.height * prev.width > current.height * current.width) ? prev : current)
if(highestResolutionThumbnail)
embed.setImage(highestResolutionThumbnail.url);
return embed;
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
}
}
@@ -100,12 +84,13 @@ export default class Search extends DiscordModule {
const channel = data.getChannel();
if (!guild || !user || !member || !channel) return;
const locale = await Locale.getGuildLocale(guild.id);
let query;
if (data.isMessage()) {
if (args.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_INFO(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_INFO(data, locale)] });
query = args.join(' ');
}
@@ -119,7 +104,7 @@ export default class Search extends DiscordModule {
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
if (!DiscordMusicPlayer.isGuildInstanceExists(guild.id))
@@ -129,7 +114,7 @@ export default class Search extends DiscordModule {
if (!instance) return;
if (instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] });
if (!instance.isConnected()) {
await joinVoiceChannelProcedure(data, instance!, voiceChannel);
@@ -173,7 +158,7 @@ export default class Search extends DiscordModule {
const row = new MessageActionRow();
row.addComponents(messageSelectMenu);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data.getRaw(), result)], components: [row] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SEARCH_RESULT(data, locale, result)], components: [row] });
}
src/discord/MusicPlayer/Skip.ts
+24 -21
View File
@@ -4,36 +4,38 @@ import { Message, CommandInteraction, Interaction } from "discord.js";
import { makeSuccessEmbed, makeErrorEmbed, sendHybridInteractionMessageResponse } from "../../utils/DiscordMessage";
import DiscordProvider from "../../providers/Discord";
import DiscordMusicPlayer from "../../providers/DiscordMusicPlayer";
import { I18n } from "i18n";
import Locale from "../../services/Locale";
const EMBEDS = {
SKIPPED: (data: Message | Interaction) => {
SKIPPED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: `Skipped`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_skip.skipped'),
user: data.getUser()
});
},
SKIPPED_LASTSONG: (data: Message | Interaction) => {
SKIPPED_LASTSONG: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({
title: `Skipped, that was the last song`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer_skip.skipped_last_song'),
user: data.getUser()
});
},
NO_MUSIC_PLAYING: (data: Message | Interaction) => {
NO_MUSIC_PLAYING: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `There are no music playing`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.no_music_playing'),
user: data.getUser()
});
},
USER_NOT_IN_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You need to be in the voice channel first!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.not_in_voice'),
user: data.getUser()
});
},
USER_NOT_IN_SAME_VOICECHANNEL: (data: Message | Interaction) => {
USER_NOT_IN_SAME_VOICECHANNEL: (data: HybridInteractionMessage, locale: I18n) => {
return makeErrorEmbed({
title: `You are not in the same voice channel!`,
user: (data instanceof Interaction) ? data.user : data.author
title: locale.__('musicplayer.different_voice_channel'),
user: data.getUser()
});
}
}
@@ -59,27 +61,28 @@ export default class Skip extends DiscordModule{
if (!guild || !member) return;
const locale = await Locale.getGuildLocale(guild.id);
const voiceChannel = member.voice.channel;
if (!voiceChannel)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_VOICECHANNEL(data, locale)] });
const instance = DiscordMusicPlayer.getGuildInstance(guild.id);
if(!instance)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
if(instance.voiceChannel.id !== voiceChannel.id)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data.getRaw())] }, true);
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.USER_NOT_IN_SAME_VOICECHANNEL(data, locale)] }, true);
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.NO_MUSIC_PLAYING(data, locale)] });
instance.skipTrack();
if(instance.queue.track.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED_LASTSONG(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED_LASTSONG(data, locale)] });
else
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED(data.getRaw())] });
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.SKIPPED(data, locale)] });
}
}