This commit is contained in:
Daniel Odendahl Jr
2017-10-03 02:03:21 +00:00
parent c8af634412
commit 05623f724e
3 changed files with 7 additions and 18 deletions
+2 -10
View File
@@ -17,7 +17,6 @@ module.exports = class SoundboardCommand extends Command {
usages: 1,
duration: 15
},
clientPermissions: ['ADD_REACTIONS', 'READ_MESSAGE_HISTORY'],
args: [
{
key: 'sound',
@@ -45,16 +44,9 @@ module.exports = class SoundboardCommand extends Command {
if (this.client.voiceConnections.has(channel.guild.id)) return msg.say('I am already playing a sound.');
try {
const connection = await channel.join();
await msg.react('🔉');
const dispatcher = connection.playFile(path.join(__dirname, '..', '..', 'assets', 'sounds', `${sound}.mp3`));
dispatcher.once('end', async () => {
channel.leave();
await msg.react('✅');
});
dispatcher.once('error', async () => {
channel.leave();
await msg.react('⚠');
});
dispatcher.once('end', channel.leave);
dispatcher.once('error', channel.leave);
return null;
} catch (err) {
channel.leave();
+4 -7
View File
@@ -17,7 +17,6 @@ module.exports = class DECTalkCommand extends Command {
usages: 1,
duration: 15
},
clientPermissions: ['ADD_REACTIONS', 'READ_MESSAGE_HISTORY'],
args: [
{
key: 'text',
@@ -47,21 +46,19 @@ module.exports = class DECTalkCommand extends Command {
.get('http://tts.cyzon.us/tts', { followRedirects: true })
.query({ text });
await fs.writeFileAsync(file, body, { encoding: 'binary' });
await msg.react('🔉');
const dispatcher = connection.playFile(file);
dispatcher.once('end', () => this.finish(file, channel, msg));
dispatcher.once('error', () => this.finish(file, channel, msg, true));
dispatcher.once('end', () => this.finish(file, channel));
dispatcher.once('error', () => this.finish(file, channel));
return null;
} catch (err) {
await this.finish(file, channel, msg, true);
await this.finish(file, channel);
return msg.say(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
}
}
async finish(file, channel, msg, fail = false) {
async finish(file, channel) {
try {
if (fs.existsSync(file)) await fs.unlinkAsync(file);
await msg.react(fail ? '⚠' : '✅');
} finally {
channel.leave();
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "xiaobot",
"version": "44.3.0",
"version": "44.3.1",
"description": "Your personal server companion.",
"main": "Shard.js",
"scripts": {