aboutsummaryrefslogtreecommitdiff
path: root/src/commands/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'src/commands/utilities')
-rw-r--r--src/commands/utilities/highlight-clear.ts7
-rw-r--r--src/commands/utilities/steal.ts124
-rw-r--r--src/commands/utilities/uuid.ts12
-rw-r--r--src/commands/utilities/viewRaw.ts4
-rw-r--r--src/commands/utilities/whoHasRole.ts4
5 files changed, 86 insertions, 65 deletions
diff --git a/src/commands/utilities/highlight-clear.ts b/src/commands/utilities/highlight-clear.ts
index 8c261c2..274c6fb 100644
--- a/src/commands/utilities/highlight-clear.ts
+++ b/src/commands/utilities/highlight-clear.ts
@@ -1,4 +1,4 @@
-import { AllowedMentions, BushCommand, ConfirmationPrompt, type BushMessage, type BushSlashMessage } from '#lib';
+import { BushCommand, ConfirmationPrompt, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { highlightSubcommands } from './highlight-!.js';
@@ -26,9 +26,6 @@ export default class HighlightClearCommand extends BushCommand {
const success = await client.highlightManager.removeAllHighlights(message.guild.id, message.author.id);
if (!success) return await message.util.reply(`${util.emojis.error} There was an error clearing your highlight list.`);
- return await message.util.reply({
- content: `${util.emojis.success} Successfully cleared your highlight list.`,
- allowedMentions: AllowedMentions.none()
- });
+ return await message.util.reply(`${util.emojis.success} Successfully cleared your highlight list.`);
}
}
diff --git a/src/commands/utilities/steal.ts b/src/commands/utilities/steal.ts
index d603222..765fb24 100644
--- a/src/commands/utilities/steal.ts
+++ b/src/commands/utilities/steal.ts
@@ -1,41 +1,38 @@
-import { BushCommand, type ArgType, type BushMessage, type BushSlashMessage } from '#lib';
+import { BushCommand, OptArgType, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { type ArgumentGeneratorReturn, type ArgumentType, type ArgumentTypeCaster } from 'discord-akairo';
-import { ApplicationCommandOptionType, PermissionFlagsBits } from 'discord.js';
+import { ApplicationCommandOptionType, PermissionFlagsBits, type Attachment } from 'discord.js';
import _ from 'lodash';
+import { Stream } from 'stream';
import { URL } from 'url';
assert(_);
+// so I don't have to retype things
+const enum lang {
+ emojiStart = 'What emoji would you like to steal?',
+ emojiRetry = '{error} Pick a valid emoji, emoji id, or image url.',
+ emojiDescription = 'The emoji to steal.',
+ nameStart = 'What would you like to name the emoji?',
+ nameRetry = '{error} Choose a valid name fore the emoji.',
+ nameDescription = 'The name to give the new emoji.'
+}
+
export default class StealCommand extends BushCommand {
public constructor() {
super('steal', {
- aliases: ['steal', 'copy-emoji'],
+ aliases: ['steal', 'copy-emoji', 'emoji'],
category: 'utilities',
description: 'Steal an emoji from another server and add it to your own.',
usage: ['steal <emoji/emojiId/url> [name]'],
examples: ['steal <:omegaclown:782630946435366942> ironm00n'],
- args: [
- {
- id: 'emoji',
- description: 'The emoji to steal.',
- type: util.arg.union('discordEmoji', 'snowflake', 'url'),
- readableType: 'discordEmoji|snowflake|url',
- prompt: 'What emoji would you like to steal?',
- retry: '{error} Pick a valid emoji, emoji id, or image url.',
- optional: true,
- only: 'slash',
- slashType: ApplicationCommandOptionType.String
- },
- {
- id: 'name',
- description: 'The name to give the new emoji.',
- prompt: 'What would you like to name the emoji?',
- retry: '{error} Choose a valid name fore the emoji.',
- optional: true,
- only: 'slash',
- slashType: ApplicationCommandOptionType.String
- }
+ slashOptions: [
+ { name: 'emoji', description: lang.emojiStart, type: ApplicationCommandOptionType.Attachment, required: true },
+ { name: 'name', description: lang.nameStart, type: ApplicationCommandOptionType.String, required: false }
+ ],
+ helpArgs: [
+ { id: 'emoji', description: lang.emojiDescription, readableType: 'emoji|emojiId|url', optional: false },
+ { id: 'name', description: lang.nameDescription, readableType: 'string', optional: true }
],
slash: true,
channel: 'guild',
@@ -50,58 +47,79 @@ export default class StealCommand extends BushCommand {
const emoji = hasImage
? message.attachments.first()!.url
: yield {
- id: 'emoji',
type: util.arg.union('discordEmoji', 'snowflake', 'url') as ArgumentType | ArgumentTypeCaster,
- prompt: {
- start: 'What emoji would you like to steal?',
- retry: '{error} Pick a valid emoji, emoji id, or image url.'
- }
+ prompt: { start: lang.emojiStart, retry: lang.emojiRetry }
};
const name = yield {
- id: 'name',
- prompt: {
- start: 'What would you like to name the emoji?',
- retry: '{error} Choose a valid name fore the emoji.',
- optional: true
- },
- default:
- hasImage && message.attachments.first()?.name
- ? _.camelCase(message.attachments.first()!.name ?? 'stolen_emoji')
- : 'stolen_emoji'
+ prompt: { start: lang.nameStart, retry: lang.nameRetry, optional: true },
+ default: hasImage && message.attachments.first()!.name ? _.snakeCase(message.attachments.first()!.name!) : 'unnamed_emoji'
};
return { emoji, name };
}
public override async exec(
- message: BushMessage | BushSlashMessage,
- args?: { emoji?: ArgType<'discordEmoji'> | ArgType<'snowflake'> | ArgType<'url'> | string; name: string }
+ message: BushMessage,
+ args: { emoji: OptArgType<'discordEmoji'> | OptArgType<'snowflake'> | OptArgType<'url'> | string; name: string }
) {
- if (!args || !args.emoji) return await message.util.reply(`${util.emojis.error} You must provide an emoji to steal.`);
+ assert(message.inGuild());
+
+ if (!args.emoji) return await message.util.reply(`${util.emojis.error} You must provide an emoji to steal.`);
const image =
- args?.emoji instanceof URL
+ args.emoji instanceof URL
? args.emoji.href
- : typeof args?.emoji === 'object'
+ : typeof args.emoji === 'object'
? `https://cdn.discordapp.com/emojis/${args.emoji.id}`
- : client.consts.regex.snowflake.test(args?.emoji ?? '')
+ : client.consts.regex.snowflake.test(args.emoji ?? '')
? `https://cdn.discordapp.com/emojis/${args!.emoji}`
- : (args?.emoji ?? '').match(/https?:\/\//)
- ? args?.emoji
+ : (args.emoji ?? '').match(/https?:\/\//)
+ ? args.emoji
: undefined;
if (image === undefined) return await message.util.reply(`${util.emojis.error} You must provide an emoji to steal.`);
const emojiName =
- args.name ?? args?.emoji instanceof URL
- ? args?.name ?? 'stolen_emoji'
- : typeof args?.emoji === 'object'
- ? args?.name ?? args.emoji.name ?? 'stolen_emoji'
+ args.name ?? args.emoji instanceof URL
+ ? args.name ?? 'stolen_emoji'
+ : typeof args.emoji === 'object'
+ ? args.name ?? args.emoji.name ?? 'stolen_emoji'
: 'stolen_emoji';
- const creationSuccess = await message
- .guild!.emojis.create(image, emojiName, {
+ const creationSuccess = await message.guild.emojis
+ .create(image, emojiName, {
+ reason: `Stolen by ${message.author.tag} (${message.author.id})`
+ })
+ .catch((e: Error) => e);
+
+ if (!(creationSuccess instanceof Error))
+ return await message.util.reply(`${util.emojis.success} You successfully stole ${creationSuccess}.`);
+ else {
+ return await message.util.reply(
+ `${util.emojis.error} The was an error stealing that emoji \`${creationSuccess.message}\`.`
+ );
+ }
+ }
+
+ public override async execSlash(message: BushSlashMessage, args: { emoji: Attachment; name?: string }) {
+ assert(message.inGuild());
+
+ const name = args.name ?? args.emoji.name ?? 'stolen_emoji';
+
+ const data =
+ args.emoji.attachment instanceof Stream
+ ? await (new Promise((resolve, reject) => {
+ let data = '';
+ assert(args.emoji.attachment instanceof Stream);
+ args.emoji.attachment.on('data', (chunk) => (data += chunk));
+ args.emoji.attachment.on('end', () => resolve(data));
+ args.emoji.attachment.on('error', (e) => reject(e));
+ }) as Promise<string>)
+ : args.emoji.attachment;
+
+ const creationSuccess = await message.guild.emojis
+ .create(data, name, {
reason: `Stolen by ${message.author.tag} (${message.author.id})`
})
.catch((e: Error) => e);
diff --git a/src/commands/utilities/uuid.ts b/src/commands/utilities/uuid.ts
index 3699478..448baf3 100644
--- a/src/commands/utilities/uuid.ts
+++ b/src/commands/utilities/uuid.ts
@@ -1,4 +1,4 @@
-import { BushCommand, type BushMessage, type BushSlashMessage } from '#lib';
+import { AllowedMentions, BushCommand, type BushMessage, type BushSlashMessage } from '#lib';
import { ApplicationCommandOptionType } from 'discord.js';
export default class UuidCommand extends BushCommand {
@@ -45,9 +45,15 @@ export default class UuidCommand extends BushCommand {
const readableIGN = ign.match[0];
try {
const uuid = await util.mcUUID(readableIGN, dashed);
- return await message.util.reply(`The uuid for ${util.format.input(readableIGN)} is ${util.format.input(uuid)}`);
+ return await message.util.reply({
+ content: `The uuid for ${util.format.input(readableIGN)} is ${util.format.input(uuid)}`,
+ allowedMentions: AllowedMentions.none()
+ });
} catch (e) {
- return await message.util.reply(`${util.emojis.error} Could not find an uuid for ${util.format.input(readableIGN)}.`);
+ return await message.util.reply({
+ content: `${util.emojis.error} Could not find an uuid for ${util.format.input(readableIGN)}.`,
+ allowedMentions: AllowedMentions.none()
+ });
}
}
}
diff --git a/src/commands/utilities/viewRaw.ts b/src/commands/utilities/viewRaw.ts
index 20e7272..cb106dd 100644
--- a/src/commands/utilities/viewRaw.ts
+++ b/src/commands/utilities/viewRaw.ts
@@ -1,4 +1,4 @@
-import { BushCommand, type ArgType, type BushMessage, type BushSlashMessage, type OptionalArgType } from '#lib';
+import { BushCommand, type ArgType, type BushMessage, type BushSlashMessage, type OptArgType } from '#lib';
import assert from 'assert';
import { ApplicationCommandOptionType, ChannelType, EmbedBuilder, Message, PermissionFlagsBits } from 'discord.js';
@@ -67,7 +67,7 @@ export default class ViewRawCommand extends BushCommand {
message: BushMessage | BushSlashMessage,
args: {
message: ArgType<'message'> | ArgType<'messageLink'>;
- channel: OptionalArgType<'textChannel'> | OptionalArgType<'newsChannel'> | OptionalArgType<'threadChannel'>;
+ channel: OptArgType<'textChannel'> | OptArgType<'newsChannel'> | OptArgType<'threadChannel'>;
json: boolean;
js: boolean;
}
diff --git a/src/commands/utilities/whoHasRole.ts b/src/commands/utilities/whoHasRole.ts
index ac6f3c5..5f13c02 100644
--- a/src/commands/utilities/whoHasRole.ts
+++ b/src/commands/utilities/whoHasRole.ts
@@ -1,4 +1,4 @@
-import { BushCommand, BushRole, ButtonPaginator, OptionalArgType, type BushMessage, type BushSlashMessage } from '#lib';
+import { BushCommand, BushRole, ButtonPaginator, OptArgType, type BushMessage, type BushSlashMessage } from '#lib';
import assert from 'assert';
import { ApplicationCommandOptionType, Util, type CommandInteraction } from 'discord.js';
@@ -33,7 +33,7 @@ export default class WhoHasRoleCommand extends BushCommand {
public override async exec(
message: BushMessage | BushSlashMessage,
args: {
- [K in `role${NumberRange}`]: OptionalArgType<'role'>;
+ [K in `role${NumberRange}`]: OptArgType<'role'>;
}
) {
assert(message.inGuild());
generated by cgit (git 2.46.0) at 2024-12-04 22:59:09 +0000