Bluemedia/muse
1
0
Fork 0
mirror of https://github.com/BluemediaDev/muse.git synced 2025-08-05 23:43:30 +02:00
Code Issues Projects Releases Packages 1 Wiki Activity

Merge branch 'master' into feature/slash-commands

Browse source
This commit is contained in:
Max Isom 2022-01-19 13:40:48 -06:00
commit ed4e7b5ceb
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
36 changed files with 1464 additions and 1665 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/commands/play.ts
View file

@ -2,6 +2,7 @@ import {CommandInteraction, GuildMember} from 'discord.js';
import {URL} from 'url';
import {Except} from 'type-fest';
import {SlashCommandBuilder} from '@discordjs/builders';
import shuffle from 'array-shuffle';
import {inject, injectable} from 'inversify';
import Command from '.';
import {TYPES} from '../types.js';
@ -10,7 +11,7 @@ import PlayerManager from '../managers/player.js';
import {getMostPopularVoiceChannel, getMemberVoiceChannel} from '../utils/channels.js';
import errorMsg from '../utils/error-msg.js';
import GetSongs from '../services/get-songs.js';
import Settings from '../models/settings.js';
import {prisma} from '../utils/db.js';
@injectable()
export default class implements Command {
@ -23,7 +24,10 @@ export default class implements Command {
.setDescription('YouTube URL, Spotify URL, or search query'))
.addBooleanOption(option => option
.setName('immediate')
.setDescription('adds track to the front of the queue'));
.setDescription('adds track to the front of the queue'))
.addBooleanOption(option => option
.setName('shuffle')
.setDescription('shuffles the input if it\'s a playlist'));
public requiresVC = true;
@ -39,8 +43,13 @@ export default class implements Command {
public async executeFromInteraction(interaction: CommandInteraction): Promise<void> {
const [targetVoiceChannel] = getMemberVoiceChannel(interaction.member as GuildMember) ?? getMostPopularVoiceChannel(interaction.guild!);
const settings = await Settings.findByPk(interaction.guild!.id);
const {playlistLimit} = settings!;
const settings = await prisma.setting.findUnique({where: {guildId: interaction.guild!.id}});
if (!settings) {
throw new Error('Could not find settings for guild');
}
const {playlistLimit} = settings;
const player = this.playerManager.get(interaction.guild!.id);
const wasPlayingSong = player.getCurrent() !== null;
@ -67,8 +76,9 @@ export default class implements Command {
}
const addToFrontOfQueue = interaction.options.getBoolean('immediate');
const shuffleAdditions = interaction.options.getBoolean('shuffle');
const newSongs: Array<Except<QueuedSong, 'addedInChannelId'>> = [];
let newSongs: Array<Except<QueuedSong, 'addedInChannelId'>> = [];
let extraMsg = '';
await interaction.deferReply();
@ -139,6 +149,10 @@ export default class implements Command {
return;
}
if (shuffleAdditions) {
newSongs = shuffle(newSongs);
}
newSongs.forEach(song => {
player.add({...song, addedInChannelId: interaction.channel?.id}, {immediate: addToFrontOfQueue ?? false});
});