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

Added support for "gifv"s, fixed embed issue with image

Browse source
This commit is contained in:
TheEssem 2020-02-18 14:44:39 -06:00
parent fb59135388
commit 777b86e480
41 changed files with 167 additions and 175 deletions
Download patch file Download diff file Expand all files Collapse all files

44
utils/imagedetect.js
View file

@ -1,9 +1,10 @@
const fetch = require("node-fetch");
const fileType = require("file-type");
const writeFile = require("util").promisify(require("fs").writeFile);
const urlRegex = /(?:\w+:)?\/\/(\S+)/;
// this checks if the file is, in fact, an image
const typeCheck = async (image) => {
const typeCheck = async (image, gifv = false) => {
// download the file to a buffer
const imageRequest = await fetch(image);
const imageBuffer = await imageRequest.buffer();
@ -11,11 +12,18 @@ const typeCheck = async (image) => {
// get the file type
const imageType = await fileType.fromBuffer(imageBuffer);
// check if the file is a jpeg, png, or webp
if (imageType && ["image/jpeg", "image/png", "image/webp", "image/gif"].includes(imageType.mime)) {
const formats = ["image/jpeg", "image/png", "image/webp", "image/gif"];
if (gifv) formats.push("video/mp4");
if (imageType && formats.includes(imageType.mime)) {
// if it is, then return the url with the file type
const path = `/tmp/${Math.random().toString(36).substring(2, 15)}.${imageType.ext}`;
await writeFile(path, imageBuffer);
return {
type: imageType.ext,
data: imageBuffer
data: imageBuffer,
url: image,
outputType: imageType.ext === "mp4" ? "gif" : imageType.ext,
path: path
};
} else {
// if not, then return false
@ -33,7 +41,23 @@ module.exports = async (cmdMessage) => {
// iterate over each message
for (const message of messages) {
// check the attachments first
if (message.attachments.length !== 0) {
if (message.embeds.length !== 0) {
// embeds can have 2 possible entries with images, we check the thumbnail first
if (message.embeds[0].type === "gifv") {
const type = await typeCheck(message.embeds[0].video.url, true);
if (type === false) continue;
return type;
} else if (message.embeds[0].thumbnail) {
const type = await typeCheck(message.embeds[0].thumbnail.url);
if (type === false) continue;
return type;
// if there isn't a thumbnail check the image area
} else if (message.embeds[0].image) {
const type = await typeCheck(message.embeds[0].image.url);
if (type === false) continue;
return type;
}
} else if (message.attachments.length !== 0) {
// get type of file
const type = await typeCheck(message.attachments[0].url);
// move to the next message if the file isn't an image
@ -51,18 +75,6 @@ module.exports = async (cmdMessage) => {
// if the file is an image then return it
return type;
// if there's no urls then check the embeds
} else if (message.embeds.length !== 0) {
// embeds can have 2 possible entries with images, we check the thumbnail first
if (message.embeds[0].thumbnail) {
const type = await typeCheck(message.embeds[0].thumbnail.url);
if (type === false) continue;
return type;
// if there isn't a thumbnail check the image area
} else if (message.embeds[0].image) {
const type = await typeCheck(message.embeds[0].image.url);
if (type === false) continue;
return type;
}
}
}
};