feat: Added support for emoji aliases like :smile: in PartialEmoji.from_str (redo)

CHANGELOG.md

@@ -113,6 +113,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2761](https://github.com/Pycord-Development/pycord/pull/2761))
 - Updated `valid_locales` to support `in` and `es-419`.
   ([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
+- Added support for emoji aliases like `:smile:` in PartialEmoji.from_str.
+  ([#2815](https://github.com/Pycord-Development/pycord/pull/2815))
 - Fixed `Webhook.edit` not working with `attachments=[]`.
   ([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
 - Fixed GIF-based `Sticker` returning the wrong `url`.

MANIFEST.in

@@ -3,6 +3,7 @@ include LICENSE
 include requirements.txt
 include discord/bin/*.dll
 include discord/py.typed
+include discord/emojis.json
 
 prune .github
 prune docs

discord/ext/commands/converter.py

@@ -41,6 +41,7 @@
 )
 
 import discord
+from discord.partial_emoji import EMOJIS_MAP
 
 from .errors import *
 
@@ -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 EMOJIS_MAP.values():
+            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

@@ -25,13 +25,22 @@
 
 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:
@@ -127,7 +136,7 @@ def from_str(cls: type[PE], value: str) -> PE:
         - ``name:id``
         - ``<:name:id>``
 
-        If the format does not match then it is assumed to be a unicode emoji.
+        If the format does not match then it is assumed to be a unicode emoji, either as Unicode characters or as a Discord alias (``:smile:``).
 
         .. versionadded:: 2.0
 
@@ -141,6 +150,10 @@ def from_str(cls: type[PE], value: str) -> PE:
         :class:`PartialEmoji`
             The partial emoji from this string.
         """
+        if value.startswith(":") and value.endswith(":") and len(value) > 2:
+            name = value[1:-1]
+            if unicode_emoji := 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:
             groups = match.groupdict()