From fe7e3b8fdaa8a2b507508f0b3575d7c3f39c2c75 Mon Sep 17 00:00:00 2001
From: March 7th <71698422+aiko-chan-ai@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:39:46 +0700
Subject: [PATCH] types: Swap message reaction and emoji identifier types

#8970 djs
---
 src/managers/BaseGuildEmojiManager.js |  4 ++--
 src/managers/ReactionManager.js       |  1 +
 typings/index.d.ts                    | 14 ++++++--------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/managers/BaseGuildEmojiManager.js b/src/managers/BaseGuildEmojiManager.js
index a9bbbff..89eee4c 100644
--- a/src/managers/BaseGuildEmojiManager.js
+++ b/src/managers/BaseGuildEmojiManager.js
@@ -50,9 +50,9 @@ class BaseGuildEmojiManager extends CachedManager {
 
   /**
    * Data that can be resolved to give an emoji identifier. This can be:
-   * * The unicode representation of an emoji
-   * * The `<a:name:id>`, `<:name:id>`, `a:name:id` or `name:id` emoji identifier string of an emoji
    * * An EmojiResolvable
+   * * The `<a:name:id>`, `<:name:id>`, `a:name:id` or `name:id` emoji identifier string of an emoji
+   * * The Unicode representation of an emoji
    * @typedef {string|EmojiResolvable} EmojiIdentifierResolvable
    */
 
diff --git a/src/managers/ReactionManager.js b/src/managers/ReactionManager.js
index b587a0e..d906625 100644
--- a/src/managers/ReactionManager.js
+++ b/src/managers/ReactionManager.js
@@ -32,6 +32,7 @@ class ReactionManager extends CachedManager {
    * Data that can be resolved to a MessageReaction object. This can be:
    * * A MessageReaction
    * * A Snowflake
+   * * The Unicode representation of an emoji
    * @typedef {MessageReaction|Snowflake} MessageReactionResolvable
    */
 
diff --git a/typings/index.d.ts b/typings/index.d.ts
index 3202dad..8fe011c 100644
--- a/typings/index.d.ts
+++ b/typings/index.d.ts
@@ -5591,7 +5591,11 @@ export interface EmbedFooterData {
   iconURL?: string;
 }
 
-export type EmojiIdentifierResolvable = string | EmojiResolvable;
+export type EmojiIdentifierResolvable =
+  | EmojiResolvable
+  | `${'' | 'a:'}${string}:${Snowflake}`
+  | `<${'' | 'a'}:${string}:${Snowflake}>`
+  | string;
 
 export type EmojiResolvable = Snowflake | GuildEmoji | ReactionEmoji;
 
@@ -6498,13 +6502,7 @@ export interface MessageOptions {
   usingNewAttachmentAPI?: boolean;
 }
 
-export type MessageReactionResolvable =
-  | MessageReaction
-  | Snowflake
-  | `${string}:${Snowflake}`
-  | `<:${string}:${Snowflake}>`
-  | `<a:${string}:${Snowflake}>`
-  | string;
+export type MessageReactionResolvable = MessageReaction | Snowflake | string;
 
 export interface MessageReference {
   channelId: Snowflake;