Revert 2814 revert 2774 emoji (#2820)

* Add Unicode emoji support to PartialEmojiConverter

PartialEmojiConverter now recognizes standard Unicode emojis using a new UNICODE_EMOJIS set loaded from emojis.json. The emoji mapping and set are moved to discord.utils for reuse, and references in partial_emoji.py are updated accordingly.

* style(pre-commit): auto fixes from pre-commit.com hooks

* Update converter.py

Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com>

* Update converter.py

* fix(utils): update UNICODE_EMOJIS to use values from EMOJIS_MAP

---------

Signed-off-by: Lumouille <144063653+Lumabots@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: Lumabots

discord/ext/commands/converter.py

@@ -41,7 +41,7 @@
 )
 
 import discord
-from discord.partial_emoji import EMOJIS_MAP
+from discord.utils import UNICODE_EMOJIS
 
 from .errors import *
 
@@ -874,7 +874,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.PartialEmoji:
                 id=emoji_id,
             )
 
-        if argument in EMOJIS_MAP.values():
+        if argument in UNICODE_EMOJIS:
             return discord.PartialEmoji.with_state(
                 ctx.bot._connection,
                 animated=False,

discord/partial_emoji.py

@@ -25,22 +25,13 @@
 
 from __future__ import annotations
 
-import importlib.resources
-import json
 import re
 from typing import TYPE_CHECKING, Any, TypedDict, TypeVar
 
 from . import utils
 from .asset import Asset, AssetMixin
 from .errors import InvalidArgument
 
-with (
-    importlib.resources.files(__package__)
-    .joinpath("emojis.json")
-    .open(encoding="utf-8") as f
-):
-    EMOJIS_MAP = json.load(f)
-
 __all__ = ("PartialEmoji",)
 
 if TYPE_CHECKING:
@@ -152,7 +143,7 @@ def from_str(cls: type[PE], value: str) -> PE:
         """
         if value.startswith(":") and value.endswith(":") and len(value) > 2:
             name = value[1:-1]
-            if unicode_emoji := EMOJIS_MAP.get(name):
+            if unicode_emoji := utils.EMOJIS_MAP.get(name):
                 return cls(name=unicode_emoji, id=None, animated=False)
         match = cls._CUSTOM_EMOJI_RE.match(value)
         if match is not None:

discord/utils.py

@@ -30,6 +30,7 @@
 import collections.abc
 import datetime
 import functools
+import importlib.resources
 import itertools
 import json
 import re
@@ -97,10 +98,21 @@
     "generate_snowflake",
     "basic_autocomplete",
     "filter_params",
+    "EMOJIS_MAP",
+    "UNICODE_EMOJIS",
 )
 
 DISCORD_EPOCH = 1420070400000
 
+with (
+    importlib.resources.files(__package__)
+    .joinpath("emojis.json")
+    .open(encoding="utf-8") as f
+):
+    EMOJIS_MAP = json.load(f)
+
+UNICODE_EMOJIS = set(EMOJIS_MAP.values())
+
 
 class _MissingSentinel:
     def __eq__(self, other) -> bool: