chore(emoji-argument): Apply review changes

src/arguments/CoreEmoji.ts

@@ -1,31 +1,21 @@
 import type { PieceContext } from '@sapphire/pieces';
-import type { GuildEmoji } from 'discord.js';
 import { Identifiers } from '../lib/errors/Identifiers';
-import { GuildEmojiStructure, resolveEmoji } from '../lib/resolvers/emoji';
+import { EmojiObject, resolveEmoji } from '../lib/resolvers/emoji';
 import { Argument, ArgumentResult } from '../lib/structures/Argument';
 
-export default class extends Argument<GuildEmoji | string> {
+export default class extends Argument<EmojiObject | string> {
 	public constructor(context: PieceContext) {
 		super(context, { name: 'emoji' });
 	}
 
-	public run(parameter: string): ArgumentResult<GuildEmoji | string> {
+	public run(parameter: string): ArgumentResult<EmojiObject | string> {
 		const resolved = resolveEmoji(parameter);
 		return resolved.success
-			? this.ok(this.parseSuccess(resolved.value))
+			? this.ok(resolved.value)
 			: this.error({
 					parameter,
 					identifier: Identifiers.ArgumentEmojiError,
 					message: 'The argument did not resolve to an emoji.'
 			  });
 	}
-
-	public parseSuccess(resolvedValue: string | GuildEmojiStructure): GuildEmoji | string {
-		if (resolvedValue instanceof Object) {
-			const resolvedGuildEmoji = resolvedValue as GuildEmojiStructure;
-			return this.container.client.emojis.resolve(resolvedGuildEmoji.id)!;
-		}
-
-		return resolvedValue;
-	}
 }

src/lib/parsers/Args.ts

@@ -3,7 +3,6 @@ import { container } from '@sapphire/pieces';
 import type {
 	CategoryChannel,
 	DMChannel,
-	GuildEmoji,
 	GuildMember,
 	Message,
 	NewsChannel,
@@ -19,6 +18,7 @@ import type { URL } from 'url';
 import { ArgumentError } from '../errors/ArgumentError';
 import { Identifiers } from '../errors/Identifiers';
 import { UserError } from '../errors/UserError';
+import type { EmojiObject } from '../resolvers';
 import type { Argument, IArgument } from '../structures/Argument';
 import type { Command } from '../structures/Command';
 import { isSome, maybe, Maybe } from './Maybe';
@@ -690,7 +690,7 @@ export interface ArgType {
 	channel: ChannelTypes;
 	date: Date;
 	dmChannel: DMChannel;
-	emoji: GuildEmoji | string;
+	emoji: EmojiObject | string;
 	float: number;
 	guildCategoryChannel: CategoryChannel;
 	guildChannel: GuildBasedChannelTypes;

src/lib/resolvers/emoji.ts

@@ -1,5 +1,5 @@
 import { EmojiRegex, TwemojiRegex } from '@sapphire/discord-utilities';
-import { Snowflake, Util } from 'discord.js';
+import { Util } from 'discord.js';
 import { Identifiers } from '../errors/Identifiers';
 import { err, ok } from '../parsers/Result';
 
@@ -13,7 +13,7 @@ export function resolveEmoji(parameter: string) {
 	const emojiId = EmojiRegex.exec(parameter)?.groups?.id;
 
 	if (emojiId) {
-		const resolved = Util.parseEmoji(emojiId) as GuildEmojiStructure;
+		const resolved = Util.parseEmoji(emojiId) as EmojiObject;
 
 		if (resolved) {
 			return ok(resolved);
@@ -23,8 +23,8 @@ export function resolveEmoji(parameter: string) {
 	return err(Identifiers.ArgumentEmojiError);
 }
 
-export interface GuildEmojiStructure {
-	animated: boolean;
-	name: string;
-	id: Snowflake;
+export interface EmojiObject {
+	name: string | null;
+	id: string | null;
+	animated?: boolean;
 }