diff --git a/commands/misc/tdoss.js b/commands/misc/tdoss.js index 09b5447..5c80e3a 100644 --- a/commands/misc/tdoss.js +++ b/commands/misc/tdoss.js @@ -10,10 +10,9 @@ module.exports = { description: 'Combine picture with tdoss album cover template', async execute({ message, args }) { - let tdossDir = path.resolve(process.cwd, 'data', 'tdoss'); - - const directory = path.resolve(tdossDir, Math.floor(new Date).toString()) - fs.mkdirSync(directory, {recursive: true}) + let dataDir = path.resolve(__dirname, '..', '..', 'data'); + const directory = path.resolve(dataDir, Math.floor(new Date).toString()) + fs.mkdirSync(directory) let url = ""; if(message.attachments.size > 0){ @@ -59,7 +58,7 @@ module.exports = { } - const command = `magick ${tdossDir}/tdoss_template.png \\( ${directory}/input.png -resize 800x800^ -gravity center -extent 1000x1000 \\) -compose dst-over -composite ${directory}/tdoss_result.png`; + const command = `magick ${dataDir}/tdoss_template.png \\( ${directory}/input.png -resize 800x800^ -gravity center -extent 1000x1000 \\) -compose dst-over -composite ${directory}/tdoss_result.png`; if (this.executeCommand(command).error === true) { message.channel.send("Something went wrong during image manipulation.\nTry again and if it keeps happening, contact the owner of the bot.") fs.rmSync(`${directory}`, {recursive: true}) @@ -97,8 +96,7 @@ module.exports = { return {value: 3, errorMessage: error.cause.message}; } if(!res.ok) return {value: 1, errorMessage: res.status.toString()}; - const contentType = res.headers.get('content-type'); - if(!contentType || !contentType.startsWith("image")) return {value: 2, errorMessage: contentType || "No content-type header"}; + if(!res.headers.get('content-type').startsWith("image")) return {value: 2, errorMessage: ""}; const stream = Readable.fromWeb(res.body) await writeFile(path, stream); return {value: 0, errorMessage: ""};