diff --git a/.env.example b/.env.example index db26bda..32a74a7 100644 --- a/.env.example +++ b/.env.example @@ -1,5 +1,5 @@ DISCORD_TOKEN= -DATA_DIR= +DATA_DIR=./data YOUTUBE_API_KEY= SPOTIFY_CLIENT_ID= SPOTIFY_CLIENT_SECRET= diff --git a/src/commands/play.ts b/src/commands/play.ts index a907a40..0582ebe 100644 --- a/src/commands/play.ts +++ b/src/commands/play.ts @@ -37,6 +37,7 @@ export default class implements Command { this.getSongs = getSongs; } + // eslint-disable-next-line complexity public async execute(msg: Message, args: string[]): Promise { const [targetVoiceChannel] = getMemberVoiceChannel(msg.member!) ?? getMostPopularVoiceChannel(msg.guild!); @@ -130,7 +131,6 @@ export default class implements Command { if (song) { newSongs.push(song); } else { - console.log(_); await res.stop(errorMsg('that doesn\'t exist')); return; } diff --git a/src/commands/remove.ts b/src/commands/remove.ts new file mode 100644 index 0000000..9c40a71 --- /dev/null +++ b/src/commands/remove.ts @@ -0,0 +1,76 @@ +import {Message} from 'discord.js'; +import {inject, injectable} from 'inversify'; +import {TYPES} from '../types.js'; +import PlayerManager from '../managers/player.js'; +import Command from '.'; +import errorMsg from '../utils/error-msg.js'; + +@injectable() +export default class implements Command { + public name = 'remove'; + public aliases = ['rm']; + public examples = [ + ['remove 1', 'removes the next song in the queue'], + ['rm 5-7', 'remove every song in range 5 - 7 (inclusive) from the queue'], + ]; + + private readonly playerManager: PlayerManager; + + constructor(@inject(TYPES.Managers.Player) playerManager: PlayerManager) { + this.playerManager = playerManager; + } + + public async execute(msg: Message, args: string []): Promise { + const player = this.playerManager.get(msg.guild!.id); + + if (args.length === 0) { + await msg.channel.send(errorMsg('missing song position or range')); + return; + } + + const reg = /^(\d+)-(\d+)$|^(\d+)$/g; // Expression has 3 groups: x-y or z. x-y is range, z is a single digit. + const match = reg.exec(args[0]); + + if (match === null) { + await msg.channel.send(errorMsg('incorrect format')); + return; + } + + if (match[3] === undefined) { // 3rd group (z) doesn't exist -> a range + const range = [parseInt(match[1], 10), parseInt(match[2], 10)]; + + if (range[0] < 1) { + await msg.channel.send(errorMsg('position must be greater than 0')); + return; + } + + if (range[1] > player.queueSize()) { + await msg.channel.send(errorMsg('position is outside of the queue\'s range')); + return; + } + + if (range[0] < range[1]) { + player.removeFromQueue(range[0], range[1] - range[0] + 1); + } else { + await msg.channel.send(errorMsg('range is backwards')); + return; + } + } else { // 3rd group exists -> just one song + const index = parseInt(match[3], 10); + + if (index < 1) { + await msg.channel.send(errorMsg('position must be greater than 0')); + return; + } + + if (index > player.queueSize()) { + await msg.channel.send(errorMsg('position is outside of the queue\'s range')); + return; + } + + player.removeFromQueue(index, 1); + } + + await msg.channel.send(':wastebasket: removed'); + } +} diff --git a/src/inversify.config.ts b/src/inversify.config.ts index c277f7a..6ec1ba2 100644 --- a/src/inversify.config.ts +++ b/src/inversify.config.ts @@ -21,7 +21,8 @@ import ForwardSeek from './commands/fseek.js'; import Help from './commands/help.js'; import Pause from './commands/pause.js'; import Play from './commands/play.js'; -import QueueCommad from './commands/queue.js'; +import QueueCommand from './commands/queue.js'; +import Remove from './commands/remove.js'; import Seek from './commands/seek.js'; import Shortcuts from './commands/shortcuts.js'; import Shuffle from './commands/shuffle.js'; @@ -61,7 +62,8 @@ container.bind(TYPES.Services.NaturalLanguage).to(NaturalLangua Help, Pause, Play, - QueueCommad, + QueueCommand, + Remove, Seek, Shortcuts, Shuffle, diff --git a/src/services/player.ts b/src/services/player.ts index 2738a91..5f4d368 100644 --- a/src/services/player.ts +++ b/src/services/player.ts @@ -270,6 +270,10 @@ export default class { this.queue = newQueue; } + removeFromQueue(index: number, amount = 1): void { + this.queue.splice(this.queuePosition + index, amount); + } + removeCurrent(): void { this.queue = [...this.queue.slice(0, this.queuePosition), ...this.queue.slice(this.queuePosition + 1)]; }