Merge branch 'master' into uv-frozen

Author: Paillat-dev

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @Pycord-Development/pycord-next-contributors 
+* @Pycord-Development/pycord-next-contributors
 
 /.github @Lulalaby
 /crowdin.yml @Pycord-Development/maintain-translations

.pre-commit-config.yaml

@@ -10,7 +10,7 @@ repos:
       - id: end-of-file-fixer
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.11
+    rev: v0.13.3
     hooks:
       - id: ruff
         args: [ --fix ]

CHANGELOG-V3.md

@@ -12,3 +12,17 @@ release.
 ### Deprecated
 
 ### Removed
+
+- `utils.filter_params`
+- `utils.sleep_until` use `asyncio.sleep` combined with `datetime.datetime` instead
+- `utils.compute_timedelta` use the `datetime` module instead
+- `utils.resolve_invite`
+- `utils.resolve_template`
+- `utils.parse_time` use `datetime.datetime.fromisoformat` instead
+- `utils.time_snowflake` use `utils.generate_snowflake` instead
+- `utils.warn_deprecated`
+- `utils.deprecated`
+- `utils.get` use `utils.find` with `lambda i: i.attr == val` instead
+- `AsyncIterator.get` use `AsyncIterator.find` with `lambda i: i.attr == val` instead
+- `utils.as_chunks` use `itertools.batched` on Python 3.12+ or your own implementation
+  instead

README.rst

@@ -1,4 +1,4 @@
-⚠️ This is a testing repository, and should not be used in production.
+⚠️ This is a testing repository, and should not be used in production ⚠️
 
 Please use the main repository: https://github.com/Pycord-Development/pycord
 

discord/__version.py

@@ -35,8 +35,8 @@
 
 from typing import Literal, NamedTuple
 
-from .utils import deprecated
 from ._version import __version__, __version_tuple__
+from .utils.private import deprecated
 
 
 class AdvancedVersionInfo(TypedDict):

discord/abc.py

@@ -55,6 +55,7 @@
 from .role import Role
 from .scheduled_events import ScheduledEvent
 from .sticker import GuildSticker, StickerItem
+from .utils.private import warn_deprecated
 from .voice_client import VoiceClient, VoiceProtocol
 
 __all__ = (
@@ -98,9 +99,9 @@
     from .ui.view import View
     from .user import ClientUser
 
-    PartialMessageableChannel = Union[TextChannel, VoiceChannel, StageChannel, Thread, DMChannel, PartialMessageable]
-    MessageableChannel = Union[PartialMessageableChannel, GroupChannel]
-    SnowflakeTime = Union["Snowflake", datetime]
+    PartialMessageableChannel = TextChannel | VoiceChannel | StageChannel | Thread | DMChannel | PartialMessageable
+    MessageableChannel = PartialMessageableChannel | GroupChannel
+    SnowflakeTime = "Snowflake" | datetime
 
 MISSING = utils.MISSING
 
@@ -724,7 +725,7 @@ def permissions_for(self, obj: Member | Role, /) -> Permissions:
             if obj.is_default():
                 return base
 
-            overwrite = utils.get(self._overwrites, type=_Overwrites.ROLE, id=obj.id)
+            overwrite = utils.find(lambda o: o.type == _Overwrites.ROLE and o.id == obj.id, self._overwrites)
             if overwrite is not None:
                 base.handle_overwrite(overwrite.allow, overwrite.deny)
 
@@ -911,8 +912,8 @@ async def set_permissions(self, target, *, overwrite=MISSING, reason=None, **per
                 raise InvalidArgument("No overwrite provided.")
             try:
                 overwrite = PermissionOverwrite(**permissions)
-            except (ValueError, TypeError):
-                raise InvalidArgument("Invalid permissions given to keyword arguments.")
+            except (ValueError, TypeError) as e:
+                raise InvalidArgument("Invalid permissions given to keyword arguments.") from e
         elif len(permissions) > 0:
             raise InvalidArgument("Cannot mix overwrite and keyword arguments.")
 
@@ -1529,7 +1530,7 @@ async def send(
                 from .message import MessageReference  # noqa: PLC0415
 
                 if not isinstance(reference, MessageReference):
-                    utils.warn_deprecated(
+                    warn_deprecated(
                         f"Passing {type(reference).__name__} to reference",
                         "MessageReference",
                         "2.7",
@@ -1752,8 +1753,8 @@ def can_send(self, *objects) -> bool:
                     if obj.guild_id == channel.guild.id:
                         continue
 
-            except (KeyError, AttributeError):
-                raise TypeError(f"The object {obj} is of an invalid type.")
+            except (KeyError, AttributeError) as e:
+                raise TypeError(f"The object {obj} is of an invalid type.") from e
 
             if not getattr(channel.permissions_for(channel.guild.me), permission):
                 return False

discord/activity.py

@@ -32,7 +32,7 @@
 from .colour import Colour
 from .enums import ActivityType, try_enum
 from .partial_emoji import PartialEmoji
-from .utils import _get_as_snowflake
+from .utils.private import get_as_snowflake
 
 __all__ = (
     "BaseActivity",
@@ -226,7 +226,7 @@ def __init__(self, **kwargs):
         self.timestamps: ActivityTimestamps = kwargs.pop("timestamps", {})
         self.assets: ActivityAssets = kwargs.pop("assets", {})
         self.party: ActivityParty = kwargs.pop("party", {})
-        self.application_id: int | None = _get_as_snowflake(kwargs, "application_id")
+        self.application_id: int | None = get_as_snowflake(kwargs, "application_id")
         self.url: str | None = kwargs.pop("url", None)
         self.flags: int = kwargs.pop("flags", 0)
         self.sync_id: str | None = kwargs.pop("sync_id", None)
@@ -805,7 +805,7 @@ def __repr__(self) -> str:
         return f"<CustomActivity name={self.name!r} emoji={self.emoji!r}>"
 
 
-ActivityTypes = Union[Activity, Game, CustomActivity, Streaming, Spotify]
+ActivityTypes = Activity | Game | CustomActivity | Streaming | Spotify
 
 
 @overload

discord/appinfo.py

@@ -30,6 +30,7 @@
 from . import utils
 from .asset import Asset
 from .permissions import Permissions
+from .utils.private import get_as_snowflake, warn_deprecated
 
 if TYPE_CHECKING:
     from .guild import Guild
@@ -200,9 +201,9 @@ def __init__(self, state: ConnectionState, data: AppInfoPayload):
         self._summary: str = data["summary"]
         self.verify_key: str = data["verify_key"]
 
-        self.guild_id: int | None = utils._get_as_snowflake(data, "guild_id")
+        self.guild_id: int | None = get_as_snowflake(data, "guild_id")
 
-        self.primary_sku_id: int | None = utils._get_as_snowflake(data, "primary_sku_id")
+        self.primary_sku_id: int | None = get_as_snowflake(data, "primary_sku_id")
         self.slug: str | None = data.get("slug")
         self._cover_image: str | None = data.get("cover_image")
         self.terms_of_service_url: str | None = data.get("terms_of_service_url")
@@ -261,7 +262,7 @@ def summary(self) -> str | None:
         .. versionadded:: 1.3
         .. deprecated:: 2.7
         """
-        utils.warn_deprecated(
+        warn_deprecated(
             "summary",
             "description",
             reference="https://discord.com/developers/docs/resources/application#application-object-application-structure",

discord/asset.py

@@ -47,6 +47,11 @@
 MISSING = utils.MISSING
 
 
+def _valid_icon_size(size: int) -> bool:
+    """Icons must be power of 2 within [16, 4096]."""
+    return not size & (size - 1) and 4096 >= size >= 16
+
+
 class AssetMixin:
     url: str
     _state: Any | None
@@ -373,7 +378,7 @@ def replace(
             url = url.with_path(f"{path}.{static_format}")
 
         if size is not MISSING:
-            if not utils.valid_icon_size(size):
+            if not _valid_icon_size(size):
                 raise InvalidArgument("size must be a power of 2 between 16 and 4096")
             url = url.with_query(size=size)
         else:
@@ -400,7 +405,7 @@ def with_size(self, size: int, /) -> Asset:
         InvalidArgument
             The asset had an invalid size.
         """
-        if not utils.valid_icon_size(size):
+        if not _valid_icon_size(size):
             raise InvalidArgument("size must be a power of 2 between 16 and 4096")
 
         url = str(yarl.URL(self._url).with_query(size=size))

discord/audit_logs.py

@@ -25,6 +25,7 @@
 
 from __future__ import annotations
 
+from functools import cached_property
 from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
 
 from . import enums, utils
@@ -35,6 +36,7 @@
 from .mixins import Hashable
 from .object import Object
 from .permissions import PermissionOverwrite, Permissions
+from .utils.private import get_as_snowflake
 
 __all__ = (
     "AuditLogDiff",
@@ -381,7 +383,7 @@ def _handle_role(
         elem: list[RolePayload],
     ) -> None:
         if not hasattr(first, "roles"):
-            setattr(first, "roles", [])
+            first.roles = []
 
         data = []
         g: Guild = entry.guild  # type: ignore
@@ -396,7 +398,7 @@ def _handle_role(
 
             data.append(role)
 
-        setattr(second, "roles", data)
+        second.roles = data
 
     def _handle_trigger_metadata(
         self,
@@ -407,13 +409,13 @@ def _handle_trigger_metadata(
         attr: str,
     ) -> None:
         if not hasattr(first, "trigger_metadata"):
-            setattr(first, "trigger_metadata", None)
+            first.trigger_metadata = None
 
         key = attr.split("_", 1)[-1]
         data = {key: elem}
         tm = AutoModTriggerMetadata.from_dict(data)
 
-        setattr(second, "trigger_metadata", tm)
+        second.trigger_metadata = tm
 
 
 class _AuditLogProxyMemberPrune:
@@ -559,21 +561,21 @@ def _from_data(self, data: AuditLogEntryPayload) -> None:
         # into meaningful data when requested
         self._changes = data.get("changes", [])
 
-        self.user = self._get_member(utils._get_as_snowflake(data, "user_id"))  # type: ignore
-        self._target_id = utils._get_as_snowflake(data, "target_id")
+        self.user = self._get_member(get_as_snowflake(data, "user_id"))  # type: ignore
+        self._target_id = get_as_snowflake(data, "target_id")
 
     def _get_member(self, user_id: int) -> Member | User | None:
         return self.guild.get_member(user_id) or self._users.get(user_id)
 
     def __repr__(self) -> str:
         return f"<AuditLogEntry id={self.id} action={self.action} user={self.user!r}>"
 
-    @property
+    @cached_property
     def created_at(self) -> datetime.datetime:
         """Returns the entry's creation time in UTC."""
         return utils.snowflake_time(self.id)
 
-    @property
+    @cached_property
     def target(
         self,
     ) -> (
@@ -602,7 +604,7 @@ def category(self) -> enums.AuditLogActionCategory:
         """The category of the action, if applicable."""
         return self.action.category
 
-    @property
+    @cached_property
     def changes(self) -> AuditLogChanges:
         """The list of changes this entry has."""
         obj = AuditLogChanges(self, self._changes, state=self._state)