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

Get slash command attachments working on stable eris

Browse source
This commit is contained in:
Essem 2022-06-20 10:55:55 -05:00
parent 34c0ee14e0
commit ef97602d32
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
utils/imagedetect.js
View file

@ -34,7 +34,7 @@ const imageFormats = ["image/jpeg", "image/png", "image/webp", "image/gif", "lar
const videoFormats = ["video/mp4", "video/webm", "video/mov"]; const videoFormats = ["video/mp4", "video/webm", "video/mov"];
// gets the proper image paths // gets the proper image paths
const getImage = async (image, image2, video, extraReturnTypes, gifv = false) => { const getImage = async (image, image2, video, extraReturnTypes, gifv = false, type = null) => {
try { try {
const payload = { const payload = {
url: image2, url: image2,
@ -73,10 +73,10 @@ const getImage = async (image, image2, video, extraReturnTypes, gifv = false) =>
} }
payload.type = "image/gif"; payload.type = "image/gif";
} else if (video) { } else if (video) {
payload.type = await getType(payload.path, extraReturnTypes); payload.type = type ?? await getType(payload.path, extraReturnTypes);
if (!payload.type || (!videoFormats.includes(payload.type) && !imageFormats.includes(payload.type))) return; if (!payload.type || (!videoFormats.includes(payload.type) && !imageFormats.includes(payload.type))) return;
} else { } else {
payload.type = await getType(payload.path, extraReturnTypes); payload.type = type ?? await getType(payload.path, extraReturnTypes);
if (!payload.type || !imageFormats.includes(payload.type)) return; if (!payload.type || !imageFormats.includes(payload.type)) return;
} }
return payload; return payload;
@ -126,8 +126,8 @@ export default async (client, cmdMessage, interaction, options, extraReturnTypes
// we can get a raw attachment or a URL in the interaction itself // we can get a raw attachment or a URL in the interaction itself
if (options) { if (options) {
if (options.image) { if (options.image) {
const attachment = interaction.data.resolved.attachments.get(options.image); const attachment = interaction.data.resolved.attachments[options.image];
const result = await getImage(attachment.proxyUrl, attachment.url, video); const result = await getImage(attachment.proxy_url, attachment.url, video, attachment.content_type);
if (result !== false) return result; if (result !== false) return result;
} else if (options.link) { } else if (options.link) {
const result = await getImage(options.link, options.link, video); const result = await getImage(options.link, options.link, video);