Handle API errors more gracefully, fixed sharpen, restrict screenshot to the bot owner

This commit is contained in:
TheEssem 2020-12-14 10:58:31 -06:00
parent 9c496a4984
commit 78ae47dbbb
4 changed files with 20 additions and 6 deletions

View File

@ -37,10 +37,24 @@ if (isMainThread) {
delete jobs[uuid];
}
});
worker.on("error", err => console.error("worker error:", err));
worker.on("error", err => {
console.error("worker error:", err);
socket.send(Buffer.concat([Buffer.from([0x2]), Buffer.from(err.toString())]), jobs[uuid].port, jobs[uuid].addr);
workingWorkers--;
if (queue.length > 0) {
acceptJob(queue[0]);
delete jobs[uuid];
}
});
worker.on("exit", (code) => {
if (code !== 0)
console.error(`Worker stopped with exit code ${code}`);
workingWorkers--;
if (queue.length > 0) {
acceptJob(queue[0]);
delete jobs[uuid];
}
if (code !== 0) console.error(`Worker stopped with exit code ${code}`);
});

View File

@ -12,7 +12,7 @@
"libraries": [
"<!(pkg-config --libs Magick++)",
],
"defines": ["NAPI_DISABLE_CPP_EXCEPTIONS", "MAGICKCORE_HDRI_ENABLE=false", "MAGICKCORE_QUANTUM_DEPTH=16"]
"defines": ["NAPI_CPP_EXCEPTIONS", "MAGICKCORE_HDRI_ENABLE=false", "MAGICKCORE_QUANTUM_DEPTH=16"]
}
]
}

View File

@ -5,7 +5,7 @@ exports.run = async (message) => {
const image = await require("../utils/imagedetect.js")(message);
if (image === undefined) return `${message.author.mention}, you need to provide an image to sharpen!`;
const { buffer, type } = await magick.run({
cmd: "sharpen",
cmd: "blur",
path: image.path,
sharp: true
});

View File

@ -58,7 +58,7 @@ exports.play = async (sound, message, music = false) => {
const oldQueue = this.queues.get(voiceChannel.guild.id);
if (tracks.length === 0) return `${message.author.mention}, I couldn't find that song!`;
if (music) {
this.queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, tracks[0].track] : [tracks[0].track]);
this.queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, tracks[0].track] : [tracks[0].track]);
}
let connection;
if (player) {