chore: bug fix

permalink: http://whatthecommit.com/4e3ea69e72a0b902666bea2a79f99fc0

src/arguments/CoreEmoji.ts

@@ -10,7 +10,7 @@ export default class extends Argument<GuildEmoji | string> {
 	}
 
 	public run(parameter: string): ArgumentResult<GuildEmoji | string> {
-		const resolved = resolveEmoji(parameter, this.container.client);
+		const resolved = resolveEmoji(parameter);
 		if (resolved.success) return this.ok(resolved.value);
 		return this.error({
 			parameter,

src/lib/resolvers/emoji.ts

@@ -1,13 +1,24 @@
 import { EmojiRegex, TwemojiRegex } from '@sapphire/discord-utilities';
+import { container } from '@sapphire/pieces';
 import { Identifiers } from '../errors/Identifiers';
 import { err, ok } from '../parsers/Result';
-import type { SapphireClient } from '../SapphireClient';
 
-export function resolveEmoji(parameter: string, client: SapphireClient) {
-	const emoji = EmojiRegex.exec(parameter)?.[3];
+export function resolveEmoji(parameter: string) {
 	const twemoji = TwemojiRegex.exec(parameter)?.[0] ?? null;
-	const resolvable = emoji ? client.emojis.resolve(emoji) : twemoji;
 
-	if (resolvable) return ok(resolvable);
+	if (twemoji) {
+		return ok(twemoji);
+	}
+
+	const emojiId = EmojiRegex.exec(parameter)?.groups?.id;
+
+	if (emojiId) {
+		const resolved = container.client.emojis.resolve(emojiId);
+
+		if (resolved) {
+			return ok(resolved);
+		}
+	}
+
 	return err(Identifiers.ArgumentEmojiError);
 }

src/lib/resolvers/index.ts

@@ -2,6 +2,7 @@ export * from './boolean';
 export * from './channel';
 export * from './date';
 export * from './dmChannel';
+export * from './emoji';
 export * from './float';
 export * from './guildCategoryChannel';
 export * from './guildChannel';