From 0be495c9f98f8b80ea9c550db7dd69e463409601 Mon Sep 17 00:00:00 2001 From: loicbersier Date: Thu, 9 Apr 2020 16:59:57 +0200 Subject: [PATCH] revert some changes --- commands/fun/tts/dectalk.js | 10 ++++------ commands/fun/tts/dectalkvc.js | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/commands/fun/tts/dectalk.js b/commands/fun/tts/dectalk.js index 78d1bb2c..a0304ac5 100644 --- a/commands/fun/tts/dectalk.js +++ b/commands/fun/tts/dectalk.js @@ -1,7 +1,6 @@ const { Command } = require('discord-akairo'); const util = require('util'); const exec = util.promisify(require('child_process').exec); -const os = require('os'); const rand = require('../../../rand.js'); class dectalkCommand extends Command { @@ -29,24 +28,23 @@ class dectalkCommand extends Command { } async exec(message, args) { - let output = `${os.tmpdir()}/${message.id}_dectalk.wav`; args.decMessage = rand.random(args.decMessage, message); args.decMessage = args.decMessage.replace('\n', ' '); let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1'); if (process.platform == 'win32') { - exec(`cd .\\dectalk && .\\say.exe -w ${output} "${decMessage}"`) + exec(`cd .\\dectalk && .\\say.exe -w dectalk.wav "${decMessage}"`) .catch(err => { console.error(err); return message.channel.send('Oh no! an error has occured!'); }) .then(() => { - return message.channel.send({files: [output]}); + return message.channel.send({files: ['./dectalk/dectalk.wav']}); }); } else if (process.platform == 'linux' || process.platform == 'darwin') { let loadingmsg = await message.channel.send('Processing ( this can take some time ) '); - exec(`cd dectalk && DISPLAY=:0.0 wine say.exe -w ${output} "${decMessage}"`) + exec(`cd dectalk && DISPLAY=:0.0 wine say.exe -w dectalk.wav "${decMessage}"`) .catch(err => { loadingmsg.delete(); console.error(err); @@ -54,7 +52,7 @@ class dectalkCommand extends Command { }) .then(() => { loadingmsg.delete(); - return message.channel.send({files: [output]}); + return message.channel.send({files: ['./dectalk/dectalk.wav']}); }); } } diff --git a/commands/fun/tts/dectalkvc.js b/commands/fun/tts/dectalkvc.js index 3a000412..647cec89 100644 --- a/commands/fun/tts/dectalkvc.js +++ b/commands/fun/tts/dectalkvc.js @@ -1,7 +1,6 @@ const { Command } = require('discord-akairo'); const util = require('util'); const exec = util.promisify(require('child_process').exec); -const os = require('os'); const rand = require('../../../rand.js'); class dectalkvcCommand extends Command { @@ -29,13 +28,12 @@ class dectalkvcCommand extends Command { } async exec(message, args) { - let output = `${os.tmpdir()}/${message.id}_dectalk.wav`; args.decMessage = rand.random(args.decMessage, message); args.decMessage = args.decMessage.replace('\n', ' '); let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1'); if (process.platform == 'win32') { - exec(`cd .\\dectalk && .\\say.exe -w ${output} "${decMessage}"`) + exec(`cd .\\dectalk && .\\say.exe -w dectalkvc.wav "${decMessage}"`) .catch(err => { console.error(err); return message.channel.send('Oh no! an error has occured!'); @@ -45,7 +43,7 @@ class dectalkvcCommand extends Command { if (!voiceChannel) return message.say('Please enter a voice channel first.'); try { const connection = await voiceChannel.join(); - const dispatcher = connection.play(output); + const dispatcher = connection.play('./dectalk/dectalk.wav'); dispatcher.once('finish', () => voiceChannel.leave()); dispatcher.once('error', () => voiceChannel.leave()); return null; @@ -58,7 +56,7 @@ class dectalkvcCommand extends Command { } else if (process.platform == 'linux' || process.platform == 'darwin') { let loadingmsg = await message.channel.send('Processing ( this can take some time ) '); - exec(`cd dectalk && DISPLAY=:0.0 wine say.exe -w ${output} "${decMessage}"`) + exec(`cd dectalk && DISPLAY=:0.0 wine say.exe -w dectalkvc.wav "${decMessage}"`) .catch(err => { loadingmsg.delete(); console.error(err); @@ -70,7 +68,7 @@ class dectalkvcCommand extends Command { try { loadingmsg.delete(); const connection = await voiceChannel.join(); - const dispatcher = connection.play(output); + const dispatcher = connection.play('./dectalk/dectalkvc.wav'); dispatcher.once('finish', () => voiceChannel.leave()); dispatcher.once('error', () => voiceChannel.leave()); return null;