|
|
|
@ -4,6 +4,7 @@ const cmd = require('./cmd'),
|
|
|
|
config = require('../config.json'),
|
|
|
|
config = require('../config.json'),
|
|
|
|
servercmd = require('../commands/servercommands'),
|
|
|
|
servercmd = require('../commands/servercommands'),
|
|
|
|
sqlite3 = require('sqlite3'),
|
|
|
|
sqlite3 = require('sqlite3'),
|
|
|
|
|
|
|
|
Discord = require('discord.js'),
|
|
|
|
handlers = {},
|
|
|
|
handlers = {},
|
|
|
|
dbDir = './data/gdb';
|
|
|
|
dbDir = './data/gdb';
|
|
|
|
let logger = require('winston');
|
|
|
|
let logger = require('winston');
|
|
|
|
@ -74,6 +75,26 @@ exports.GuildHandler = class {
|
|
|
|
)`);
|
|
|
|
)`);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* Answers a message via mention if mentioning is active or with just sending it to the same channel.
|
|
|
|
|
|
|
|
* @param msg
|
|
|
|
|
|
|
|
* @param answer
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
answerMessage(msg, answer) {
|
|
|
|
|
|
|
|
if (answer instanceof Promise || answer) {
|
|
|
|
|
|
|
|
if (answer instanceof Discord.RichEmbed) {
|
|
|
|
|
|
|
|
(this.mention)? msg.reply('', answer) : msg.channel.send('', answer);
|
|
|
|
|
|
|
|
} else if (answer instanceof Promise) {
|
|
|
|
|
|
|
|
answer
|
|
|
|
|
|
|
|
.then((answer) => this.answerMessage(msg, answer))
|
|
|
|
|
|
|
|
.catch((error) => this.answerMessage(msg, error));
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
(this.mention)? msg.reply(answer) : msg.channel.send(answer);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
logger.warning(`Empty answer won't be send.`);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* handles the message by letting the servant parse the command. Depending on the message setting it
|
|
|
|
* handles the message by letting the servant parse the command. Depending on the message setting it
|
|
|
|
* replies or just sends the answer.
|
|
|
|
* replies or just sends the answer.
|
|
|
|
@ -91,13 +112,7 @@ exports.GuildHandler = class {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let answer = this.servant.parseCommand(msg);
|
|
|
|
this.answerMessage(msg, this.servant.parseCommand(msg));
|
|
|
|
if (!answer) return;
|
|
|
|
|
|
|
|
if (this.mention) {
|
|
|
|
|
|
|
|
msg.reply(answer);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
msg.channel.send(answer);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
this.msgsQueue.push(msg);
|
|
|
|
this.msgsQueue.push(msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -107,15 +122,20 @@ exports.GuildHandler = class {
|
|
|
|
* Connect to a voice-channel if not connected and play the url
|
|
|
|
* Connect to a voice-channel if not connected and play the url
|
|
|
|
* @param vc
|
|
|
|
* @param vc
|
|
|
|
* @param url
|
|
|
|
* @param url
|
|
|
|
|
|
|
|
* @param next
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
connectAndPlay(vc, url) {
|
|
|
|
connectAndPlay(vc, url, next) {
|
|
|
|
if (!this.dj.connected) {
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
this.dj.connect(vc).then(() => {
|
|
|
|
if (!this.dj.connected) {
|
|
|
|
this.dj.playYouTube(url);
|
|
|
|
this.dj.connect(vc).then(() => {
|
|
|
|
});
|
|
|
|
this.dj.playYouTube(url, next);
|
|
|
|
} else {
|
|
|
|
resolve();
|
|
|
|
this.dj.playYouTube(url);
|
|
|
|
});
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
|
|
|
|
this.dj.playYouTube(url, next);
|
|
|
|
|
|
|
|
resolve();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
@ -128,74 +148,86 @@ exports.GuildHandler = class {
|
|
|
|
|
|
|
|
|
|
|
|
// play command
|
|
|
|
// play command
|
|
|
|
this.servant.createCommand(servercmd.music.play, (msg, kwargs, argv) => {
|
|
|
|
this.servant.createCommand(servercmd.music.play, (msg, kwargs, argv) => {
|
|
|
|
let vc = msg.member.voiceChannel;
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
let url = kwargs['url'];
|
|
|
|
let vc = this.dj.voiceChannel || msg.member.voiceChannel;
|
|
|
|
if (!vc)
|
|
|
|
let url = kwargs['url'];
|
|
|
|
return 'You are not connected to a VoiceChannel';
|
|
|
|
if (!vc)
|
|
|
|
if (!url)
|
|
|
|
reject(servercmd.music.play.response.no_voicechannel);
|
|
|
|
return servercmd.music.play.response.no_url;
|
|
|
|
if (!url)
|
|
|
|
if (!url.match(/http/g)) {
|
|
|
|
reject(servercmd.music.play.response.no_url);
|
|
|
|
if (argv)
|
|
|
|
if (!url.match(/http/g)) {
|
|
|
|
url += ' ' + argv.join(' ');
|
|
|
|
if (argv && argv.length > 0)
|
|
|
|
this.db.get('SELECT url FROM playlists WHERE name = ?', [url], (err, row) => {
|
|
|
|
url += ' ' + argv.join(' '); // join to get the whole expression behind the command
|
|
|
|
if (err) {
|
|
|
|
this.db.get('SELECT url FROM playlists WHERE name = ?', [url], (err, row) => {
|
|
|
|
console.error(err.message);
|
|
|
|
if (err) {
|
|
|
|
}
|
|
|
|
console.error(err.message);
|
|
|
|
if (!row) {
|
|
|
|
}
|
|
|
|
return servercmd.music.play.response.url_invalid;
|
|
|
|
if (!row) {
|
|
|
|
}
|
|
|
|
reject(servercmd.music.play.response.url_invalid);
|
|
|
|
url = row.url;
|
|
|
|
logger.verbose('Got invalid url for play command.');
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
url = row.url;
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
this.connectAndPlay(vc, url).then(() => {
|
|
|
|
|
|
|
|
resolve(servercmd.music.play.response.success);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} catch (err) {
|
|
|
|
|
|
|
|
logger.error(err.message);
|
|
|
|
|
|
|
|
reject(servercmd.music.play.response.failure);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} else {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
this.connectAndPlay(vc, url);
|
|
|
|
this.connectAndPlay(vc, url).then(() => {
|
|
|
|
|
|
|
|
resolve(servercmd.music.play.response.success);
|
|
|
|
|
|
|
|
});
|
|
|
|
} catch (err) {
|
|
|
|
} catch (err) {
|
|
|
|
logger.error(err.message);
|
|
|
|
logger.error(err.message);
|
|
|
|
return servercmd.music.play.response.failure;
|
|
|
|
reject(servercmd.music.play.response.failure);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
this.connectAndPlay(vc, url);
|
|
|
|
|
|
|
|
} catch (err) {
|
|
|
|
|
|
|
|
logger.error(err.message);
|
|
|
|
|
|
|
|
return servercmd.music.play.response.failure;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return servercmd.music.play.response.success;
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// playnext command
|
|
|
|
// playnext command
|
|
|
|
this.servant.createCommand(servercmd.music.playnext,(msg, kwargs, argv) => {
|
|
|
|
this.servant.createCommand(servercmd.music.playnext,(msg, kwargs, argv) => {
|
|
|
|
let vc = msg.member.voiceChannel;
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
if (!this.dj.connected) this.dj.voiceChannel = vc;
|
|
|
|
let vc = msg.member.voiceChannel;
|
|
|
|
let url = kwargs['url'];
|
|
|
|
if (!this.dj.connected) this.dj.voiceChannel = vc;
|
|
|
|
if (!url) return servercmd.music.playnext.response.no_url;
|
|
|
|
let url = kwargs['url'];
|
|
|
|
if (!url.match(/http/g)) {
|
|
|
|
if (!url) reject(servercmd.music.playnext.response.no_url);
|
|
|
|
if (argv)
|
|
|
|
if (!url.match(/http/g)) {
|
|
|
|
url += ' ' + argv.join(' ');
|
|
|
|
if (argv)
|
|
|
|
this.db.get('SELECT url FROM playlists WHERE name = ?', [url], (err, row) => {
|
|
|
|
url += ' ' + argv.join(' ');
|
|
|
|
if (err) {
|
|
|
|
this.db.get('SELECT url FROM playlists WHERE name = ?', [url], (err, row) => {
|
|
|
|
console.error(err.message);
|
|
|
|
if (err) {
|
|
|
|
}
|
|
|
|
console.error(err.message);
|
|
|
|
if (!row) {
|
|
|
|
}
|
|
|
|
return servercmd.music.play.response.url_invalid;
|
|
|
|
if (!row) {
|
|
|
|
}
|
|
|
|
reject(servercmd.music.play.response.url_invalid);
|
|
|
|
url = row.url;
|
|
|
|
}
|
|
|
|
|
|
|
|
url = row.url;
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
this.connectAndPlay(url, true).then(() => {
|
|
|
|
|
|
|
|
resolve(servercmd.music.playnext.response.success);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} catch (err) {
|
|
|
|
|
|
|
|
logger.error(err.message);
|
|
|
|
|
|
|
|
reject(servercmd.music.play.response.failure);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
} else {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
this.dj.playYouTube(url, true);
|
|
|
|
this.connectAndPlay(url, true).then(() => {
|
|
|
|
|
|
|
|
resolve(servercmd.music.playnext.response.success);
|
|
|
|
|
|
|
|
});
|
|
|
|
} catch (err) {
|
|
|
|
} catch (err) {
|
|
|
|
logger.error(err.message);
|
|
|
|
logger.error(err);
|
|
|
|
return servercmd.music.play.response.failure;
|
|
|
|
reject(servercmd.music.playnext.response.failure);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
this.dj.playYouTube(url, true);
|
|
|
|
|
|
|
|
} catch (err) {
|
|
|
|
|
|
|
|
logger.error(err);
|
|
|
|
|
|
|
|
return servercmd.music.playnext.response.failure;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return servercmd.music.playnext.response.success;
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// join command
|
|
|
|
// join command
|
|
|
|
@ -274,44 +306,50 @@ exports.GuildHandler = class {
|
|
|
|
|
|
|
|
|
|
|
|
// saves playlists
|
|
|
|
// saves playlists
|
|
|
|
this.servant.createCommand(servercmd.music.save, (msg, kwargs, argv) => {
|
|
|
|
this.servant.createCommand(servercmd.music.save, (msg, kwargs, argv) => {
|
|
|
|
let saveName = argv.join(' ');
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
this.db.get('SELECT COUNT(*) count FROM playlists WHERE name = ?', [saveName], (err, row) => {
|
|
|
|
let saveName = argv.join(' ');
|
|
|
|
if(err) {
|
|
|
|
this.db.get('SELECT COUNT(*) count FROM playlists WHERE name = ?', [saveName], (err, row) => {
|
|
|
|
logger.error(err.message);
|
|
|
|
if(err) {
|
|
|
|
}
|
|
|
|
logger.error(err.message);
|
|
|
|
if (!row || row.count === 0) {
|
|
|
|
}
|
|
|
|
this.db.run('INSERT INTO playlists (name, url) VALUES (?, ?)', [saveName, kwargs.url], (err) => {
|
|
|
|
if (!row || row.count === 0) {
|
|
|
|
if (err)
|
|
|
|
this.db.run('INSERT INTO playlists (name, url) VALUES (?, ?)', [saveName, kwargs.url], (err) => {
|
|
|
|
logger.error(err.message);
|
|
|
|
if (err)
|
|
|
|
});
|
|
|
|
logger.error(err.message);
|
|
|
|
} else {
|
|
|
|
else
|
|
|
|
this.db.run('UPDATE playlists SET url = ? WHERE name = ?', [kwargs.url, saveName], (err) => {
|
|
|
|
resolve(`Saved song/playlist as ${saveName}`);
|
|
|
|
if (err)
|
|
|
|
});
|
|
|
|
logger.error(err.message);
|
|
|
|
} else {
|
|
|
|
});
|
|
|
|
this.db.run('UPDATE playlists SET url = ? WHERE name = ?', [kwargs.url, saveName], (err) => {
|
|
|
|
}
|
|
|
|
if (err)
|
|
|
|
|
|
|
|
logger.error(err.message);
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
|
|
resolve(`Saved song/playlist as ${saveName}`);
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
return `Saved song/playlist as ${saveName}`
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
// saved command - prints out saved playlists
|
|
|
|
// saved command - prints out saved playlists
|
|
|
|
this.servant.createCommand(servercmd.music.saved, (msg) => {
|
|
|
|
this.servant.createCommand(servercmd.music.saved, (msg) => {
|
|
|
|
let response = '';
|
|
|
|
return new Promise((resolve, reject) => {
|
|
|
|
this.db.all('SELECT name, url FROM playlists', (err, rows) => {
|
|
|
|
let response = '';
|
|
|
|
if (err)
|
|
|
|
this.db.all('SELECT name, url FROM playlists', (err, rows) => {
|
|
|
|
logger.error(err.message);
|
|
|
|
if (err)
|
|
|
|
for (let row of rows) {
|
|
|
|
logger.error(err.message);
|
|
|
|
response += `[${row.name}](${row.url})\n`;
|
|
|
|
for (let row of rows) {
|
|
|
|
}
|
|
|
|
response += `[${row.name}](${row.url})\n`;
|
|
|
|
if (rows.length === 0) {
|
|
|
|
}
|
|
|
|
msg.channel.send(servercmd.music.saved.response.no_saved);
|
|
|
|
if (rows.length === 0) {
|
|
|
|
} else {
|
|
|
|
msg.channel.send(servercmd.music.saved.response.no_saved);
|
|
|
|
msg.channel.send('', {embed: {
|
|
|
|
} else {
|
|
|
|
"title": "Saved Songs and Playlists",
|
|
|
|
let richEmbed = new Discord.RichEmbed()
|
|
|
|
"description": response,
|
|
|
|
.setTitle('Saved Songs and Playlists')
|
|
|
|
"fields": []
|
|
|
|
.setDescription(response);
|
|
|
|
}});
|
|
|
|
resolve(richEmbed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Trivernis
6 years ago
committed by
GitHub