Add code execution

- Add `.code`
- Add support for code execution in tags

Author: cakedan

src/api/endpoints.ts

@@ -151,6 +151,8 @@ export const Api = Object.freeze({
     '/image/tools/background/remove',
   IMAGE_TOOLS_CONVERT:
     '/image/tools/convert',
+  IMAGE_TOOLS_CROP:
+    '/image/tools/crop',
   IMAGE_TOOLS_GIF_REVERSE:
     '/image/tools/gif/reverse',
   IMAGE_TOOLS_GIF_SEE_SAW:
@@ -225,6 +227,10 @@ export const Api = Object.freeze({
   USER_TAGS:
     '/users/:userId/tags',
 
+  UTILITIES_CODE_RUN:
+    '/utilities/code/run',
+  UTILITIES_CODE_RUN2:
+    '/utilities/code/run2',
   UTILITIES_FETCH_DATA:
     '/utilities/fetch/data',
   UTILITIES_FETCH_IMAGE:

src/api/index.ts

@@ -701,6 +701,14 @@ export async function imageToolsConvert(
 }
 
 
+export async function imageToolsCrop(
+  context: RequestContext,
+  options: RestOptions.ImageToolsCrop,
+) {
+  return raw.imageToolsCrop(context, options);
+}
+
+
 export async function imageToolsGifReverse(
   context: RequestContext,
   options: RestOptions.ImageBaseOptions,
@@ -968,6 +976,13 @@ export async function uploadCommands(
 }
 
 
+export async function utilitiesCodeRun2(
+  context: RequestContext,
+  options: RestOptions.UtilitiesCodeRun2,
+) {
+  return raw.utilitiesCodeRun2(context, options);
+}
+
 export async function utilitiesFetchData(
   context: RequestContext,
   options: RestOptions.UtilitiesFetchData,

src/api/raw.ts

@@ -1430,6 +1430,25 @@ export async function imageToolsConvert(
 }
 
 
+export async function imageToolsCrop(
+  context: RequestContext,
+  options: RestOptions.ImageToolsCrop,
+): Promise<Response> {
+  const query = {
+    size: options.size,
+    url: options.url,
+  };
+  return request(context, {
+    dataOnly: false,
+    query,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.IMAGE_TOOLS_CROP,
+    },
+  });
+}
+
+
 export async function imageToolsGifReverse(
   context: RequestContext,
   options: RestOptions.ImageBaseOptions,
@@ -1995,6 +2014,25 @@ export async function uploadCommands(
 }
 
 
+export async function utilitiesCodeRun2(
+  context: RequestContext,
+  options: RestOptions.UtilitiesCodeRun2,
+): Promise<RestResponsesRaw.UtilitiesCodeRun2> {
+  const body = {
+    code: options.code,
+    input: options.input,
+    language: options.language,
+  };
+  return request(context, {
+    body,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.UTILITIES_CODE_RUN2,
+    },
+  });
+}
+
+
 export async function utilitiesFetchData(
   context: RequestContext,
   options: RestOptions.UtilitiesFetchData,

src/api/types.ts

@@ -212,6 +212,10 @@ export namespace RestOptions {
     to: string,
   }
 
+  export interface ImageToolsCrop extends ImageBaseOptions {
+    size?: string,
+  }
+
   export interface ImageToolsGifSpeed extends ImageBaseOptions {
     loop?: boolean,
     speed: number,
@@ -387,6 +391,12 @@ export namespace RestOptions {
   }
 
 
+  export interface UtilitiesCodeRun2 {
+    code: string,
+    input?: string,
+    language: string,
+  }
+
   export interface UtilitiesFetchData {
     maxFileSize?: number,
     url: string,
@@ -1246,6 +1256,19 @@ export namespace RestResponsesRaw {
     type: YoutubeResultTypes.VIDEO,
   }
 
+  export interface UtilitiesCodeRun2 {
+    content: string,
+    error: string | null,
+    files: Array<string>,
+    stats: {
+      memory: string,
+      time_cpu: number,
+      time_running: number,
+      time_service: number,
+    },
+    warnings: string | null,
+  }
+
   export interface UtilitiesQrScan {
     scanned: Array<{
       data: string,

src/commands/interactions/slash/image/tools/crop.ts

@@ -0,0 +1,17 @@
+import { Interaction } from 'detritus-client';
+
+import { Formatter } from '../../../../../utils';
+
+import { BaseInteractionImageCommandOption } from '../../../basecommand';
+
+
+export const COMMAND_NAME = 'crop';
+
+export class ImageToolsCropCommand extends BaseInteractionImageCommandOption {
+  description = 'Crop an Image';
+  name = COMMAND_NAME;
+
+  async run(context: Interaction.InteractionContext, args: Formatter.Commands.ImageToolsCrop.CommandArgs) {
+    return Formatter.Commands.ImageToolsCrop.createMessage(context, args);
+  }
+}

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

@@ -1,6 +1,7 @@
 import { BaseInteractionCommandOptionGroup } from '../../../basecommand';
 
 import { ImageToolsConvertCommand } from './convert';
+import { ImageToolsCropCommand } from './crop';
 import { ImageToolsResizeCommand } from './resize';
 
 
@@ -12,6 +13,7 @@ export class ImageToolsGroupCommand extends BaseInteractionCommandOptionGroup {
     super({
       options: [
         new ImageToolsConvertCommand(),
+        new ImageToolsCropCommand(),
         new ImageToolsResizeCommand(),
       ],
     });

src/commands/interactions/slash/owner/eval.ts

@@ -57,10 +57,10 @@ export class OwnerEvalCommand extends BaseInteractionCommandOption<CommandArgs>
     let errored: boolean = false;
     try {
       if (args.async) {
-        const func = new AsyncFunction('context', code);
+        const func = new AsyncFunction('context', code.text);
         message = await func(context);
       } else {
-        message = await Promise.resolve(eval(code));
+        message = await Promise.resolve(eval(code.text));
       }
       if (typeof(message) === 'object') {
         message = JSON.stringify(message, null, args.jsonspacing);

src/commands/prefixed/image/crop.ts

@@ -0,0 +1,31 @@
+import { Command, CommandClient } from 'detritus-client';
+
+import { CommandTypes } from '../../../constants';
+import { Formatter } from '../../../utils';
+
+import { BaseImageCommand } from '../basecommand';
+
+
+export const COMMAND_NAME = 'crop';
+
+export default class CropCommand extends BaseImageCommand<Formatter.Commands.ImageToolsCrop.CommandArgs> {
+  constructor(client: CommandClient) {
+    super(client, {
+      name: COMMAND_NAME,
+
+      metadata: {
+        description: 'Crop an image',
+        examples: [
+          COMMAND_NAME,
+          `${COMMAND_NAME} notsobot`,
+        ],
+        type: CommandTypes.IMAGE,
+        usage: '?<emoji,user:id|mention|name,url>',
+      },
+    });
+  }
+
+  async run(context: Command.Context, args: Formatter.Commands.ImageToolsCrop.CommandArgs) {
+    return Formatter.Commands.ImageToolsCrop.createMessage(context, args);
+  }
+}

src/commands/prefixed/owner/eval.ts

@@ -12,7 +12,7 @@ const AsyncFunction = Object.getPrototypeOf(async function(){}).constructor;
 
 export interface CommandArgs {
   async: boolean,
-  code: string,
+  code: {language?: string, text: string},
   jsonspacing: number,
   noembed: boolean,
   noreply: boolean,
@@ -60,10 +60,10 @@ export default class EvalCommand extends BaseCommand {
     let errored: boolean = false;
     try {
       if (args.async) {
-        const func = new AsyncFunction('context', code);
+        const func = new AsyncFunction('context', code.text);
         message = await func(context);
       } else {
-        message = await Promise.resolve(eval(code));
+        message = await Promise.resolve(eval(code.text));
       }
       if (typeof(message) === 'object') {
         message = JSON.stringify(message, null, args.jsonspacing);

src/commands/prefixed/tools/code.ts

@@ -0,0 +1,53 @@
+import { Command, CommandClient } from 'detritus-client';
+
+import { CommandTypes } from '../../../constants';
+import { Formatter, Parameters, editOrReply, getCodeRextesterLanguage } from '../../../utils';
+
+import { BaseCommand } from '../basecommand';
+
+
+export interface CommandArgsBefore {
+  code: {language?: string, text: string},
+  language?: string,
+}
+
+export interface CommandArgs {
+  code: {language?: string, text: string},
+  language: string,
+}
+
+export const COMMAND_NAME = 'code';
+
+export default class CodeCommand extends BaseCommand<CommandArgs> {
+  constructor(client: CommandClient) {
+    super(client, {
+      name: COMMAND_NAME,
+
+      args: [
+        {name: 'language', aliases: ['l']},
+      ],
+      metadata: {
+        description: 'Execute code',
+        examples: [
+          COMMAND_NAME,
+          `${COMMAND_NAME} \`\`\`js console.log('lol')\`\`\``,
+          `${COMMAND_NAME} console.log('lol'); -language js`,
+        ],
+        type: CommandTypes.TOOLS,
+        usage: '<code> (-language <language>)',
+      },
+      type: Parameters.codeblock,
+    });
+  }
+
+  async run(context: Command.Context, args: CommandArgs) {
+    const language = getCodeRextesterLanguage(args.code.language || args.language);
+    if (!language) {
+      return editOrReply(context, 'Give me a valid language!');
+    }
+    return Formatter.Commands.ToolsCode.createMessage(context, {
+      code: args.code.text,
+      language,
+    });
+  }
+}