SileNce/discord_bot
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: SileNce:6a0350f13ca9bdabbcf79d5b7d0c395e63851ea9
Branches Tags
SileNce:master
SileNce:development
SileNce:mod_toggle_commands
SileNce:process_info
SileNce:unique_member_variable
SileNce:separate_executeCommand
SileNce:add_dl
SileNce:allow_dates_in_timer_cmd
SileNce:tdoss_improve
SileNce:whitelist_gen
SileNce:user_whitelist
SileNce:prompt_improvement
SileNce:lastfmroast
SileNce:whitelist
SileNce:chat
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency
..
compare: SileNce:c3f7abce5d42818c365e1d9a6c5d07a2b9e14b5f
Branches Tags
SileNce:development
SileNce:master
SileNce:mod_toggle_commands
SileNce:process_info
SileNce:unique_member_variable
SileNce:separate_executeCommand
SileNce:add_dl
SileNce:allow_dates_in_timer_cmd
SileNce:tdoss_improve
SileNce:whitelist_gen
SileNce:user_whitelist
SileNce:prompt_improvement
SileNce:lastfmroast
SileNce:whitelist
SileNce:chat
SileNce:experiments
SileNce:devbot
SileNce:remove-parse-ms-dependency

No commits in common. "6a0350f13ca9bdabbcf79d5b7d0c395e63851ea9" and "c3f7abce5d42818c365e1d9a6c5d07a2b9e14b5f" have entirely different histories.
6a0350f13c ... c3f7abce5d

1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commands/misc/tdoss.js
View file

@ -10,10 +10,9 @@ module.exports = {
description: 'Combine picture with tdoss album cover template', description: 'Combine picture with tdoss album cover template',
async execute({ message, args }) { async execute({ message, args }) {
let tdossDir = path.resolve(process.cwd, 'data', 'tdoss'); let dataDir = path.resolve(__dirname, '..', '..', 'data');
const directory = path.resolve(dataDir, Math.floor(new Date).toString())
const directory = path.resolve(tdossDir, Math.floor(new Date).toString()) fs.mkdirSync(directory)
fs.mkdirSync(directory, {recursive: true})
let url = ""; let url = "";
if(message.attachments.size > 0){ 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) { 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.") 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}) fs.rmSync(`${directory}`, {recursive: true})
@ -97,8 +96,7 @@ module.exports = {
return {value: 3, errorMessage: error.cause.message}; return {value: 3, errorMessage: error.cause.message};
} }
if(!res.ok) return {value: 1, errorMessage: res.status.toString()}; if(!res.ok) return {value: 1, errorMessage: res.status.toString()};
const contentType = res.headers.get('content-type'); if(!res.headers.get('content-type').startsWith("image")) return {value: 2, errorMessage: ""};
if(!contentType || !contentType.startsWith("image")) return {value: 2, errorMessage: contentType || "No content-type header"};
const stream = Readable.fromWeb(res.body) const stream = Readable.fromWeb(res.body)
await writeFile(path, stream); await writeFile(path, stream);
return {value: 0, errorMessage: ""}; return {value: 0, errorMessage: ""};