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

Lulalaby · 2025-06-20T15:41:44Z

Reverts #2814
Re-applies #2774

…moji.fro…" This reverts commit 8619b69.

discord/partial_emoji.py

Paillat-dev · 2025-06-21T10:20:54Z

Also this is not a fix but probably more a feat

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

CHANGELOG.md

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

Paillat-dev · 2025-06-24T22:06:47Z

@Lulalaby pls add include discord/emojis.json to MANIFEST.in thyy

Lumabots · 2025-06-24T22:26:45Z

should i make a new pr or could we add to this pr the support unicode emoji in partial emoji converter ?
I also added a check for the unicode emoji since normally all unicode emoji supported by the partial should be inside the list that discord provide.

from discord.partial_emoji import EMOJIS_MAP
class PartialEmojiConverter(Converter[discord.PartialEmoji]):
    """Converts to a :class:`~discord.PartialEmoji`.

    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`
    """

    async def convert(self, ctx: Context, argument: str) -> discord.PartialEmoji:
        match = re.match(r"<(a?):(\w{1,32}):([0-9]{15,20})>$", argument)

        if match:
            emoji_animated = bool(match.group(1))
            emoji_name = match.group(2)
            emoji_id = int(match.group(3))

            return discord.PartialEmoji.with_state(
                ctx.bot._connection,
                animated=emoji_animated,
                name=emoji_name,
                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)

for the moment, only custom emoji are supported.
this should also fix #1582 for the partial emoji part

Lulalaby · 2025-06-24T22:38:02Z

pr it to the branch

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

Paillat-dev

tested please someone else test it too

Lumabots · 2025-06-24T22:49:09Z

pr it to the branch

so its rely on this pr (for the emoji custom map, so to be able to pr it i will first need this to be merged.
i cannot really suggest change here so i dont know what im supposed to do

Lulalaby · 2025-06-24T22:49:56Z

You can just work based on this branch, and PR to this branch

Lumabots · 2025-06-24T22:52:13Z

oups that's mb, i'm usually not able to pr directly on branch, but it might be different since you are a maintainer

* Update converter.py * fix: enhance PartialEmojiConverter to support direct emoji names * update doc

discord/ext/commands/converter.py

Lulalaby · 2025-06-24T23:09:40Z

Pr changes 😂 I'm too dead

Lumabots · 2025-06-24T23:14:03Z

im gonna sleep its 2am rn, but i'll check that tomorrow morning, if you have a more efficient way to check for the value feel free to share it

* 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>

* 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>

discord/partial_emoji.py

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

Paillat-dev · 2025-07-13T12:42:32Z

discord/partial_emoji.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, either as Unicode characters or as a Discord alias (``:smile:``).


Suggested change

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:``).

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:``).

Paillat-dev · 2025-07-13T12:43:32Z

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.


Update to mention it was also added to PartialEmojiConverter or add a second line or smth.

i'll do that soon

Paillat-dev · 2025-07-13T12:44:55Z

discord/utils.py

@@ -97,10 +98,21 @@
    "generate_snowflake",
    "basic_autocomplete",
    "filter_params",
+    "EMOJIS_MAP",


Do we consider documenting these as public utils ?

dont see why it would not be a good idea

Because we would then have to maintain that and also would not be able to remove them without it being breaking.

Because we would then have to maintain that and also would not be able to remove them without it being breaking.

Then let's not put it public ;)

Paillat-dev · 2025-07-13T16:31:07Z

@Lumabots Can you take a look at the comments ?

Revert "Revert "fix: support emoji aliases like :smile: in PartialE…

fa24b73

…moji.fro…" This reverts commit 8619b69.

Paillat-dev suggested changes Jun 21, 2025

View reviewed changes

discord/partial_emoji.py Outdated Show resolved Hide resolved

Lulalaby changed the title ~~fix: support emoji aliases like :smile: in PartialEmoji.from_str (redo)~~ feat: support emoji aliases like :smile: in PartialEmoji.from_str (redo) Jun 21, 2025

Update discord/partial_emoji.py

e69a7bd

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

Lulalaby commented Jun 21, 2025

View reviewed changes

CHANGELOG.md Outdated Show resolved Hide resolved

CHANGELOG.md Outdated Show resolved Hide resolved

Lulalaby added 2 commits June 21, 2025 13:28

Update CHANGELOG.md

ee29419

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

Update CHANGELOG.md

80a7ade

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

Lulalaby changed the title ~~feat: support emoji aliases like :smile: in PartialEmoji.from_str (redo)~~ feat: Added support for emoji aliases like :smile: in PartialEmoji.from_str (redo) Jun 21, 2025

Lulalaby requested a review from Paillat-dev June 21, 2025 11:29

Paillat-dev mentioned this pull request Jun 24, 2025

discord.Emoji and discord.PartialEmoji didn't work in slash option. #1582

Open

3 tasks

Update MANIFEST.in

ce07e86

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

This comment was marked as outdated.

Sign in to view

Paillat-dev approved these changes Jun 24, 2025

View reviewed changes

Lumabots mentioned this pull request Jun 24, 2025

feat: allow usage of unicode emoji in PartialEmojiConverter #2819

Merged

9 tasks

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

3143637

* Update converter.py * fix: enhance PartialEmojiConverter to support direct emoji names * update doc

Paillat-dev suggested changes Jun 24, 2025

View reviewed changes

discord/ext/commands/converter.py Outdated Show resolved Hide resolved

discord/ext/commands/converter.py Outdated Show resolved Hide resolved

Lumabots mentioned this pull request Jun 25, 2025

Revert 2814 revert 2774 emoji #2820

Merged

9 tasks

Lumabots and others added 2 commits June 25, 2025 13:56

Lumabots approved these changes Jun 26, 2025

View reviewed changes

Paillat-dev suggested changes Jun 26, 2025

View reviewed changes

discord/partial_emoji.py Outdated Show resolved Hide resolved

Lulalaby commented Jun 26, 2025

View reviewed changes

discord/partial_emoji.py Outdated Show resolved Hide resolved

Update discord/partial_emoji.py

1d7c2a6

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

Lulalaby requested a review from Paillat-dev June 26, 2025 19:52

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

8c47596

Paillat-dev suggested changes Jul 13, 2025

View reviewed changes

	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:``).
	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:``).

Uh oh!

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

Are you sure you want to change the base?

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

Conversation

Lulalaby commented Jun 20, 2025

Uh oh!

Uh oh!

Paillat-dev commented Jun 21, 2025

Uh oh!

Uh oh!

Uh oh!

Paillat-dev commented Jun 24, 2025

Uh oh!

Lumabots commented Jun 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Lulalaby commented Jun 24, 2025

Uh oh!

This comment was marked as outdated.

Paillat-dev left a comment

Choose a reason for hiding this comment

Uh oh!

Lumabots commented Jun 24, 2025

Uh oh!

Lulalaby commented Jun 24, 2025

Uh oh!

Lumabots commented Jun 24, 2025

Uh oh!

Uh oh!

Uh oh!

Lulalaby commented Jun 24, 2025

Uh oh!

Lumabots commented Jun 24, 2025

Uh oh!

Uh oh!

Uh oh!

Paillat-dev Jul 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Paillat-dev Jul 13, 2025

Choose a reason for hiding this comment

Uh oh!

Lumabots Jul 13, 2025

Choose a reason for hiding this comment

Uh oh!

Paillat-dev Jul 13, 2025

Choose a reason for hiding this comment

Uh oh!

Lumabots Jul 13, 2025

Choose a reason for hiding this comment

Uh oh!

Paillat-dev Jul 13, 2025

Choose a reason for hiding this comment

Uh oh!

Lumabots Jul 14, 2025

Choose a reason for hiding this comment

Uh oh!

Paillat-dev commented Jul 13, 2025

Uh oh!

Uh oh!

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

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

Lumabots commented Jun 24, 2025 •

edited

Loading

Paillat-dev Jul 13, 2025 •

edited

Loading