Merge branch 'master' of github.com:codetheweb/muse

This commit is contained in:
Max Isom 2022-02-24 18:24:56 -05:00
commit 3dfd16860b
No known key found for this signature in database
GPG key ID: 25C9B1A7F6798880
4 changed files with 47 additions and 0 deletions

View file

@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Added
- `/stop` command to disconnect and clear the queue
## [1.1.2] - 2022-02-21
### Changed

37
src/commands/stop.ts Normal file
View file

@ -0,0 +1,37 @@
import {CommandInteraction} from 'discord.js';
import {SlashCommandBuilder} from '@discordjs/builders';
import {TYPES} from '../types.js';
import {inject, injectable} from 'inversify';
import PlayerManager from '../managers/player.js';
import {STATUS} from '../services/player.js';
import Command from '.';
@injectable()
export default class implements Command {
public readonly slashCommand = new SlashCommandBuilder()
.setName('stop')
.setDescription('stop playback, disconnect, and clear all songs in the queue');
public requiresVC = true;
private readonly playerManager: PlayerManager;
constructor(@inject(TYPES.Managers.Player) playerManager: PlayerManager) {
this.playerManager = playerManager;
}
public async execute(interaction: CommandInteraction) {
const player = this.playerManager.get(interaction.guild!.id);
if (!player.voiceConnection) {
throw new Error('not connected');
}
if (player.status !== STATUS.PLAYING) {
throw new Error('not currently playing');
}
player.stop();
await interaction.reply('u betcha');
}
}

View file

@ -26,6 +26,7 @@ import Remove from './commands/remove.js';
import Seek from './commands/seek.js';
import Shuffle from './commands/shuffle.js';
import Skip from './commands/skip.js';
import Stop from './commands/stop.js';
import Unskip from './commands/unskip.js';
import ThirdParty from './services/third-party.js';
import FileCacheProvider from './services/file-cache.js';
@ -66,6 +67,7 @@ container.bind<AddQueryToQueue>(TYPES.Services.AddQueryToQueue).to(AddQueryToQue
Seek,
Shuffle,
Skip,
Stop,
Unskip,
].forEach(command => {
container.bind<Command>(TYPES.Command).to(command).inSingletonScope();

View file

@ -340,6 +340,12 @@ export default class {
return this.queueSize() === 0;
}
stop(): void {
this.disconnect();
this.queuePosition = 0;
this.queue = [];
}
private getHashForCache(url: string): string {
return hasha(url);
}