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

Made image detection start with replies

Browse source
This commit is contained in:
TheEssem 2021-04-19 22:06:40 -05:00
parent 7db1aa880c
commit 2a22c73654
2 changed files with 456 additions and 616 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1060
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

8
utils/imagedetect.js
View file

@ -102,10 +102,7 @@ const checkImages = async (message, video) => {
// this checks for the latest message containing an image and returns the url of the image // this checks for the latest message containing an image and returns the url of the image
module.exports = async (client, cmdMessage, video = false) => { module.exports = async (client, cmdMessage, video = false) => {
// we start by checking the current message for images // we start by checking if the message is a reply to another message
const result = await checkImages(cmdMessage, video);
if (result !== false) return result;
// if there aren't any in the current message then check if there's a reply
if (cmdMessage.messageReference) { if (cmdMessage.messageReference) {
const replyMessage = await client.getMessage(cmdMessage.messageReference.channelID, cmdMessage.messageReference.messageID); const replyMessage = await client.getMessage(cmdMessage.messageReference.channelID, cmdMessage.messageReference.messageID);
if (replyMessage) { if (replyMessage) {
@ -113,6 +110,9 @@ module.exports = async (client, cmdMessage, video = false) => {
if (replyResult !== false) return replyResult; if (replyResult !== false) return replyResult;
} }
} }
// then we check the current message
const result = await checkImages(cmdMessage, video);
if (result !== false) return result;
// if there aren't any replies then iterate over the last few messages in the channel // if there aren't any replies then iterate over the last few messages in the channel
const messages = await cmdMessage.channel.getMessages(); const messages = await cmdMessage.channel.getMessages();
// iterate over each message // iterate over each message