jonny_bro/discord-player-play-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: update errors

Browse source
This commit is contained in:
Androz2091 2020-02-21 11:32:16 +01:00
parent 9d939f2f71
commit 49edfca20f
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -34,6 +34,7 @@
"ytdl-core": "^1.0.6" "ytdl-core": "^1.0.6"
}, },
"devDependencies": { "devDependencies": {
"discord.js": "discordjs/discord.js",
"jsdoc": "^3.6.3", "jsdoc": "^3.6.3",
"minami": "^1.2.3" "minami": "^1.2.3"
} }

28
src/Player.js
View file

@ -2,6 +2,8 @@ const ytdl = require('ytdl-core');
const SYA = require('simple-youtube-api'); const SYA = require('simple-youtube-api');
const mergeOptions = require('merge-options'); const mergeOptions = require('merge-options');
const { VoiceChannel, version } = require("discord.js");
if(version.split('.')[0] !== '12') throw new Error("Only the master branch of discord.js library is supported for now. Install it using 'npm install discordjs/discord.js'.");
const Queue = require('./Queue'); const Queue = require('./Queue');
const Util = require('./Util'); const Util = require('./Util');
const Song = require('./Song'); const Song = require('./Song');
@ -92,9 +94,11 @@ class Player {
play(voiceChannel, songName) { play(voiceChannel, songName) {
this.queues = this.queues.filter((g) => g.guildID !== voiceChannel.id); this.queues = this.queues.filter((g) => g.guildID !== voiceChannel.id);
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
if(typeof voiceChannel !== VoiceChannel) return reject("voiceChannel must be type of VoiceChannel. value="+voiceChannel);
if(typeof songName !== "string") return reject("songName must be type of string. value="+songName);
// Searches the song // Searches the song
let video = await Util.getFirstYoutubeResult(songName, this.SYA); let video = await Util.getFirstYoutubeResult(songName, this.SYA);
if(!video) reject('Song not found'); if(!video) return reject('Song not found');
// Joins the voice channel // Joins the voice channel
let connection = await voiceChannel.join(); let connection = await voiceChannel.join();
// Creates a new guild with data // Creates a new guild with data
@ -120,7 +124,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Pauses the dispatcher // Pauses the dispatcher
queue.dispatcher.pause(); queue.dispatcher.pause();
queue.playing = false; queue.playing = false;
@ -138,7 +142,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Pauses the dispatcher // Pauses the dispatcher
queue.dispatcher.resume(); queue.dispatcher.resume();
queue.playing = true; queue.playing = true;
@ -156,7 +160,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Stops the dispatcher // Stops the dispatcher
queue.stopped = true; queue.stopped = true;
queue.songs = []; queue.songs = [];
@ -176,7 +180,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Updates volume // Updates volume
queue.dispatcher.setVolumeLogarithmic(percent / 200); queue.dispatcher.setVolumeLogarithmic(percent / 200);
// Resolves guild queue // Resolves guild queue
@ -205,10 +209,10 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Searches the song // Searches the song
let video = await Util.getFirstYoutubeResult(songName, this.SYA).catch(() => {}); let video = await Util.getFirstYoutubeResult(songName, this.SYA).catch(() => {});
if(!video) reject('Song not found'); if(!video) return reject('Song not found');
let song = new Song(video, queue); let song = new Song(video, queue);
// Updates queue // Updates queue
queue.songs.push(song); queue.songs.push(song);
@ -227,7 +231,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Updates queue // Updates queue
queue.songs = songs; queue.songs = songs;
// Resolves the queue // Resolves the queue
@ -244,7 +248,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Clears queue // Clears queue
let currentlyPlaying = queue.songs.shift(); let currentlyPlaying = queue.songs.shift();
queue.songs = [ currentlyPlaying ]; queue.songs = [ currentlyPlaying ];
@ -262,7 +266,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
let currentSong = queue.songs[0]; let currentSong = queue.songs[0];
// Ends the dispatcher // Ends the dispatcher
queue.dispatcher.end(); queue.dispatcher.end();
@ -281,7 +285,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
let currentSong = queue.songs[0]; let currentSong = queue.songs[0];
// Resolves the current song // Resolves the current song
resolve(currentSong); resolve(currentSong);
@ -298,7 +302,7 @@ class Player {
return new Promise(async(resolve, reject) => { return new Promise(async(resolve, reject) => {
// Gets guild queue // Gets guild queue
let queue = this.queues.find((g) => g.guildID === guildID); let queue = this.queues.find((g) => g.guildID === guildID);
if(!queue) reject('Not playing'); if(!queue) return reject('Not playing');
// Enable/Disable repeat mode // Enable/Disable repeat mode
queue.repeatMode = enabled; queue.repeatMode = enabled;
// Resolve // Resolve