Add /tools screenshot slash command

Author: cakedan

package.json

@@ -9,7 +9,7 @@
   ],
   "dependencies": {
     "@sentry/node": "^6.4.1",
-    "detritus-client": "^0.16.4-beta.4",
+    "detritus-client": "^0.16.4-beta.5",
     "emoji-aware": "^3.0.5",
     "juration": "^0.1.1",
     "moment": "^2.29.1",

src/commands/interactions/slash/tools/index.ts

@@ -1,6 +1,7 @@
 import { BaseSlashCommand } from '../../basecommand';
 
 import { ToolsHashCommand } from './hash';
+import { ToolsScreenshotCommand } from './screenshot';
 
 
 export default class ToolsGroupCommand extends BaseSlashCommand {
@@ -11,6 +12,7 @@ export default class ToolsGroupCommand extends BaseSlashCommand {
     super({
       options: [
         new ToolsHashCommand(),
+        new ToolsScreenshotCommand(),
       ],
     });
   }

src/commands/interactions/slash/tools/screenshot.ts

@@ -0,0 +1,28 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter, Parameters } from '../../../../utils';
+
+import { BaseInteractionCommandOption } from '../../basecommand';
+
+
+export class ToolsScreenshotCommand extends BaseInteractionCommandOption {
+  description = 'Screenshot a website';
+  name = 'screenshot';
+
+  constructor() {
+    super({
+      options: [
+        {
+          name: 'url',
+          description: 'URL to screenshot',
+          required: true,
+          value: Parameters.url,
+        },
+      ],
+    });
+  }
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.ToolsScreenshot.CommandArgs) {
+    return Formatter.Commands.ToolsScreenshot.createMessage(context, args);
+  }
+}

src/commands/prefixed/tools/screenshot.ts

@@ -1,8 +1,7 @@
 import { Command, CommandClient } from 'detritus-client';
 
-import { utilitiesScreenshot } from '../../../api';
 import { CommandTypes } from '../../../constants';
-import { Parameters, imageReply } from '../../../utils';
+import { Formatter, Parameters } from '../../../utils';
 
 import { BaseCommand } from '../basecommand';
 
@@ -37,7 +36,6 @@ export default class ScreenshotCommand extends BaseCommand<CommandArgs> {
   }
 
   async run(context: Command.Context, args: CommandArgs) {
-    const response = await utilitiesScreenshot(context, args);
-    return imageReply(context, response);
+    return Formatter.Commands.ToolsScreenshot.createMessage(context, args);
   }
 }

src/utils/formatter/commands/index.ts

@@ -36,6 +36,7 @@ import * as ToolsHash from './tools.hash';
 import * as ToolsOCR from './tools.ocr';
 import * as ToolsOCRTranslate from './tools.ocrtranslate';
 import * as ToolsQrScan from './tools.qr.scan';
+import * as ToolsScreenshot from './tools.screenshot';
 import * as ToolsTranslate from './tools.translate';
 
 export {
@@ -72,5 +73,6 @@ export {
   ToolsOCR,
   ToolsOCRTranslate,
   ToolsQrScan,
+  ToolsScreenshot,
   ToolsTranslate,
 };

src/utils/formatter/commands/tools.screenshot.ts

@@ -0,0 +1,17 @@
+import { Command, Interaction } from 'detritus-client';
+
+import { utilitiesScreenshot } from '../../../api';
+import { imageReply } from '../../../utils';
+
+
+export interface CommandArgs {
+  url: string,
+}
+
+export async function createMessage(
+  context: Command.Context | Interaction.InteractionContext,
+  args: CommandArgs,
+) {
+  const response = await utilitiesScreenshot(context, args);
+  return imageReply(context, response);
+}

src/utils/parameters/index.ts

@@ -711,6 +711,7 @@ export async function imageUrl(
                   return url;
                 }
               }
+              return null;
             }
           }
 
@@ -841,9 +842,10 @@ export async function lastImageUrls(
               const url = findImageUrlInMessages([message]);
               if (url) {
                 urls.add(url);
-                found = true;
               }
             }
+            // ignore this url no matter what
+            found = true;
           }
         }
 
@@ -942,6 +944,7 @@ export async function imageUrlPositional(
                   return url;
                 }
               }
+              return null;
             }
           }