Supositware/Haha-Yes
2
1
Fork 1
Code Issues Pull requests Projects Releases Activity

revert some changes

Browse source
This commit is contained in:
loicbersier 2020-04-09 16:59:57 +02:00
parent 95756d5364
commit 0be495c9f9
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
commands/fun/tts/dectalk.js
View file

@ -1,7 +1,6 @@
const { Command } = require('discord-akairo'); const { Command } = require('discord-akairo');
const util = require('util'); const util = require('util');
const exec = util.promisify(require('child_process').exec); const exec = util.promisify(require('child_process').exec);
const os = require('os');
const rand = require('../../../rand.js'); const rand = require('../../../rand.js');
class dectalkCommand extends Command { class dectalkCommand extends Command {
@ -29,24 +28,23 @@ class dectalkCommand extends Command {
} }
async exec(message, args) { async exec(message, args) {
let output = `${os.tmpdir()}/${message.id}_dectalk.wav`;
args.decMessage = rand.random(args.decMessage, message); args.decMessage = rand.random(args.decMessage, message);
args.decMessage = args.decMessage.replace('\n', ' '); args.decMessage = args.decMessage.replace('\n', ' ');
let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1'); let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1');
if (process.platform == 'win32') { if (process.platform == 'win32') {
exec(`cd .\\dectalk && .\\say.exe -w ${output} "${decMessage}"`) exec(`cd .\\dectalk && .\\say.exe -w dectalk.wav "${decMessage}"`)
.catch(err => { .catch(err => {
console.error(err); console.error(err);
return message.channel.send('Oh no! an error has occured!'); return message.channel.send('Oh no! an error has occured!');
}) })
.then(() => { .then(() => {
return message.channel.send({files: [output]}); return message.channel.send({files: ['./dectalk/dectalk.wav']});
}); });
} else if (process.platform == 'linux' || process.platform == 'darwin') { } else if (process.platform == 'linux' || process.platform == 'darwin') {
let loadingmsg = await message.channel.send('Processing ( this can take some time ) <a:loadingmin:527579785212329984>'); let loadingmsg = await message.channel.send('Processing ( this can take some time ) <a:loadingmin:527579785212329984>');
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 => { .catch(err => {
loadingmsg.delete(); loadingmsg.delete();
console.error(err); console.error(err);
@ -54,7 +52,7 @@ class dectalkCommand extends Command {
}) })
.then(() => { .then(() => {
loadingmsg.delete(); loadingmsg.delete();
return message.channel.send({files: [output]}); return message.channel.send({files: ['./dectalk/dectalk.wav']});
}); });
} }
} }

10
commands/fun/tts/dectalkvc.js
View file

@ -1,7 +1,6 @@
const { Command } = require('discord-akairo'); const { Command } = require('discord-akairo');
const util = require('util'); const util = require('util');
const exec = util.promisify(require('child_process').exec); const exec = util.promisify(require('child_process').exec);
const os = require('os');
const rand = require('../../../rand.js'); const rand = require('../../../rand.js');
class dectalkvcCommand extends Command { class dectalkvcCommand extends Command {
@ -29,13 +28,12 @@ class dectalkvcCommand extends Command {
} }
async exec(message, args) { async exec(message, args) {
let output = `${os.tmpdir()}/${message.id}_dectalk.wav`;
args.decMessage = rand.random(args.decMessage, message); args.decMessage = rand.random(args.decMessage, message);
args.decMessage = args.decMessage.replace('\n', ' '); args.decMessage = args.decMessage.replace('\n', ' ');
let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1'); let decMessage = '[:phoneme on] ' + args.decMessage.replace(/(["'$`\\])/g,'\\$1');
if (process.platform == 'win32') { if (process.platform == 'win32') {
exec(`cd .\\dectalk && .\\say.exe -w ${output} "${decMessage}"`) exec(`cd .\\dectalk && .\\say.exe -w dectalkvc.wav "${decMessage}"`)
.catch(err => { .catch(err => {
console.error(err); console.error(err);
return message.channel.send('Oh no! an error has occured!'); 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.'); if (!voiceChannel) return message.say('Please enter a voice channel first.');
try { try {
const connection = await voiceChannel.join(); const connection = await voiceChannel.join();
const dispatcher = connection.play(output); const dispatcher = connection.play('./dectalk/dectalk.wav');
dispatcher.once('finish', () => voiceChannel.leave()); dispatcher.once('finish', () => voiceChannel.leave());
dispatcher.once('error', () => voiceChannel.leave()); dispatcher.once('error', () => voiceChannel.leave());
return null; return null;
@ -58,7 +56,7 @@ class dectalkvcCommand extends Command {
} else if (process.platform == 'linux' || process.platform == 'darwin') { } else if (process.platform == 'linux' || process.platform == 'darwin') {
let loadingmsg = await message.channel.send('Processing ( this can take some time ) <a:loadingmin:527579785212329984>'); let loadingmsg = await message.channel.send('Processing ( this can take some time ) <a:loadingmin:527579785212329984>');
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 => { .catch(err => {
loadingmsg.delete(); loadingmsg.delete();
console.error(err); console.error(err);
@ -70,7 +68,7 @@ class dectalkvcCommand extends Command {
try { try {
loadingmsg.delete(); loadingmsg.delete();
const connection = await voiceChannel.join(); const connection = await voiceChannel.join();
const dispatcher = connection.play(output); const dispatcher = connection.play('./dectalk/dectalkvc.wav');
dispatcher.once('finish', () => voiceChannel.leave()); dispatcher.once('finish', () => voiceChannel.leave());
dispatcher.once('error', () => voiceChannel.leave()); dispatcher.once('error', () => voiceChannel.leave());
return null; return null;