mirror of
https://github.com/kirameki-cafe/Yumi.git
synced 2026-09-14 03:09:59 +00:00
Added music pause and resume
This commit is contained in:
@@ -24,6 +24,8 @@ import Discord_MusicPlayer_Queue from "../discord/MusicPlayer/Queue";
|
||||
import Discord_MusicPlayer_Search from "../discord/MusicPlayer/Search";
|
||||
import Discord_MusicPlayer_NowPlaying from "../discord/MusicPlayer/NowPlaying";
|
||||
import Discord_MusicPlayer_Loop from "../discord/MusicPlayer/Loop";
|
||||
import Discord_MusicPlayer_Pause from "../discord/MusicPlayer/Pause";
|
||||
import Discord_MusicPlayer_Resume from "../discord/MusicPlayer/Resume";
|
||||
|
||||
import Discord_Developer_ServiceAnnouncement from "../discord/developer/ServiceAnnouncement";
|
||||
import Discord_Developer_Debug from "../discord/developer/Debug";
|
||||
@@ -69,6 +71,8 @@ class Discord {
|
||||
new Discord_MusicPlayer_Queue(),
|
||||
new Discord_MusicPlayer_Search(),
|
||||
new Discord_MusicPlayer_Loop(),
|
||||
new Discord_MusicPlayer_Pause(),
|
||||
new Discord_MusicPlayer_Resume(),
|
||||
|
||||
new Discord_MembershipScreening(),
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import playdl, { YouTubeVideo } from "play-dl";
|
||||
import { VoiceChannel, Snowflake, TextChannel, StageChannel, Guild } from "discord.js";
|
||||
import { AudioPlayer, VoiceConnection, createAudioPlayer, joinVoiceChannel, createAudioResource, VoiceConnectionStatus, AudioPlayerStatus, NoSubscriberBehavior, VoiceConnectionState, AudioPlayerError, DiscordGatewayAdapterCreator } from "@discordjs/voice";
|
||||
import { AudioPlayer, VoiceConnection, createAudioPlayer, joinVoiceChannel, createAudioResource, VoiceConnectionStatus, AudioPlayerStatus, AudioPlayerState, NoSubscriberBehavior, VoiceConnectionState, AudioPlayerError, DiscordGatewayAdapterCreator } from "@discordjs/voice";
|
||||
import { EventEmitter } from "stream";
|
||||
|
||||
import DiscordProvider from "./Discord";
|
||||
@@ -67,6 +67,7 @@ export class DiscordMusicPlayerInstance {
|
||||
public voiceConnection?: VoiceConnection;
|
||||
public previousTrack?: ValidTracks;
|
||||
|
||||
public paused: boolean = false;
|
||||
public loopMode: DiscordMusicPlayerLoopMode = DiscordMusicPlayerLoopMode.None;
|
||||
|
||||
public readonly events: EventEmitter;
|
||||
@@ -164,18 +165,27 @@ export class DiscordMusicPlayerInstance {
|
||||
}
|
||||
|
||||
public async leaveVoiceChannel() {
|
||||
|
||||
if (this.player)
|
||||
this.player.pause();
|
||||
|
||||
if (DiscordProvider.client.guilds.cache.get(this.voiceChannel.guild.id)?.me?.voice) {
|
||||
this.voiceConnection?.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
public async pausePlayer() {
|
||||
if(this.paused || !this.player) return;
|
||||
if(!this.player.pause(true)) throw new Error('Unable to pause player');
|
||||
this.paused = true;
|
||||
}
|
||||
|
||||
public async resumePlayer() {
|
||||
if(!this.paused || !this.player) return;
|
||||
if(!this.player.unpause()) throw new Error('Unable to resume player');
|
||||
this.paused = false;
|
||||
}
|
||||
|
||||
public addTrackToQueue(track: (ValidTracks)) {
|
||||
|
||||
if (this.queue.track.length === 0) {
|
||||
this.queue.track.push(track);
|
||||
this.playTrack(this.queue.track[0]);
|
||||
@@ -186,7 +196,6 @@ export class DiscordMusicPlayerInstance {
|
||||
}
|
||||
|
||||
public async playTrack(track: ValidTracks) {
|
||||
|
||||
if (!this.voiceConnection) throw new Error("No voice connection");
|
||||
|
||||
try {
|
||||
@@ -201,7 +210,6 @@ export class DiscordMusicPlayerInstance {
|
||||
this.events.emit('error', new PlayerErrorEvent(this, error));
|
||||
this.skipTrack();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public async skipTrack() {
|
||||
@@ -231,6 +239,10 @@ export class DiscordMusicPlayerInstance {
|
||||
return this.previousTrack;
|
||||
}
|
||||
|
||||
public isPaused() {
|
||||
return this.paused;
|
||||
}
|
||||
|
||||
public async destroy() {
|
||||
await this.leaveVoiceChannel();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user