murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Made image detection get the proxy URL, added ad-hoc large file message

Browse source
This commit is contained in:
TheEssem 2020-02-25 15:07:36 -06:00
parent 5455b2682c
commit e28f45cfec
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
events/messageCreate.js
View file

@ -55,10 +55,14 @@ module.exports = async (message) => {
await client.createMessage(message.channel.id, result); await client.createMessage(message.channel.id, result);
} }
} catch (error) { } catch (error) {
if (!error.toString().includes("Request entity too large")) {
logger.error(error.toString()); logger.error(error.toString());
await client.createMessage(message.channel.id, "Uh oh! I ran into an error while running this command. Please report the content of the attached file here or on the esmBot Support server: <https://github.com/TheEssem/esmBot/issues>", [{ await client.createMessage(message.channel.id, "Uh oh! I ran into an error while running this command. Please report the content of the attached file here or on the esmBot Support server: <https://github.com/TheEssem/esmBot/issues>", [{
file: Buffer.from(`Message: ${error}\n\nStack Trace: ${error.stack}`), file: Buffer.from(`Message: ${error}\n\nStack Trace: ${error.stack}`),
name: "error.txt" name: "error.txt"
}]); }]);
} else {
await client.createMessage(message.channel.id, `${message.author.mention}, the resulting file was too large to upload. Try again with a smaller image if possible.`);
}
} }
}; };

6
utils/imagedetect.js
View file

@ -46,18 +46,18 @@ module.exports = async (cmdMessage) => {
if (type === false) continue; if (type === false) continue;
return type; return type;
} else if (message.embeds[0].thumbnail) { } else if (message.embeds[0].thumbnail) {
const type = await typeCheck(message.embeds[0].thumbnail.url); const type = await typeCheck(message.embeds[0].thumbnail.proxy_url);
if (type === false) continue; if (type === false) continue;
return type; return type;
// if there isn't a thumbnail check the image area // if there isn't a thumbnail check the image area
} else if (message.embeds[0].image) { } else if (message.embeds[0].image) {
const type = await typeCheck(message.embeds[0].image.url); const type = await typeCheck(message.embeds[0].image.proxy_url);
if (type === false) continue; if (type === false) continue;
return type; return type;
} }
} else if (message.attachments.length !== 0) { } else if (message.attachments.length !== 0) {
// get type of file // get type of file
const type = await typeCheck(message.attachments[0].url); const type = await typeCheck(message.attachments[0].proxy_url);
// move to the next message if the file isn't an image // move to the next message if the file isn't an image
if (type === false) continue; if (type === false) continue;
// if the file is an image then return it // if the file is an image then return it