feat: get images from past messages

Author: Snazzah

.env.example

@@ -2,6 +2,7 @@ DISCORD_APP_ID=
 DISCORD_PUBLIC_KEY=
 DISCORD_BOT_TOKEN=
 COMMANDS_DEBUG=false
+LOOKBACK_LIMIT=25
 WEEBSH_KEY=
 IMGSRV_CACHE_TIMEOUT=3600000
 IMGSRV_INTERVAL=60000

package.json

@@ -4,8 +4,8 @@
   "description": "Slash commands for PhotoBox",
   "main": "dist/index.js",
   "scripts": {
-    "start": "npx shx NODE_ENV=production cd dist && node index.js",
-    "build": "npx shx rm -rf dist && tsc",
+    "start": "NODE_ENV=production cd dist && node index.js",
+    "build": "npx rimraf dist && tsc",
     "dev": "devScript",
     "dev:ts": "cd src && ts-node index.ts",
     "lint": "npx eslint --ext .ts ./src",

src/imgsrv/abstracts.ts

@@ -34,32 +34,32 @@ export abstract class GenerationCommand extends SlashCommand {
     });
   }
 
-  async generate(ctx: CommandContext, payload: ImgSrvPayload) {
-    if (!this.endpoint) return 'No endpoint was defined for this command.';
+  async generate(ctx: CommandContext, payload: ImgSrvPayload, endpoint = this.endpoint) {
+    if (!endpoint) return 'No endpoint was defined for this command.';
 
     await ctx.defer(false);
     try {
       logger.info(oneLine`
-        Generating '${this.endpoint}' for
+        Generating '${endpoint}' for
         ${ctx.user.username}#${ctx.user.discriminator} (${ctx.user.id})
       `);
       const before = Date.now();
-      const image = await generate(this.endpoint, payload);
+      const image = await generate(endpoint, payload);
       const after = Date.now();
       const diff = after - before;
       logger.info(oneLine`
-        '${this.endpoint}' for
+        '${endpoint}' for
         ${ctx.user.username}#${ctx.user.discriminator} (${ctx.user.id})
         took ${prettyMilliseconds(diff)}
       `);
       return {
-        file: { file: image.buffer, name: `${this.endpoint}.${image.extension}` },
+        file: { file: image.buffer, name: `${endpoint}.${image.extension}` },
         content: `Took ${prettyMilliseconds(after - before)} to render.`
       };
     } catch (err) {
       logger.error(
         oneLine`
-          '${this.endpoint}' for
+          '${endpoint}' for
           ${ctx.user.username}#${ctx.user.discriminator} (${ctx.user.id})
           errored
         `,
@@ -88,7 +88,7 @@ export abstract class ImageCommand extends GenerationCommand {
         {
           name: 'avatar',
           type: CommandOptionType.USER,
-          description: 'Use the avatar of the given user, defaults to your avatar.'
+          description: 'Use the avatar of the given user, defaults to the last posted image.'
         }
       ]
     });
@@ -98,7 +98,7 @@ export abstract class ImageCommand extends GenerationCommand {
     const user = ctx.users.first() || ctx.user;
     const media = ctx.options.media as string;
 
-    const result = await find(user, media);
+    const result = await find(user, media, ctx, ctx.users.size === 1);
     const payload: ImagePayload = { image: result.url };
 
     return this.generate(ctx, payload);

src/media/index.ts

@@ -2,7 +2,7 @@ import emojilib from 'emojilib';
 import path from 'path';
 import Extractor from './extractor';
 import { iterateFolder } from '../util';
-import { User } from 'slash-create';
+import { User, CommandContext, MessageData } from 'slash-create';
 
 export const CUSTOM_EMOJI_REGEX = /<(a?):([0-9a-zA-Z-_]+):(\d+)>/;
 export const URL_REGEX = /https?:\/\/[^\s<|]+[^<.,:;"')\]\s>|*_~`]/i;
@@ -67,12 +67,65 @@ export function clearCache() {
   for (const extractor of extractors) extractor.clearCache();
 }
 
-export async function find(user: User, media?: string): Promise<FindMediaResult> {
+export async function fetchMessages(ctx: CommandContext): Promise<MessageData[]> {
+  try {
+    return ctx.creator.requestHandler.request(
+      'get',
+      `/channels/${ctx.channelID}/messages?limit=${process.env.LOOKBACK_LIMIT || 25}`
+    );
+  } catch (e) {
+    return null;
+  }
+}
+
+export async function findFromMessage(message: MessageData): Promise<FindMediaResult | null> {
+  // Attachment
+  if (message.attachments.length)
+    return {
+      url: message.attachments[0].url,
+      from: 'attachment',
+      past: true
+    };
+
+  // Embed
+  if (message.embeds.length) {
+    const targetURL = message.embeds
+      .filter((embed) => (embed.image && embed.image.url) || (embed.thumbnail && embed.thumbnail.url))
+      .map((embed) => (embed.image ? embed.image.url : embed.thumbnail!.url))[0];
+    if (targetURL)
+      return {
+        url: targetURL,
+        from: 'embed',
+        past: true
+      };
+  }
+
+  // URL detection
+  if (URL_REGEX.test(message.content)) {
+    const targetURL = message.content.match(URL_REGEX)![1];
+    const convertedURL = targetURL ? (await parseURL(targetURL)) || targetURL : targetURL;
+    if (targetURL)
+      return {
+        url: convertedURL,
+        from: 'url',
+        past: true
+      };
+  }
+
+  return null;
+}
+
+export async function find(
+  user: User,
+  media?: string,
+  ctx?: CommandContext,
+  preferUser = false
+): Promise<FindMediaResult> {
   if (media) {
     // URL detection
     if (URL_REGEX.test(media)) {
       const targetURL = media.match(URL_REGEX)![1];
-      const convertedURL = targetURL ? (await this.parseURL(targetURL)) || targetURL : targetURL;
+      const convertedURL = targetURL ? (await parseURL(targetURL)) || targetURL : targetURL;
       if (targetURL)
         return {
           url: convertedURL,
@@ -88,6 +141,7 @@ export async function find(user: User, media?: string): Promise<FindMediaResult>
         from: 'customEmoji'
       };
     }
+
     // Emoji (Longer length emojis get priority)
     const emojiMatches = Object.keys(emojilib)
       .filter((emoji) => media.startsWith(emoji))
@@ -100,6 +154,17 @@ export async function find(user: User, media?: string): Promise<FindMediaResult>
       };
   }
 
+  if (ctx && !preferUser) {
+    const messages = await fetchMessages(ctx);
+    if (messages) {
+      for (const message of messages) {
+        // TODO filter other message types
+        const messageResult = await findFromMessage(message);
+        if (messageResult) return messageResult;
+      }
+    }
+  }
+
   // User's Avatar
   return {
     url: user.dynamicAvatarURL(user.avatar?.startsWith('a_') ? 'gif' : 'png', 1024),