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 clean up

Browse Source
This commit is contained in:
yuzu
2022-07-18 14:18:58 +07:00
parent 38f89e85a7
commit 11e0a8f94a
1 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/discord/MusicPlayer/Queue.ts
+23 -23
View File
@@ -9,7 +9,12 @@ import DiscordMusicPlayer, {
import Locale from '../../services/Locale'; import Locale from '../../services/Locale';
import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule'; import DiscordModule, { HybridInteractionMessage } from '../../utils/DiscordModule';
import { makeErrorEmbed, sendHybridInteractionMessageResponse, makeSuccessEmbed, makeInfoEmbed } from '../../utils/DiscordMessage'; import {
makeErrorEmbed,
sendHybridInteractionMessageResponse,
makeSuccessEmbed,
makeInfoEmbed
} from '../../utils/DiscordMessage';
const EMBEDS = { const EMBEDS = {
QUEUE: (data: HybridInteractionMessage, locale: I18n, instance: DiscordMusicPlayerInstance) => { QUEUE: (data: HybridInteractionMessage, locale: I18n, instance: DiscordMusicPlayerInstance) => {
@@ -22,50 +27,44 @@ const EMBEDS = {
user: data.getUser() user: data.getUser()
}); });
else { else {
const nowPlayingText = `${ const nowPlayingText = `${
instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current instance.getLoopMode() === DiscordMusicPlayerLoopMode.Current
? ` ${locale.__('musicplayer_queue.looping_current')}` ? ` ${locale.__('musicplayer_queue.looping_current')}`
: '' : ''
}: [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`; }: [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`;
let description;
if (queue.track.length == 1) { if (queue.track.length == 1) {
let queueString = `1. [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`; let queueString = `1. [${TrackUtils.getTitle(queue.track[0])}](${queue.track[0].url})`;
return makeInfoEmbed({ description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}\n
title: locale.__('musicplayer_queue.title'), There are ${queue.track.length} song in the queue!\n${queueString}`;
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) { } else if (queue.track.length >= 10) {
const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`; const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`;
const first10 = queue.track.slice(0, 10); const first10 = queue.track.slice(0, 10);
let queueString = first10 let queueString = first10
.map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`) .map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`)
.join('\n'); .join('\n');
return makeInfoEmbed({ description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
title: locale.__('musicplayer_queue.title'),
description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n ${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString()})} ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString() })}
${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ''}`, ${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ''}`;
user: data.getUser()
});
} else { } else {
const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`; const upcomingText = `[${TrackUtils.getTitle(queue.track[1])}](${queue.track[1].url})`;
const queueString = queue.track const queueString = queue.track
.map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`) .map((track, index) => `${index + 1}. [${TrackUtils.getTitle(track)}](${track.url})`)
.join('\n'); .join('\n');
description = `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText}
${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString() })}
${queueString}`;
}
return makeInfoEmbed({ return makeInfoEmbed({
title: locale.__('musicplayer_queue.title'), title: locale.__('musicplayer_queue.title'),
description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText} description: description,
${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n
${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString()})}
${queueString}`,
user: data.getUser() user: data.getUser()
}); });
} }
}
}, },
QUEUE_CLEARED: (data: HybridInteractionMessage, locale: I18n) => { QUEUE_CLEARED: (data: HybridInteractionMessage, locale: I18n) => {
return makeSuccessEmbed({ return makeSuccessEmbed({
@@ -95,7 +94,6 @@ export default class QueueCommand extends DiscordModule {
} }
async run(data: HybridInteractionMessage, args: any) { async run(data: HybridInteractionMessage, args: any) {
const guild = data.getGuild(); const guild = data.getGuild();
if (!guild) return; if (!guild) return;
@@ -110,7 +108,9 @@ export default class QueueCommand extends DiscordModule {
if (data.isMessage()) { if (data.isMessage()) {
if (args.length === 0) if (args.length === 0)
return await sendHybridInteractionMessageResponse(data, { embeds: [EMBEDS.QUEUE(data, locale, instance)] }); return await sendHybridInteractionMessageResponse(data, {
embeds: [EMBEDS.QUEUE(data, locale, instance)]
});
query = args.join(' '); query = args.join(' ');
} else if (data.isApplicationCommand()) { } else if (data.isApplicationCommand()) {
@@ -118,7 +118,7 @@ export default class QueueCommand extends DiscordModule {
} }
if (!query) return; if (!query) return;
if(query.toLowerCase() !== 'clear') return; if (query.toLowerCase() !== 'clear') return;
instance.clearQueue(); instance.clearQueue();