Update code execution, Add back ImageScript v1 (iscript) to tags

Author: cakedan

src/api/endpoints.ts

@@ -229,8 +229,10 @@ export const Api = Object.freeze({
 
   UTILITIES_CODE_RUN:
     '/utilities/code/run',
-  UTILITIES_CODE_RUN2:
-    '/utilities/code/run2',
+  UTILITIES_CODE_RUN_GOCODEIT:
+    '/utilities/code/run/gocodeit',
+  UTILITIES_CODE_RUN_REXTESTER:
+    '/utilities/code/run/rextester',
   UTILITIES_FETCH_DATA:
     '/utilities/fetch/data',
   UTILITIES_FETCH_IMAGE:
@@ -239,6 +241,8 @@ export const Api = Object.freeze({
     '/utilities/fetch/media',
   UTILITIES_FETCH_TEXT:
     '/utilities/fetch/text',
+  UTILITIES_IMAGESCRIPT_V1:
+    '/utilities/imagescript/v1',
   UTILITIES_QR_CREATE:
     '/utilities/qr/create',
   UTILITIES_QR_SCAN:

src/api/index.ts

@@ -976,11 +976,18 @@ export async function uploadCommands(
 }
 
 
-export async function utilitiesCodeRun2(
+export async function utilitiesCodeRun(
   context: RequestContext,
-  options: RestOptions.UtilitiesCodeRun2,
+  options: RestOptions.UtilitiesCodeRun,
 ) {
-  return raw.utilitiesCodeRun2(context, options);
+  return raw.utilitiesCodeRun(context, options);
+}
+
+export async function utilitiesCodeRunRextester(
+  context: RequestContext,
+  options: RestOptions.UtilitiesCodeRunRextester,
+) {
+  return raw.utilitiesCodeRunRextester(context, options);
 }
 
 export async function utilitiesFetchData(
@@ -1013,6 +1020,14 @@ export async function utilitiesFetchText(
 }
 
 
+export async function utilitiesImagescriptV1(
+  context: RequestContext,
+  options: RestOptions.UtilitiesImagescriptV1,
+) {
+  return raw.utilitiesImagescriptV1(context, options);
+}
+
+
 export async function utilitiesQrCreate(
   context: RequestContext,
   options: RestOptions.UtilitiesQrCreate,

src/api/raw.ts

@@ -2014,10 +2014,10 @@ export async function uploadCommands(
 }
 
 
-export async function utilitiesCodeRun2(
+export async function utilitiesCodeRun(
   context: RequestContext,
-  options: RestOptions.UtilitiesCodeRun2,
-): Promise<RestResponsesRaw.UtilitiesCodeRun2> {
+  options: RestOptions.UtilitiesCodeRun,
+): Promise<RestResponsesRaw.UtilitiesCodeRun> {
   const body = {
     code: options.code,
     input: options.input,
@@ -2027,7 +2027,26 @@ export async function utilitiesCodeRun2(
     body,
     route: {
       method: HTTPMethods.POST,
-      path: Api.UTILITIES_CODE_RUN2,
+      path: Api.UTILITIES_CODE_RUN,
+    },
+  });
+}
+
+
+export async function utilitiesCodeRunRextester(
+  context: RequestContext,
+  options: RestOptions.UtilitiesCodeRunRextester,
+): Promise<RestResponsesRaw.UtilitiesCodeRunRextester> {
+  const body = {
+    code: options.code,
+    input: options.input,
+    language: options.language,
+  };
+  return request(context, {
+    body,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.UTILITIES_CODE_RUN_REXTESTER,
     },
   });
 }
@@ -2109,6 +2128,24 @@ export async function utilitiesFetchText(
 }
 
 
+export async function utilitiesImagescriptV1(
+  context: RequestContext,
+  options: RestOptions.UtilitiesImagescriptV1,
+): Promise<Response> {
+  const body = {
+    code: options.code,
+  };
+  return request(context, {
+    dataOnly: false,
+    body,
+    route: {
+      method: HTTPMethods.POST,
+      path: Api.UTILITIES_IMAGESCRIPT_V1,
+    },
+  });
+}
+
+
 export async function utilitiesQrCreate(
   context: RequestContext,
   options: RestOptions.UtilitiesQrCreate,

src/api/types.ts

@@ -391,7 +391,13 @@ export namespace RestOptions {
   }
 
 
-  export interface UtilitiesCodeRun2 {
+  export interface UtilitiesCodeRun {
+    code: string,
+    input?: string,
+    language: string,
+  }
+
+  export interface UtilitiesCodeRunRextester {
     code: string,
     input?: string,
     language: string,
@@ -417,6 +423,10 @@ export namespace RestOptions {
     url: string,
   }
 
+  export interface UtilitiesImagescriptV1 {
+    code: string,
+  }
+
   export interface UtilitiesQrCreate {
     margin?: number,
     query: string,
@@ -1256,9 +1266,23 @@ export namespace RestResponsesRaw {
     type: YoutubeResultTypes.VIDEO,
   }
 
-  export interface UtilitiesCodeRun2 {
+  export interface UtilitiesCodeRun {
+    content: string,
+    error: string,
+    files: Array<string>,
+    stats: {
+      memory: string,
+      time_compilation: number,
+      time_cpu: number,
+      time_running: number,
+      time_service: number,
+    },
+    warnings: string | null,
+  }
+
+  export interface UtilitiesCodeRunRextester {
     content: string,
-    error: string | null,
+    error: string,
     files: Array<string>,
     stats: {
       memory: string,

src/commands/prefixed/tools/code.ts

@@ -1,7 +1,7 @@
 import { Command, CommandClient } from 'detritus-client';
 
 import { CommandTypes } from '../../../constants';
-import { Formatter, Parameters, editOrReply, getCodeRextesterLanguage } from '../../../utils';
+import { Formatter, Parameters, editOrReply, getCodeLanguage } from '../../../utils';
 
 import { BaseCommand } from '../basecommand';
 
@@ -41,7 +41,7 @@ export default class CodeCommand extends BaseCommand<CommandArgs> {
   }
 
   async run(context: Command.Context, args: CommandArgs) {
-    const language = getCodeRextesterLanguage(args.code.language || args.language);
+    const language = getCodeLanguage(args.code.language || args.language);
     if (!language) {
       return editOrReply(context, 'Give me a valid language!');
     }

src/constants.ts

@@ -22,6 +22,105 @@ export enum BooleanEmojis {
 };
 
 
+export enum CodeLanguages {
+  ADA = 'ADA',
+  ASSEMBLY = 'ASSEMBLY',
+  BASH = 'BASH',
+  BRAINFUCK = 'BRAINFUCK',
+  C = 'C',
+  CLOJURE = 'CLOJURE',
+  C_CLANG = 'C_CLANG',
+  C_OBJECTIVE = 'C_OBJECTIVE',
+  C_PLUS_PLUS = 'C_PLUS_PLUS',
+  C_PLUS_PLUS_CLANG = 'C_PLUS_PLUS_CLANG',
+  C_PLUS_PLUS_VC_PLUS_PLUS = 'C_PLUS_PLUS_VC_PLUS_PLUS',
+  C_SHARP = 'C_SHARP',
+  C_VC = 'C_VC',
+  D = 'D',
+  DART = 'DART',
+  ELIXIR = 'ELIXIR',
+  ERLANG = 'ERLANG',
+  FORTRAN = 'FORTRAN',
+  F_SHARP = 'F_SHARP',
+  GO = 'GO',
+  HASKELL = 'HASKELL',
+  HAXE = 'HAXE',
+  JAVA = 'JAVA',
+  JAVASCRIPT = 'JAVASCRIPT',
+  KOTLIN = 'KOTLIN',
+  LISP = 'LISP',
+  LUA = 'LUA',
+  OCAML = 'OCAML',
+  OCTAVE = 'OCTAVE',
+  ORACLE = 'ORACLE',
+  PASCAL = 'PASCAL',
+  PERL = 'PERL',
+  PHP = 'PHP',
+  PROLOG = 'PROLOG',
+  PYTHON_2 = 'PYTHON_2',
+  PYTHON_3 = 'PYTHON_3',
+  R = 'R',
+  RUBY = 'RUBY',
+  RUST = 'RUST',
+  SCALA = 'SCALA',
+  SWIFT = 'SWIFT',
+  TCL = 'TCL',
+  TYPESCRIPT = 'TYPESCRIPT',
+  VB_NET = 'VB_NET',
+}
+
+export const CodeLanguagesToName = Object.freeze({
+  [CodeLanguages.ADA]: ['ada'],
+  [CodeLanguages.ASSEMBLY]: ['assembly', 'asm', 'nasm'],
+  [CodeLanguages.BASH]: ['bash'],
+  [CodeLanguages.BRAINFUCK]: ['brainfuck', 'bf'],
+  [CodeLanguages.C]: ['c(gcc)', 'c'],
+  [CodeLanguages.C_CLANG]: ['c(clang)'],
+  [CodeLanguages.C_OBJECTIVE]: ['objective-c', 'oc', 'obj-c'],
+  [CodeLanguages.C_PLUS_PLUS]: ['c++(gcc)', 'c++', 'cpp'],
+  [CodeLanguages.C_PLUS_PLUS_CLANG]: ['c++(clang)'],
+  [CodeLanguages.C_PLUS_PLUS_VC_PLUS_PLUS]: ['c++(vc++)'],
+  [CodeLanguages.C_SHARP]: ['c#'],
+  [CodeLanguages.C_VC]: ['c(vc)'],
+  [CodeLanguages.CLOJURE]: ['clojure'],
+  [CodeLanguages.D]: ['d'],
+  [CodeLanguages.DART]: ['dart'],
+  [CodeLanguages.ELIXIR]: ['elixir', 'ex'],
+  [CodeLanguages.ERLANG]: ['erlang'],
+  [CodeLanguages.F_SHARP]: ['f#'],
+  [CodeLanguages.FORTRAN]: ['fortran', 'fort'],
+  [CodeLanguages.GO]: ['go'],
+  [CodeLanguages.HAXE]: ['haxe'],
+  [CodeLanguages.HASKELL]: ['haskell', 'hs'],
+  [CodeLanguages.JAVA]: ['java'],
+  [CodeLanguages.JAVASCRIPT]: ['javascript', 'js', 'node.js', 'node'],
+  [CodeLanguages.KOTLIN]: ['kotlin', 'kot'],
+  [CodeLanguages.LISP]: ['commonlisp', 'lisp'],
+  [CodeLanguages.LUA]: ['lua'],
+  //[CodeLanguages.MYSQL]: ['mysql'],
+  [CodeLanguages.OCAML]: ['ocaml'],
+  [CodeLanguages.OCTAVE]: ['octave'],
+  [CodeLanguages.ORACLE]: ['oracle'],
+  [CodeLanguages.PASCAL]: ['pascal'],
+  [CodeLanguages.PERL]: ['perl'],
+  [CodeLanguages.PHP]: ['php', 'php7'],
+  //[CodeLanguages.POSTGRES_SQL]: ['postgresql', 'psql', 'postgres'],
+  [CodeLanguages.PROLOG]: ['prolog'],
+  [CodeLanguages.PYTHON_2]: ['python2', 'python2.7', 'py2.7', 'py2'],
+  [CodeLanguages.PYTHON_3]: ['python', 'python3', 'py', 'py3'],
+  [CodeLanguages.R]: ['r'],
+  [CodeLanguages.RUBY]: ['ruby', 'rb'],
+  [CodeLanguages.RUST]: ['rust', 'rs'],
+  [CodeLanguages.SCALA]: ['scala'],
+  //[CodeLanguages.SCHEME]: ['scheme'],
+  //[CodeLanguages.SQL_SERVER]: ['sqlserver'],
+  [CodeLanguages.SWIFT]: ['swift'],
+  [CodeLanguages.TCL]: ['tcl'],
+  [CodeLanguages.TYPESCRIPT]: ['typescript', 'ts'],
+  [CodeLanguages.VB_NET]: ['visualbasic', 'vb'],
+});
+
+
 export enum CodeRextesterLanguages {
     ADA = 'ADA',
     ASSEMBLY = 'ASSEMBLY',
@@ -111,7 +210,6 @@ export const CodeRextesterLanguagesToName = Object.freeze({
   //[CodeRextesterLanguages.SQL_SERVER]: ['sqlserver'],
   [CodeRextesterLanguages.SWIFT]: ['swift'],
   [CodeRextesterLanguages.TCL]: ['tcl'],
-  [CodeRextesterLanguages.LUA]: ['lua'],
   [CodeRextesterLanguages.VB_NET]: ['visualbasic', 'vb'],
 });
 

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

@@ -2,7 +2,7 @@ import { Command, Interaction } from 'detritus-client';
 import { MessageFlags } from 'detritus-client/lib/constants';
 import { Embed, Markup } from 'detritus-client/lib/utils';
 
-import { utilitiesCodeRun2 } from '../../../api';
+import { utilitiesCodeRun } from '../../../api';
 import {
   EmbedBrands,
   EmbedColors,
@@ -30,7 +30,7 @@ export async function createMessage(
     guild.presences = [];
     guild.voice_states = [];
   }
-  const { content, error, stats } = await utilitiesCodeRun2(context, {
+  const { content, error, stats } = await utilitiesCodeRun(context, {
     code: args.code,
     input: JSON.stringify({
       channel: context.channel,