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

Compare commits

base: murm:c11fa40dfc68d5cf7209c75481dc74c5db40d8b7
Branches Tags
murm:master
..
compare: murm:e67c0d96ca4b771d58d1de83e8d3cd633f2375b3
Branches Tags
murm:master

No commits in common. "c11fa40dfc68d5cf7209c75481dc74c5db40d8b7" and "e67c0d96ca4b771d58d1de83e8d3cd633f2375b3" have entirely different histories.
c11fa40dfc ... e67c0d96ca

2 changed files with 2 additions and 5 deletions
Show stats Expand all files Collapse all files

2
classes/imageCommand.js
View file

@ -40,7 +40,7 @@ class ImageCommand extends Command {
if (selection) selectedImages.delete(this.author); if (selection) selectedImages.delete(this.author);
if (image === undefined) { if (image === undefined) {
runningCommands.delete(this.author); runningCommands.delete(this.author);
return `${this.constructor.noImage} (Tip: try running your command while replying to an image (or link to an image))`; return `${this.constructor.noImage} (Tip: try right-clicking/holding on a message and press Apps -> Select Image, then try again.)`;
} else if (image.type === "large") { } else if (image.type === "large") {
runningCommands.delete(this.author); runningCommands.delete(this.author);
return "That image is too large (>= 25MB)! Try using a smaller image."; return "That image is too large (>= 25MB)! Try using a smaller image.";

5
utils/imagedetect.js
View file

@ -142,10 +142,7 @@ const checkImages = async (message, extraReturnTypes, video, sticker) => {
url = url.replace(/.*\n\n/g, "") url = url.replace(/.*\n\n/g, "")
if (isValidUrl(url)){ if (isValidUrl(url)){
const mimetype = await getType(url, extraReturnTypes) const mimetype = await getType(url, extraReturnTypes)
// console.log(mimetype) type = {name: "image", path: url, url: url, type: mimetype}
if (mimetype && imageFormats.includes(mimetype)) {
type = {name: "image", path: url, url: url, type: mimetype}
}
} }
} }