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

* Revert "Revert "fix: support emoji aliases like `:smile:` in PartialEmoji.fro…"

This reverts commit 8619b69.

* Update discord/partial_emoji.py

Co-authored-by: Paillat <[email protected]>
Signed-off-by: Lala Sabathil <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Lala Sabathil <[email protected]>

* Update CHANGELOG.md

Signed-off-by: Lala Sabathil <[email protected]>

* Update MANIFEST.in

Signed-off-by: Lala Sabathil <[email protected]>

* feat: allow usage of unicode emoji in PartialEmojiConverter (#2819)

* Update converter.py

* fix: enhance PartialEmojiConverter to support direct emoji names

* update doc

* 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 <[email protected]>

* Update converter.py

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

---------

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

* added back support of smile and `:smile:` (#2822)

* 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 <[email protected]>

* Update converter.py

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

* fix(partial_emoji): simplify emoji name extraction by using removeprefix and removesuffix

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

---------

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

* Update discord/partial_emoji.py

Signed-off-by: Lala Sabathil <[email protected]>

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

* Update discord/partial_emoji.py

Co-authored-by: Paillat <[email protected]>
Signed-off-by: Lala Sabathil <[email protected]>

* Update CHANGELOG.md

Co-authored-by: Lumouille <[email protected]>
Signed-off-by: Lala Sabathil <[email protected]>

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

* Update discord/utils.py

Co-authored-by: Lumouille <[email protected]>
Signed-off-by: Lala Sabathil <[email protected]>

---------

Signed-off-by: Lala Sabathil <[email protected]>
Signed-off-by: Lala Sabathil <[email protected]>
Signed-off-by: Lumouille <[email protected]>
Co-authored-by: Paillat <[email protected]>
Co-authored-by: Lumouille <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Paillat <[email protected]>

Author: 4 people

CHANGELOG.md

@@ -123,6 +123,9 @@ 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. Also applied
+  the same logic in PartialEmojiConverter.
+  ([#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/emojis.json

@@ -41,6 +41,7 @@
 )
 
 import discord
+from discord.utils import UNICODE_EMOJIS
 
 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 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/ext/commands/converter.py

@@ -127,7 +127,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 block, either as Unicode characters or as a Discord alias (``:smile:``).
 
         .. versionadded:: 2.0
 
@@ -141,6 +141,11 @@ def from_str(cls: type[PE], value: str) -> PE:
         :class:`PartialEmoji`
             The partial emoji from this string.
         """
+        if unicode_emoji := utils.EMOJIS_MAP.get(
+            value.removeprefix(":").removesuffix(":")
+        ):
+            return cls(name=unicode_emoji, id=None, animated=False)
+
         match = cls._CUSTOM_EMOJI_RE.match(value)
         if match is not None:
             groups = match.groupdict()

discord/partial_emoji.py

@@ -30,6 +30,7 @@
 import collections.abc
 import datetime
 import functools
+import importlib.resources
 import itertools
 import json
 import re
@@ -101,6 +102,15 @@
 
 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: