Update api.rst

Again on mobile

discord/asset.py

@@ -245,15 +245,6 @@ class Asset(AssetMixin):
             animated=animated,
         )
 
-    @classmethod
-    def _from_role_icon(cls, state, role_id: int, role_hash: str) -> Asset:
-        return cls(
-            state,
-            url=f"{cls.BASE}/role-icons/{role_id}/{role_hash}.png",
-            key=role_hash,
-            animated=False,
-        )
-
     def __str__(self) -> str:
         return self._url
 

discord/ext/commands/bot.py

@@ -28,6 +28,7 @@ from __future__ import annotations
 import asyncio
 import collections
 import collections.abc
+from functools import cached_property
 
 import inspect
 import importlib.util
@@ -72,7 +73,9 @@ from .cog import Cog
 if TYPE_CHECKING:
     import importlib.machinery
 
+    from discord.role import Role
     from discord.message import Message
+    from discord.abc import PartialMessageableChannel
     from ._types import (
         Check,
         CoroFunc,
@@ -94,10 +97,17 @@ CXT = TypeVar("CXT", bound="Context")
 
 class _FakeSlashMessage(discord.PartialMessage):
     activity = application = edited_at = reference = webhook_id = None
-    attachments = components = reactions = stickers = mentions = []
+    attachments = components = reactions = stickers = []
-    author: Union[discord.User, discord.Member]
     tts = False
 
+    raw_mentions = discord.Message.raw_mentions
+    clean_content = discord.Message.clean_content
+    channel_mentions = discord.Message.channel_mentions
+    raw_role_mentions = discord.Message.raw_role_mentions
+    raw_channel_mentions = discord.Message.raw_channel_mentions
+
+    author: Union[discord.User, discord.Member]
+
     @classmethod
     def from_interaction(
         cls, interaction: discord.Interaction, channel: Union[discord.TextChannel, discord.DMChannel, discord.Thread]
@@ -108,6 +118,22 @@ class _FakeSlashMessage(discord.PartialMessage):
 
         return self
 
+    @cached_property
+    def mentions(self) -> List[Union[discord.Member, discord.User]]:
+        client = self._state._get_client()
+        if self.guild:
+            ensure_user = lambda id: self.guild.get_member(id) or client.get_user(id) # type: ignore
+        else:
+            ensure_user = client.get_user
+
+        return discord.utils._unique(filter(None, map(ensure_user, self.raw_mentions)))
+
+    @cached_property
+    def role_mentions(self) -> List[Role]:
+        if self.guild is None:
+            return []
+        return discord.utils._unique(filter(None, map(self.guild.get_role, self.raw_role_mentions)))
+
 
 def when_mentioned(bot: Union[Bot, AutoShardedBot], msg: Message) -> List[str]:
     """A callable that implements a command prefix equivalent to being mentioned.

discord/guild.py

@@ -2448,8 +2448,6 @@ class Guild(Hashable):
         colour: Union[Colour, int] = ...,
         hoist: bool = ...,
         mentionable: bool = ...,
-        icon: bytes = ...,
-        emoji: str = ...,
     ) -> Role:
         ...
 
@@ -2463,8 +2461,6 @@ class Guild(Hashable):
         color: Union[Colour, int] = ...,
         hoist: bool = ...,
         mentionable: bool = ...,
-        icon: bytes = ...,
-        emoji: str = ...,
     ) -> Role:
         ...
 
@@ -2477,8 +2473,6 @@ class Guild(Hashable):
         colour: Union[Colour, int] = MISSING,
         hoist: bool = MISSING,
         mentionable: bool = MISSING,
-        icon: bytes = MISSING,
-        emoji: str = MISSING,
         reason: Optional[str] = None,
     ) -> Role:
         """|coro|
@@ -2508,10 +2502,6 @@ class Guild(Hashable):
         mentionable: :class:`bool`
             Indicates if the role should be mentionable by others.
             Defaults to ``False``.
-        emoji: :class:`str`
-            The unicode emoji that is shown next to users with the role.
-        icon: :class:`bytes`
-            A custom image that is shown next to users with the role.
         reason: Optional[:class:`str`]
             The reason for creating this role. Shows up on the audit log.
 
@@ -2550,12 +2540,6 @@ class Guild(Hashable):
         if name is not MISSING:
             fields["name"] = name
 
-        if emoji is not MISSING:
-            fields["unicode_emoji"] = emoji
-
-        if icon is not MISSING:
-            fields["icon"] = utils._bytes_to_base64_data(icon)
-
         data = await self._state.http.create_role(self.id, reason=reason, **fields)
         role = Role(guild=self, data=data, state=self._state)
 

discord/role.py

@@ -23,14 +23,13 @@ DEALINGS IN THE SOFTWARE.
 """
 
 from __future__ import annotations
-from typing import Any, Dict, List, Optional, TypeVar, Union, TYPE_CHECKING
+from typing import Any, Dict, List, Optional, TypeVar, Union, overload, TYPE_CHECKING
 
-from .asset import Asset
 from .permissions import Permissions
 from .errors import InvalidArgument
 from .colour import Colour
 from .mixins import Hashable
-from .utils import snowflake_time, _get_as_snowflake, MISSING, _bytes_to_base64_data
+from .utils import snowflake_time, _get_as_snowflake, MISSING
 
 __all__ = (
     "RoleTags",
@@ -159,15 +158,7 @@ class Role(Hashable):
     guild: :class:`Guild`
         The guild the role belongs to.
     hoist: :class:`bool`
-        Indicates if the role will be displayed separately from other members.
+         Indicates if the role will be displayed separately from other members.
-    icon: Optional[:class:`Asset`]
-        A custom image that is shown next to users with the role.
-
-        .. versionadded:: 2.0
-    emoji: Optional[:class:`str`]
-        The unicode emoji that is shown next to users with the role.
-
-        .. versionadded:: 2.0
     position: :class:`int`
         The position of the role. This number is usually positive. The bottom
         role has a position of 0.
@@ -200,8 +191,6 @@ class Role(Hashable):
         "hoist",
         "guild",
         "tags",
-        "_icon",
-        "emoji",
         "_state",
     )
 
@@ -262,8 +251,6 @@ class Role(Hashable):
         self.position: int = data.get("position", 0)
         self._colour: int = data.get("color", 0)
         self.hoist: bool = data.get("hoist", False)
-        self.emoji: Optional[str] = data.get("unicode_emoji")
-        self._icon: Optional[str] = data.get("icon")
         self.managed: bool = data.get("managed", False)
         self.mentionable: bool = data.get("mentionable", False)
         self.tags: Optional[RoleTags]
@@ -331,13 +318,6 @@ class Role(Hashable):
         """:class:`str`: Returns a string that allows you to mention a role."""
         return f"<@&{self.id}>"
 
-    @property
-    def icon(self) -> Optional[Asset]:
-        """Optional[:class:`Asset`]: Returns the custom icon shown next to users with the role, if it exists."""
-        if self._icon is None:
-            return
-        return Asset._from_role_icon(self._state, self.id, self._icon)
-
     @property
     def members(self) -> List[Member]:
         """List[:class:`Member`]: Returns all the members with this role."""
@@ -381,8 +361,6 @@ class Role(Hashable):
         hoist: bool = MISSING,
         mentionable: bool = MISSING,
         position: int = MISSING,
-        icon: bytes = MISSING,
-        emoji: str = MISSING,
         reason: Optional[str] = MISSING,
     ) -> Optional[Role]:
         """|coro|
@@ -415,10 +393,6 @@ class Role(Hashable):
         position: :class:`int`
             The new role's position. This must be below your top role's
             position or it will fail.
-        emoji: :class:`str`
-            The unicode emoji that is shown next to users with the role.
-        icon: :class:`bytes`
-            A custom image that is shown next to users with the role.
         reason: Optional[:class:`str`]
             The reason for editing this role. Shows up on the audit log.
 
@@ -462,12 +436,6 @@ class Role(Hashable):
         if mentionable is not MISSING:
             payload["mentionable"] = mentionable
 
-        if emoji is not MISSING:
-            payload["unicode_emoji"] = emoji
-
-        if icon is not MISSING:
-            payload["icon"] = _bytes_to_base64_data(icon)
-
         data = await self._state.http.edit_role(self.guild.id, self.id, reason=reason, **payload)
         return Role(guild=self.guild, data=data, state=self._state)
 

discord/types/role.py

@@ -29,9 +29,7 @@ from .snowflake import Snowflake
 
 
 class _RoleOptional(TypedDict, total=False):
-    icon: str
     tags: RoleTags
-    unicode_emoji: str
 
 
 class Role(_RoleOptional):

discord/utils.py

@@ -84,6 +84,7 @@ __all__ = (
     "escape_mentions",
     "as_chunks",
     "format_dt",
+    "generate_snowflake",
 )
 
 DISCORD_EPOCH = 1420070400000
@@ -1020,3 +1021,23 @@ def format_dt(dt: datetime.datetime, /, style: Optional[TimestampStyle] = None)
     if style is None:
         return f"<t:{int(dt.timestamp())}>"
     return f"<t:{int(dt.timestamp())}:{style}>"
+
+
+def generate_snowflake(dt: Optional[datetime.datetime] = None) -> int:
+    """Returns a numeric snowflake pretending to be created at the given date but more accurate and random than time_snowflake.
+    If No dt is not passed, it makes one from the current time using utcnow.
+
+    Parameters
+    -----------
+    dt: :class:`datetime.datetime`
+        A datetime object to convert to a snowflake.
+        If naive, the timezone is assumed to be local time.
+
+    Returns
+    --------
+    :class:`int`
+        The snowflake representing the time given.
+    """
+
+    dt = dt or utcnow()
+    return int(dt.timestamp() * 1000 - DISCORD_EPOCH) << 22 | 0x3fffff

docs/api.rst

@@ -1136,6 +1136,8 @@ Utility Functions
 
 .. autofunction:: discord.utils.as_chunks
 
+.. autofunction:: discord.utils.generate_snowflake
+
 .. _discord-api-enums:
 
 Enumerations