Skip to content

Commit 8619b69

Browse files
authored
Revert "fix: support emoji aliases like :smile: in PartialEmoji.from_str" (#2814)
Revert "fix: support emoji aliases like `:smile:` in PartialEmoji.from_str (#…" This reverts commit 735673b.
1 parent 735673b commit 8619b69

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,6 @@ These changes are available on the `master` branch, but have not yet been releas
113113
([#2761](https://github.com/Pycord-Development/pycord/pull/2761))
114114
- Updated `valid_locales` to support `in` and `es-419`.
115115
([#2767](https://github.com/Pycord-Development/pycord/pull/2767))
116-
- Fixed support emoji aliases like `:smile:` in PartialEmoji.from_str.
117-
([#2774](https://github.com/Pycord-Development/pycord/pull/2774))
118116
- Fixed `Webhook.edit` not working with `attachments=[]`.
119117
([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
120118
- Fixed GIF-based `Sticker` returning the wrong `url`.

discord/emojis.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

discord/partial_emoji.py

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,13 @@
2525

2626
from __future__ import annotations
2727

28-
import importlib.resources
29-
import json
3028
import re
3129
from typing import TYPE_CHECKING, Any, TypedDict, TypeVar
3230

3331
from . import utils
3432
from .asset import Asset, AssetMixin
3533
from .errors import InvalidArgument
3634

37-
with (
38-
importlib.resources.files(__package__)
39-
.joinpath("emojis.json")
40-
.open(encoding="utf-8") as f
41-
):
42-
EMOJIS_MAP = json.load(f)
43-
4435
__all__ = ("PartialEmoji",)
4536

4637
if TYPE_CHECKING:
@@ -136,7 +127,7 @@ def from_str(cls: type[PE], value: str) -> PE:
136127
- ``name:id``
137128
- ``<:name:id>``
138129
139-
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:``).
130+
If the format does not match then it is assumed to be a unicode emoji.
140131
141132
.. versionadded:: 2.0
142133
@@ -150,12 +141,6 @@ def from_str(cls: type[PE], value: str) -> PE:
150141
:class:`PartialEmoji`
151142
The partial emoji from this string.
152143
"""
153-
if value.startswith(":") and value.endswith(":"):
154-
name = value[1:-1]
155-
unicode_emoji = EMOJIS_MAP.get(name)
156-
if unicode_emoji:
157-
return cls(name=unicode_emoji, id=None, animated=False)
158-
159144
match = cls._CUSTOM_EMOJI_RE.match(value)
160145
if match is not None:
161146
groups = match.groupdict()

0 commit comments

Comments
 (0)