diff options
Diffstat (limited to 'src/commands')
| -rw-r--r-- | src/commands/dev/eval.ts | 11 | ||||
| -rw-r--r-- | src/commands/utilities/viewraw.ts | 33 |
2 files changed, 34 insertions, 10 deletions
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index 19667dd..5b44db2 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -22,6 +22,11 @@ export default class EvalCommand extends BushCommand { { id: 'typescript', match: 'flag', flag: '--ts' }, { id: 'hidden', match: 'flag', flag: '--hidden' }, { id: 'show_proto', match: 'flag', flag: '--proto' }, + // { + // id: 'show_methods', + // match: 'flag', + // flag: ['--func', '--function', '--functions', '--meth', '--method', '--methods'] + // }, { id: 'code', match: 'rest', @@ -38,6 +43,7 @@ export default class EvalCommand extends BushCommand { { name: 'typescript', description: 'Whether or not the code is typescript.', type: 'BOOLEAN', required: false }, { name: 'hidden', description: 'Whether or not to show hidden items.', type: 'BOOLEAN', required: false }, { name: 'show_proto', description: 'Show prototype.', type: 'BOOLEAN', required: false } + // { name: 'show_methods', description: 'Show class functions.', type: 'BOOLEAN', required: false } ], ownerOnly: true }); @@ -54,6 +60,7 @@ export default class EvalCommand extends BushCommand { typescript: boolean; hidden: boolean; show_proto: boolean; + // show_methods: boolean; } ): Promise<unknown> { if (!message.author.isOwner()) @@ -114,11 +121,12 @@ export default class EvalCommand extends BushCommand { try { const rawOutput = code[code.lang].replace(/ /g, '').includes('9+10' || '10+9') ? '21' : await eval(code.js); const output = await util.inspectCleanRedactCodeblock(rawOutput, 'js', { - depth: args.sel_depth || 0, + depth: args.sel_depth ?? 0, showHidden: args.hidden, getters: true, showProxy: true }); + // const methods = args.show_methods ? await util.inspectCleanRedactCodeblock(util.getMethods(rawOutput), 'js') : undefined; const proto = args.show_proto ? await util.inspectCleanRedactCodeblock(Object.getPrototypeOf(rawOutput), 'js', { depth: 1, @@ -131,6 +139,7 @@ export default class EvalCommand extends BushCommand { if (inputTS) embed.addField('📥 Input (typescript)', inputTS).addField('📥 Input (transpiled javascript)', inputJS); else embed.addField('📥 Input', inputJS); embed.addField('📤 Output', output); + // if (methods) embed.addField('🔧 Methods', methods); if (proto) embed.addField('⚙️ Proto', proto); } catch (e) { embed.setTitle(`${emojis.errorFull} Code was not able to be evaluated.`).setColor(colors.error); diff --git a/src/commands/utilities/viewraw.ts b/src/commands/utilities/viewraw.ts index 0a5f9e2..e783dec 100644 --- a/src/commands/utilities/viewraw.ts +++ b/src/commands/utilities/viewraw.ts @@ -31,12 +31,17 @@ export default class ViewRawCommand extends BushCommand { retry: '{error} Choose a valid channel.', optional: true }, - default: (m) => m.channel + default: (m: Message) => m.channel }, { id: 'json', match: 'flag', flag: '--json' + }, + { + id: 'js', + match: 'flag', + flag: '--js' } ] }); @@ -44,7 +49,7 @@ export default class ViewRawCommand extends BushCommand { public override async exec( message: BushMessage | BushSlashMessage, - args: { message: Message | BigInt; channel: TextChannel | NewsChannel | DMChannel; json?: boolean } + args: { message: Message | BigInt; channel: TextChannel | NewsChannel | DMChannel; json?: boolean; js: boolean } ): Promise<unknown> { let newMessage: Message | 0; if (!(typeof args.message === 'object')) { @@ -59,14 +64,24 @@ export default class ViewRawCommand extends BushCommand { } else { newMessage = args.message as Message; } - const content = args.json ? inspect(newMessage.toJSON()) || '[No Content]' : newMessage.content || '[No Content]'; - const messageEmbed = new MessageEmbed() - .setFooter(newMessage.author.tag, newMessage.author.avatarURL({ dynamic: true })) - .setTimestamp(newMessage.createdTimestamp) - .setColor(newMessage.member?.roles?.color?.color || util.colors.default) - .setTitle('Raw Message Information') - .setDescription(await util.codeblock(content, 2048, 'js')); + + const messageEmbed = await ViewRawCommand.getRawData(newMessage as BushMessage, { json: args.json, js: args.js }); return await message.util.reply({ embeds: [messageEmbed] }); } + + public static async getRawData(message: BushMessage, options: { json?: boolean; js: boolean }): Promise<unknown> { + const content = + options.json || options.js + ? options.json + ? inspect(JSON.stringify(message.toJSON())) + : inspect(message.toJSON()) || '[No Content]' + : message.content || '[No Content]'; + return new MessageEmbed() + .setFooter(message.author.tag, message.author.avatarURL({ dynamic: true })) + .setTimestamp(message.createdTimestamp) + .setColor(message.member?.roles?.color?.color || util.colors.default) + .setTitle('Raw Message Information') + .setDescription(await util.codeblock(content, 2048, 'js')); + } } |