Merge branch 'master' into get_or_fetch

Author: Lumabots

CHANGELOG.md

@@ -115,6 +115,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))
+- Fixed support emoji aliases like `:smile:` in PartialEmoji.from_str.
+  ([#2774](https://github.com/Pycord-Development/pycord/pull/2774))
 - Fixed `Webhook.edit` not working with `attachments=[]`.
   ([#2779](https://github.com/Pycord-Development/pycord/pull/2779))
 - Fixed GIF-based `Sticker` returning the wrong `url`.

discord/emojis.json

@@ -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,12 @@ def from_str(cls: type[PE], value: str) -> PE:
         :class:`PartialEmoji`
             The partial emoji from this string.
         """
+        if value.startswith(":") and value.endswith(":"):
+            name = value[1:-1]
+        unicode_emoji = EMOJIS_MAP.get(name)
+        if unicode_emoji:
+            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

@@ -1050,7 +1050,7 @@ def replacement(match):
     regex = _MARKDOWN_STOCK_REGEX
     if ignore_links:
         regex = f"(?:{_URL_REGEX}|{regex})"
-    return re.sub(regex, replacement, text, 0, re.MULTILINE)
+    return re.sub(regex, replacement, text, count=0, flags=re.MULTILINE)
 
 
 def escape_markdown(
@@ -1092,7 +1092,7 @@ def replacement(match):
         regex = _MARKDOWN_STOCK_REGEX
         if ignore_links:
             regex = f"(?:{_URL_REGEX}|{regex})"
-        return re.sub(regex, replacement, text, 0, re.MULTILINE | re.X)
+        return re.sub(regex, replacement, text, count=0, flags=re.MULTILINE | re.X)
     else:
         text = re.sub(r"\\", r"\\\\", text)
         return _MARKDOWN_ESCAPE_REGEX.sub(r"\\\1", text)