Merge remote-tracking branch 'upstream/master' into akiko

Author: Soheab

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         id: install-deps
         run: |
-          python -m pip install --upgrade pip setuptools wheel black==22.6 requests
+          python -m pip install --upgrade pip setuptools wheel ruff==0.12 requests
           pip install -U -r requirements.txt
 
       - name: Setup node.js
@@ -42,7 +42,7 @@ jobs:
           warnings: false
           no-comments: ${{ matrix.python-version != '3.x' }}
 
-      - name: Run black
+      - name: Run ruff
         if: ${{ always() && steps.install-deps.outcome == 'success' }}
         run: |
-          black --check discord examples
+          ruff format --check discord examples

discord/__init__.py

@@ -13,7 +13,7 @@
 __author__ = 'Rapptz'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2015-present Rapptz'
-__version__ = '2.6.0a'
+__version__ = '2.7.0a'
 
 __path__ = __import__('pkgutil').extend_path(__path__, __name__)
 
@@ -81,11 +81,11 @@ class VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
-    releaselevel: Literal["alpha", "beta", "candidate", "final"]
+    releaselevel: Literal['alpha', 'beta', 'candidate', 'final']
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=6, micro=0, releaselevel='alpha', serial=0)
+version_info: VersionInfo = VersionInfo(major=2, minor=7, micro=0, releaselevel='alpha', serial=0)
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 

discord/__main__.py

@@ -133,7 +133,7 @@ async def setup(bot):
     await bot.add_cog({name}(bot))
 '''
 
-_cog_extras = '''
+_cog_extras = """
     async def cog_load(self):
         # loading logic goes here
         pass
@@ -170,7 +170,7 @@ async def cog_after_invoke(self, ctx):
         # called after a command is called here
         pass
 
-'''
+"""
 
 
 # certain file names and directory names are forbidden

discord/abc.py

@@ -77,7 +77,7 @@
 T = TypeVar('T', bound=VoiceProtocol)
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
+    from typing_extensions import Self, Unpack
 
     from .client import Client
     from .user import ClientUser
@@ -112,10 +112,11 @@
     from .types.snowflake import (
         SnowflakeList,
     )
+    from .permissions import _PermissionOverwriteKwargs
 
     PartialMessageableChannel = Union[TextChannel, VoiceChannel, StageChannel, Thread, DMChannel, PartialMessageable]
     MessageableChannel = Union[PartialMessageableChannel, GroupChannel]
-    SnowflakeTime = Union["Snowflake", datetime]
+    SnowflakeTime = Union['Snowflake', datetime]
 
     class PinnedMessage(Message):
         pinned_at: datetime
@@ -139,7 +140,7 @@ def __init__(self, iterator: AsyncIterator[PinnedMessage]) -> None:
 
     def __await__(self) -> Generator[Any, None, List[PinnedMessage]]:
         warnings.warn(
-            "`await <channel>.pins()` is deprecated; use `async for message in <channel>.pins()` instead.",
+            '`await <channel>.pins()` is deprecated; use `async for message in <channel>.pins()` instead.',
             DeprecationWarning,
             stacklevel=2,
         )
@@ -422,8 +423,7 @@ class GuildChannel:
 
     if TYPE_CHECKING:
 
-        def __init__(self, *, state: ConnectionState, guild: Guild, data: GuildChannelPayload):
-            ...
+        def __init__(self, *, state: ConnectionState, guild: Guild, data: GuildChannelPayload): ...
 
     def __str__(self) -> str:
         return self.name
@@ -793,7 +793,6 @@ def permissions_for(self, obj: Union[Member, Role], /) -> Permissions:
 
         default = self.guild.default_role
         if default is None:
-
             if self._state.self_id == obj.id:
                 return Permissions._user_installed_permissions(in_guild=True)
             else:
@@ -906,26 +905,24 @@ async def set_permissions(
         *,
         overwrite: Optional[Union[PermissionOverwrite, _Undefined]] = ...,
         reason: Optional[str] = ...,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def set_permissions(
         self,
         target: Union[Member, Role],
         *,
         reason: Optional[str] = ...,
-        **permissions: Optional[bool],
-    ) -> None:
-        ...
+        **permissions: Unpack[_PermissionOverwriteKwargs],
+    ) -> None: ...
 
     async def set_permissions(
         self,
         target: Union[Member, Role],
         *,
         overwrite: Any = _undefined,
         reason: Optional[str] = None,
-        **permissions: Optional[bool],
+        **permissions: Unpack[_PermissionOverwriteKwargs],
     ) -> None:
         r"""|coro|
 
@@ -1108,8 +1105,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: Optional[str] = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1120,8 +1116,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1132,8 +1127,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     @overload
     async def move(
@@ -1144,8 +1138,7 @@ async def move(
         category: Optional[Snowflake] = MISSING,
         sync_permissions: bool = MISSING,
         reason: str = MISSING,
-    ) -> None:
-        ...
+    ) -> None: ...
 
     async def move(self, **kwargs: Any) -> None:
         """|coro|
@@ -1427,8 +1420,7 @@ async def send(
         view: LayoutView,
         suppress_embeds: bool = ...,
         silent: bool = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1443,8 +1435,7 @@ async def send(
         view: LayoutView,
         suppress_embeds: bool = ...,
         silent: bool = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1464,8 +1455,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1485,8 +1475,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1506,8 +1495,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     @overload
     async def send(
@@ -1527,8 +1515,7 @@ async def send(
         suppress_embeds: bool = ...,
         silent: bool = ...,
         poll: Poll = ...,
-    ) -> Message:
-        ...
+    ) -> Message: ...
 
     async def send(
         self,
@@ -2030,7 +2017,7 @@ async def _before_strategy(retrieve: int, before: Optional[Snowflake], limit: Op
             if limit is None:
                 raise ValueError('history does not support around with limit=None')
             if limit > 101:
-                raise ValueError("history max limit 101 when specifying around parameter")
+                raise ValueError('history max limit 101 when specifying around parameter')
 
             # Strange Discord quirk
             limit = 100 if limit == 101 else limit

discord/activity.py

@@ -861,13 +861,11 @@ def __repr__(self) -> str:
 
 
 @overload
-def create_activity(data: ActivityPayload, state: ConnectionState) -> ActivityTypes:
-    ...
+def create_activity(data: ActivityPayload, state: ConnectionState) -> ActivityTypes: ...
 
 
 @overload
-def create_activity(data: None, state: ConnectionState) -> None:
-    ...
+def create_activity(data: None, state: ConnectionState) -> None: ...
 
 
 def create_activity(data: Optional[ActivityPayload], state: ConnectionState) -> Optional[ActivityTypes]:

discord/app_commands/checks.py

@@ -55,8 +55,9 @@
 T = TypeVar('T')
 
 if TYPE_CHECKING:
-    from typing_extensions import Self
+    from typing_extensions import Self, Unpack
     from ..interactions import Interaction
+    from ..permissions import _PermissionsKwargs
 
     CooldownFunction = Union[
         Callable[[Interaction[Any]], Coroutine[Any, Any, T]],
@@ -286,7 +287,7 @@ def predicate(interaction: Interaction) -> bool:
     return check(predicate)
 
 
-def has_permissions(**perms: bool) -> Callable[[T], T]:
+def has_permissions(**perms: Unpack[_PermissionsKwargs]) -> Callable[[T], T]:
     r"""A :func:`~discord.app_commands.check` that is added that checks if the member
     has all of the permissions necessary.
 
@@ -326,7 +327,7 @@ async def test(interaction: discord.Interaction):
 
     invalid = perms.keys() - Permissions.VALID_FLAGS.keys()
     if invalid:
-        raise TypeError(f"Invalid permission(s): {', '.join(invalid)}")
+        raise TypeError(f'Invalid permission(s): {", ".join(invalid)}')
 
     def predicate(interaction: Interaction) -> bool:
         permissions = interaction.permissions
@@ -341,7 +342,7 @@ def predicate(interaction: Interaction) -> bool:
     return check(predicate)
 
 
-def bot_has_permissions(**perms: bool) -> Callable[[T], T]:
+def bot_has_permissions(**perms: Unpack[_PermissionsKwargs]) -> Callable[[T], T]:
     """Similar to :func:`has_permissions` except checks if the bot itself has
     the permissions listed. This relies on :attr:`discord.Interaction.app_permissions`.
 
@@ -353,7 +354,7 @@ def bot_has_permissions(**perms: bool) -> Callable[[T], T]:
 
     invalid = set(perms) - set(Permissions.VALID_FLAGS)
     if invalid:
-        raise TypeError(f"Invalid permission(s): {', '.join(invalid)}")
+        raise TypeError(f'Invalid permission(s): {", ".join(invalid)}')
 
     def predicate(interaction: Interaction) -> bool:
         permissions = interaction.app_permissions
@@ -370,7 +371,6 @@ def predicate(interaction: Interaction) -> bool:
 def _create_cooldown_decorator(
     key: CooldownFunction[Hashable], factory: CooldownFunction[Optional[Cooldown]]
 ) -> Callable[[T], T]:
-
     mapping: Dict[Any, Cooldown] = {}
 
     async def get_bucket(