Merge branch 'get_or_fetch' of https://github.com/Lumabots/pycord into get_or_fetch

Author: Lumabots

CHANGELOG.md

@@ -65,6 +65,10 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2801](https://github.com/Pycord-Development/pycord/pull/2801))
 - Added `Guild.get_or_fetch()` and `Client.get_or_fetch()` shortcut methods.
   ([#2776](https://github.com/Pycord-Development/pycord/pull/2776))
+- Added `User.nameplate` property.
+  ([#2817](https://github.com/Pycord-Development/pycord/pull/2817))
+- Added role gradients support with `Role.colours` and the `RoleColours` class.
+  ([#2818](https://github.com/Pycord-Development/pycord/pull/2818))
 
 ### Fixed
 
@@ -121,6 +125,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/__init__.py

@@ -35,6 +35,7 @@
 from .channel import *
 from .client import *
 from .cog import *
+from .collectibles import *
 from .colour import *
 from .commands import *
 from .components import *

discord/client.py

@@ -39,8 +39,6 @@
     Generator,
     Sequence,
     TypeVar,
-    overload,
-    Literal,
 )
 
 import aiohttp
@@ -249,9 +247,9 @@ def __init__(
         self.loop: asyncio.AbstractEventLoop = (
             asyncio.get_event_loop() if loop is None else loop
         )
-        self._listeners: dict[
-            str, list[tuple[asyncio.Future, Callable[..., bool]]]
-        ] = {}
+        self._listeners: dict[str, list[tuple[asyncio.Future, Callable[..., bool]]]] = (
+            {}
+        )
         self.shard_id: int | None = options.get("shard_id")
         self.shard_count: int | None = options.get("shard_count")
 

discord/collectibles.py

@@ -0,0 +1,75 @@
+"""
+The MIT License (MIT)
+
+Copyright (c) 2021-present Pycord Development
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+"""
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from .state import ConnectionState
+
+from .asset import Asset
+from .types.collectibles import Nameplate as NameplatePayload
+
+
+class Nameplate:
+    """
+    Represents a Discord Nameplate.
+
+    .. versionadded:: 2.7
+
+    Attributes
+    ----------
+        sku_id: int
+            The SKU ID of the nameplate.
+        palette: str
+            The color palette of the nameplate.
+    """
+
+    def __init__(self, data: NameplatePayload, state: "ConnectionState") -> None:
+        self.sku_id: int = data["sku_id"]
+        self.palette: str = data["palette"]
+        self._label: str = data["label"]
+        self._asset: str = data["asset"]
+        self._state: "ConnectionState" = state
+
+    def __repr__(self) -> str:
+        return f"<Nameplate sku_id={self.sku_id} palette={self.palette}>"
+
+    def get_asset(self, animated: bool = False) -> Asset:
+        """Returns the asset of the nameplate.
+
+        Parameters
+        ----------
+        animated: :class:`bool`
+            Whether to return the animated version of the asset, in webm version. Defaults to ``False``.
+        """
+        fn = "static.png" if not animated else "asset.webm"
+        return Asset(
+            state=self._state,
+            url=f"{Asset.BASE}/assets/collectibles/{self._asset}{fn}",
+            key=self._asset.split("/")[-1],
+            animated=animated,
+        )
+
+
+__all__ = ("Nameplate",)

discord/components.py

@@ -670,18 +670,36 @@ class UnfurledMediaItem(AssetMixin):
     def __init__(self, url: str):
         self._state = None
         self._url: str = url
+        self._static_url: str | None = (
+            url if url and url.startswith("attachment://") else None
+        )
         self.proxy_url: str | None = None
         self.height: int | None = None
         self.width: int | None = None
         self.content_type: str | None = None
         self.flags: AttachmentFlags | None = None
         self.attachment_id: int | None = None
 
+    def __repr__(self) -> str:
+        return (
+            f"<UnfurledMediaItem url={self.url!r} attachment_id={self.attachment_id}>"
+        )
+
+    def __str__(self) -> str:
+        return self.url or self.__repr__()
+
     @property
     def url(self) -> str:
         """Returns this media item's url."""
         return self._url
 
+    @url.setter
+    def url(self, value: str) -> None:
+        self._url = value
+        self._static_url = (
+            value if value and value.startswith("attachment://") else None
+        )
+
     @classmethod
     def from_dict(cls, data: UnfurledMediaItemPayload, state=None) -> UnfurledMediaItem:
 
@@ -696,7 +714,7 @@ def from_dict(cls, data: UnfurledMediaItemPayload, state=None) -> UnfurledMediaI
         return r
 
     def to_dict(self) -> dict[str, str]:
-        return {"url": self.url}
+        return {"url": self._static_url or self.url}
 
 
 class Thumbnail(Component):

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

@@ -38,7 +38,6 @@
     Tuple,
     Union,
     overload,
-    Literal,
 )
 
 from . import abc, utils
@@ -80,7 +79,7 @@
 from .monetization import Entitlement
 from .onboarding import Onboarding
 from .permissions import PermissionOverwrite
-from .role import Role
+from .role import Role, RoleColours
 from .scheduled_events import ScheduledEvent, ScheduledEventLocation
 from .stage_instance import StageInstance
 from .sticker import GuildSticker
@@ -2981,6 +2980,8 @@ async def create_role(
         name: str = ...,
         permissions: Permissions = ...,
         colour: Colour | int = ...,
+        colours: RoleColours = ...,
+        holographic: bool = ...,
         hoist: bool = ...,
         mentionable: bool = ...,
         icon: bytes | None = MISSING,
@@ -2995,6 +2996,8 @@ async def create_role(
         name: str = ...,
         permissions: Permissions = ...,
         color: Colour | int = ...,
+        colors: RoleColours = ...,
+        holographic: bool = ...,
         hoist: bool = ...,
         mentionable: bool = ...,
         icon: bytes | None = ...,
@@ -3008,6 +3011,9 @@ async def create_role(
         permissions: Permissions = MISSING,
         color: Colour | int = MISSING,
         colour: Colour | int = MISSING,
+        colors: RoleColours = MISSING,
+        colours: RoleColours = MISSING,
+        holographic: bool = MISSING,
         hoist: bool = MISSING,
         mentionable: bool = MISSING,
         reason: str | None = None,
@@ -3071,11 +3077,30 @@ async def create_role(
         else:
             fields["permissions"] = "0"
 
-        actual_colour = colour or color or Colour.default()
+        actual_colour = colour if colour not in (MISSING, None) else color
+
         if isinstance(actual_colour, int):
-            fields["color"] = actual_colour
+            actual_colour = Colour(actual_colour)
+
+        if actual_colour not in (MISSING, None):
+            utils.warn_deprecated("colour", "colours", "2.7")
+            actual_colours = RoleColours(primary=actual_colour)
+        elif holographic:
+            actual_colours = RoleColours.holographic()
+        else:
+            actual_colours = colours or colors or RoleColours.default()
+
+        if isinstance(actual_colours, RoleColours):
+            if "ENHANCED_ROLE_COLORS" not in self.features:
+                actual_colours.secondary = None
+                actual_colours.tertiary = None
+            fields["colors"] = actual_colours._to_dict()
         else:
-            fields["color"] = actual_colour.value
+            raise InvalidArgument(
+                "colours parameter must be of type RoleColours, not {0.__class__.__name__}".format(
+                    actual_colours
+                )
+            )
 
         if hoist is not MISSING:
             fields["hoist"] = hoist

discord/guild.py

@@ -2163,6 +2163,7 @@ def edit_role(
             "name",
             "permissions",
             "color",
+            "colors",
             "hoist",
             "mentionable",
             "icon",