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.

Author: Lumabots

discord/ext/commands/converter.py

@@ -43,6 +43,7 @@
 import discord
 
 from .errors import *
+from discord.utils import UNICODE_EMOJIS
 
 if TYPE_CHECKING:
     from discord.message import PartialMessageableChannel
@@ -851,7 +852,8 @@ async def convert(self, ctx: Context, argument: str) -> discord.GuildEmoji:
 class PartialEmojiConverter(Converter[discord.PartialEmoji]):
     """Converts to a :class:`~discord.PartialEmoji`.
 
-    This is done by extracting the animated flag, name and ID from the emoji.
+    This is done by extracting the animated flag, name, and ID for custom emojis,
+    or by using the standard Unicode emojis supported by Discord.
 
     .. versionchanged:: 1.5
          Raise :exc:`.PartialEmojiConversionFailure` instead of generic :exc:`.BadArgument`
@@ -872,6 +874,14 @@ async def convert(self, ctx: Context, argument: str) -> discord.PartialEmoji:
                 id=emoji_id,
             )
 
+        if argument in UNICODE_EMOJIS:
+            return discord.PartialEmoji.with_state(
+                ctx.bot._connection,
+                animated=False,
+                name=argument,
+                id=None,
+            )
+
         raise PartialEmojiConversionFailure(argument)
 
 
@@ -1094,7 +1104,11 @@ def get_converter(param: inspect.Parameter) -> Any:
 
 
 def is_generic_type(tp: Any, *, _GenericAlias: type = _GenericAlias) -> bool:
-    return isinstance(tp, type) and issubclass(tp, Generic) or isinstance(tp, _GenericAlias)  # type: ignore
+    return (
+        isinstance(tp, type)
+        and issubclass(tp, Generic)
+        or isinstance(tp, _GenericAlias)
+    )  # type: ignore
 
 
 CONVERTER_MAPPING: dict[type[Any], Any] = {

discord/partial_emoji.py

@@ -34,12 +34,6 @@
 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",)
 
@@ -152,7 +146,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

@@ -35,6 +35,7 @@
 import re
 import sys
 import types
+import importlib.resources
 import unicodedata
 import warnings
 from base64 import b64encode
@@ -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)
+
 
 class _MissingSentinel:
     def __eq__(self, other) -> bool: