Merge branch 'master' into feat/tests

Author: Paillat-dev

.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.12
+    rev: v0.13.3
     hooks:
       - id: ruff
         args: [ --fix ]

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.private import deprecated
 from ._version import __version__, __version_tuple__
+from .utils.private import deprecated
 
 
 class AdvancedVersionInfo(TypedDict):

discord/abc.py

@@ -41,7 +41,6 @@
     runtime_checkable,
 )
 
-from .utils.private import warn_deprecated
 from . import utils
 from .context_managers import Typing
 from .enums import ChannelType
@@ -56,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__ = (
@@ -99,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
 
@@ -912,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.")
 
@@ -1753,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

@@ -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

@@ -27,10 +27,10 @@
 
 from typing import TYPE_CHECKING
 
-from .utils.private import warn_deprecated, get_as_snowflake
 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

discord/audit_logs.py

@@ -25,10 +25,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
 from functools import cached_property
+from typing import TYPE_CHECKING, Any, Callable, ClassVar, Generator, TypeVar
 
-from .utils.private import get_as_snowflake
 from . import enums, utils
 from .asset import Asset
 from .automod import AutoModAction, AutoModTriggerMetadata
@@ -37,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",
@@ -383,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
@@ -398,7 +398,7 @@ def _handle_role(
 
             data.append(role)
 
-        setattr(second, "roles", data)
+        second.roles = data
 
     def _handle_trigger_metadata(
         self,
@@ -409,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:

discord/banners.py

@@ -11,11 +11,12 @@
 import time
 import warnings
 from typing import Sequence
-from . import __version__
 
 import colorlog
 import colorlog.escape_codes
 
+from . import __version__
+
 __all__: Sequence[str] = ("start_logging", "print_banner")
 
 

discord/bot.py

@@ -111,7 +111,7 @@ def pending_application_commands(self):
     def commands(self) -> list[ApplicationCommand | Any]:
         commands = self.application_commands
         if self._bot._supports_prefixed_commands and hasattr(self._bot, "prefixed_commands"):
-            commands += getattr(self._bot, "prefixed_commands")
+            commands += self._bot.prefixed_commands
         return commands
 
     @property
@@ -265,7 +265,7 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
             if isinstance(cmd, SlashCommandGroup):
                 if len(cmd.subcommands) != len(match.get("options", [])):
                     return True
-                for i, subcommand in enumerate(cmd.subcommands):
+                for subcommand in cmd.subcommands:
                     match_ = next(
                         (data for data in match["options"] if data["name"] == subcommand.name),
                         MISSING,
@@ -357,8 +357,9 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
                 return_value.append({"command": cmd, "action": None, "id": int(match["id"])})
 
         # Now let's see if there are any commands on discord that we need to delete
-        for cmd, value_ in registered_commands_dict.items():
-            match = find(lambda c: c.name == value_["name"], pending)
+        for _, value_ in registered_commands_dict.items():
+            # name default arg is used because loop variables leak in surrounding scope
+            match = find(lambda c, name=value_["name"]: c.name == name, pending)
             if match is None:
                 # We have this command registered but not in our list
                 return_value.append(
@@ -517,7 +518,11 @@ def register(
                     )
                     continue
                 # We can assume the command item is a command, since it's only a string if action is delete
-                match = find(lambda c: c.name == cmd["command"].name and c.type == cmd["command"].type, pending)
+                wanted = cmd["command"]
+                name = wanted.name
+                type_ = wanted.type
+
+                match = next((c for c in pending if c.name == name and c.type == type_), None)
                 if match is None:
                     continue
                 if cmd["action"] == "edit":
@@ -606,8 +611,10 @@ def register(
             registered = await register("bulk", data, guild_id=guild_id)
 
         for i in registered:
+            type_ = i.get("type")
+            # name, type_ default args are used because loop variables leak in surrounding scope
             cmd = find(
-                lambda c: c.name == i["name"] and c.type == i.get("type"),
+                lambda c, name=i["name"], type_=type_: c.name == name and c.type == type_,
                 self.pending_application_commands,
             )
             if not cmd:
@@ -624,7 +631,7 @@ async def sync_commands(
         force: bool = False,
         guild_ids: list[int] | None = None,
         register_guild_commands: bool = True,
-        check_guilds: list[int] | None = [],
+        check_guilds: list[int] | None = None,
         delete_existing: bool = True,
     ) -> None:
         """|coro|
@@ -711,25 +718,37 @@ async def on_connect():
                 )
                 registered_guild_commands[guild_id] = app_cmds
 
-        for i in registered_commands:
+        for item in registered_commands:
+            type_ = item.get("type")
+            # name, type_ default args are used because loop variables leak in surrounding scope
             cmd = find(
-                lambda c: c.name == i["name"] and c.guild_ids is None and c.type == i.get("type"),
+                lambda c, name=item["name"], type_=type_: (c.name == name and c.guild_ids is None and c.type == type_),
                 self.pending_application_commands,
             )
             if cmd:
-                cmd.id = i["id"]
+                cmd.id = item["id"]
                 self._application_commands[cmd.id] = cmd
 
         if register_guild_commands and registered_guild_commands:
             for guild_id, guild_cmds in registered_guild_commands.items():
                 for i in guild_cmds:
-                    cmd = find(
-                        lambda cmd: cmd.name == i["name"]
-                        and cmd.type == i.get("type")
-                        and cmd.guild_ids is not None
-                        and (guild_id := i.get("guild_id"))
-                        and guild_id in cmd.guild_ids,
-                        self.pending_application_commands,
+                    name = i["name"]
+                    type_ = i.get("type")
+                    target_gid = i.get("guild_id")
+                    if target_gid is None:
+                        continue
+
+                    cmd = next(
+                        (
+                            c
+                            for c in self.pending_application_commands
+                            if c.name == name
+                            and c.type == type_
+                            and c.guild_ids is not None
+                            and target_gid == guild_id
+                            and target_gid in c.guild_ids
+                        ),
+                        None,
                     )
                     if not cmd:
                         # command has not been added yet

discord/channel.py

@@ -39,7 +39,6 @@
 
 import discord.abc
 
-from .utils.private import bytes_to_base64_data, get_as_snowflake, copy_doc
 from . import utils
 from .asset import Asset
 from .emoji import GuildEmoji
@@ -65,6 +64,7 @@
 from .stage_instance import StageInstance
 from .threads import Thread
 from .utils import MISSING
+from .utils.private import bytes_to_base64_data, copy_doc, get_as_snowflake
 
 __all__ = (
     "TextChannel",