Inject JS code into code execution

Author: cakedan

src/commands/prefixed/tools/code.ts

@@ -1,6 +1,6 @@
 import { Command, CommandClient } from 'detritus-client';
 
-import { CommandTypes } from '../../../constants';
+import { CodeLanguages, CommandTypes } from '../../../constants';
 import { Formatter, Parameters, editOrReply, getCodeLanguage } from '../../../utils';
 
 import { BaseCommand } from '../basecommand';
@@ -41,13 +41,24 @@ export default class CodeCommand extends BaseCommand<CommandArgs> {
   }
 
   async run(context: Command.Context, args: CommandArgs) {
-    const language = getCodeLanguage(args.code.language || args.language);
+    let code = args.code.text;
+
+    let language: CodeLanguages | null = null;
+    if (!args.code.language) {
+      const parts = code.split(' ');
+      language = getCodeLanguage(parts[0]);
+      if (language) {
+        code = parts.slice(1).join(' ');
+      }
+    }
+    if (!language) {
+      language = getCodeLanguage(args.code.language || args.language);
+    }
+
     if (!language) {
       return editOrReply(context, `Give me a valid language! (One of ${Formatter.Commands.ToolsCode.languagesText})`);
     }
-    return Formatter.Commands.ToolsCode.createMessage(context, {
-      code: args.code.text,
-      language,
-    });
+
+    return Formatter.Commands.ToolsCode.createMessage(context, {code, language});
   }
 }

src/constants.ts

@@ -12,6 +12,8 @@ import {
 
 
 
+export const MAX_MEMBERS_SAFE = 1000;
+
 export const MOMENT_FORMAT = 'y [years], w [weeks], d [days], h [hours], m [minutes], s [seconds]';
 export const SNOWFLAKE_EPOCH = 1564790400000;
 

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

@@ -1,4 +1,4 @@
-import { Command, Interaction } from 'detritus-client';
+import { Collections, Command, Interaction, Structures } from 'detritus-client';
 import { MessageFlags } from 'detritus-client/lib/constants';
 import { Embed, Markup } from 'detritus-client/lib/utils';
 
@@ -8,9 +8,17 @@ import {
   CodeLanguagesToName,
   EmbedBrands,
   EmbedColors,
+  MAX_MEMBERS_SAFE,
 } from '../../../constants';
 
-import { createUserEmbed, editOrReply, toTitleCase } from '../../tools';
+import {
+  createUserEmbed,
+  editOrReply,
+  generateCodeFromLanguage,
+  generateCodeStdin,
+  toTitleCase,
+} from '../../tools';
+
 
 
 export const languagesText = Object.values(CodeLanguages).map((x: any) => {
@@ -25,7 +33,7 @@ export const COMMAND_ID = 'tools code';
 
 export interface CommandArgs {
   code: string,
-  language: string,
+  language: CodeLanguages,
 }
 
 export async function createMessage(
@@ -34,26 +42,9 @@ export async function createMessage(
 ) {
   const isFromInteraction = (context instanceof Interaction.InteractionContext);
 
-  let guild: any = context.guild;
-  if (guild) {
-    guild = guild.toJSON();
-    guild.members = [];
-    guild.presences = [];
-    guild.voice_states = [];
-  }
   const { content, error, stats } = await utilitiesCodeRun(context, {
-    code: args.code,
-    input: JSON.stringify({
-      channel: context.channel,
-      channel_id: context.channelId,
-      guild,
-      guild_id: context.guildId,
-      member: context.member,
-      member_bot: context.me,
-      message: (context instanceof Command.Context) ? context.message : null,
-      user: context.user,
-      user_bot: context.client.user,
-    }),
+    code: generateCodeFromLanguage(args.language, args.code),
+    input: generateCodeStdin(context),
     language: args.language,
   });
 

src/utils/paginator.ts

@@ -467,6 +467,13 @@ export class Paginator {
         }; break;
         case PageButtonNames.STOP: {
           await this.onStop(null, true, context, true);
+          if (context instanceof Command.Context && !context.message.deleted && context.message.canDelete) {
+            try {
+              await context.message.delete();
+            } catch(error) {
+    
+            }
+          }
         }; break;
         default: {
           return;

src/utils/tags.ts

@@ -1,18 +1,20 @@
 import { runInNewContext } from 'vm';
 
-import { Command, Interaction, Structures } from 'detritus-client';
+import { Collections, Command, Interaction, Structures } from 'detritus-client';
 import { MAX_ATTACHMENT_SIZE } from 'detritus-client/lib/constants';
 import { Markup } from 'detritus-client/lib/utils';
 
 import { utilitiesCodeRun, utilitiesFetchMedia, utilitiesFetchText, utilitiesImagescriptV1 } from '../api';
-import { CodeLanguages } from '../constants';
+import { CodeLanguages, MAX_MEMBERS_SAFE } from '../constants';
 
 import * as DefaultParameters from './defaultparameters';
 import * as Parameters from './parameters';
 import {
   bigIntGenerateBetween,
   bigIntMax,
   bigIntMin,
+  generateCodeFromLanguage,
+  generateCodeStdin,
   getCodeLanguage,
   randomFromArray,
   randomFromIterator,
@@ -95,7 +97,7 @@ export const AllowedDiscordProperties = Object.freeze({
 
 export enum TagIfComparisons {
   EQUAL = '=',
-  NOT_EQUAL = "!=",
+  EQUAL_NOT = "!=",
   GREATER_THAN = '>',
   GREATER_THAN_OR_EQUAL = '>=',
   LESS_THAN = '<',
@@ -106,7 +108,7 @@ export enum TagIfComparisons {
 
 export const TAG_IF_COMPARISONS = [
   TagIfComparisons.EQUAL,
-  TagIfComparisons.NOT_EQUAL,
+  TagIfComparisons.EQUAL_NOT,
   TagIfComparisons.GREATER_THAN,
   TagIfComparisons.GREATER_THAN_OR_EQUAL,
   TagIfComparisons.LESS_THAN,
@@ -485,27 +487,9 @@ const ScriptTags = Object.freeze({
     tag.variables[PrivateVariables.NETWORK_REQUESTS]++;
 
     if (arg) {
-      let guild: any = context.guild;
-      if (guild) {
-        guild = guild.toJSON();
-        guild.members = [];
-        guild.presences = [];
-        guild.voice_states = [];
-      }
       const response = await utilitiesCodeRun(context, {
-        code: arg,
-        input: JSON.stringify({
-          channel: context.channel,
-          channel_id: context.channelId,
-          guild,
-          guild_id: context.guildId,
-          member: context.member,
-          member_bot: context.me,
-          message: (context instanceof Command.Context) ? context.message : null,
-          user: context.user,
-          user_bot: context.client.user,
-          variables: tag.variables,
-        }),
+        code: generateCodeFromLanguage(language, arg),
+        input: generateCodeStdin(context, tag.variables),
         language,
       });
       if (response.error) {
@@ -913,7 +897,7 @@ const ScriptTags = Object.freeze({
       case TagIfComparisons.EQUAL: {
         compared = values[0] === values[1];
       }; break;
-      case TagIfComparisons.NOT_EQUAL: {
+      case TagIfComparisons.EQUAL_NOT: {
         compared = values[0] !== values[1];
       }; break;
       case TagIfComparisons.GREATER_THAN:

src/utils/tools.ts

@@ -18,6 +18,7 @@ import {
   LanguageCodesText,
   Mimetypes,
   Timezones,
+  MAX_MEMBERS_SAFE,
   MIMETYPES_SAFE_EMBED,
   TRUSTED_URLS,
 } from '../constants';
@@ -832,6 +833,68 @@ export function formatTime(ms: number, options: FormatTimeOptions = {}): string
 }
 
 
+export function generateCodeFromLanguage(language: CodeLanguages, code: string): string {
+  switch (language) {
+    case CodeLanguages.JAVASCRIPT: {
+      code = `(() => {global.discord = JSON.parse(require('fs').readFileSync(0))})();` + '\n'.repeat(5) + code;
+    }; break;
+  }
+  return code;
+}
+
+
+export function generateCodeStdin(
+  context: Command.Context | Interaction.InteractionContext,
+  variables?: Record<any, any>,
+): string {
+  let guild: any = context.guild;
+  if (guild) {
+    guild = guild.toJSON();
+    if (MAX_MEMBERS_SAFE < guild.members.length) {
+      guild.members = new Collections.BaseCollection<string, Structures.Member>();
+      guild.members.set(context.client.userId, context.me!);
+      guild.members.set(context.userId, context.member!);
+      for (let [userId, voiceState] of guild.voice_states) {
+        guild.members.set(userId, voiceState.member!);
+      }
+    }
+
+    guild.presences = new Collections.BaseCollection<string, any>();
+    for (let [userId, member] of guild.members) {
+      const presence = member.presence;
+      if (presence) {
+        const data = presence.toJSON() as any;
+        const guildIds = [guild.id];
+
+        data.guild_ids = guildIds;
+        data.activities = data.activities.toArray().map((x: any) => x.toJSON());
+        for (let x of data.activities) {
+          x.guild_ids = guildIds;
+        }
+        if (data.game) {
+          data.game.guild_ids = guildIds;
+        }
+
+        guild.presences.set(userId, data);
+      }
+    }
+  }
+
+  return JSON.stringify({
+    channel: context.channel,
+    channel_id: context.channelId,
+    guild,
+    guild_id: context.guildId,
+    member: context.member,
+    member_bot: context.me,
+    message: (context instanceof Command.Context) ? context.message : null,
+    user: context.user,
+    user_bot: context.client.user,
+    variables,
+  });
+}
+
+
 export function getCodeLanguage(value?: string): CodeLanguages | null {
   if (value) {
     const insensitive = value.toUpperCase();