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

Author: Soheab

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Replace Black with Ruff, then format whole project.
+44a44e938fb2bd0bb085d8aa4577abeb01653ad3

.github/workflows/lint.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install dependencies
         id: install-deps
         run: |
-          python -m pip install --upgrade pip setuptools wheel ruff==0.12 requests
+          python -m pip install --upgrade pip setuptools wheel ruff==0.12 requests "typing_extensions>=4.3,<5"
           pip install -U -r requirements.txt
 
       - name: Setup node.js

.gitignore

@@ -16,3 +16,5 @@ docs/crowdin.py
 *.mo
 /.coverage
 build/*
+uv.lock*
+pylock*.toml

discord/__init__.py

@@ -75,6 +75,7 @@
 from .presences import *
 from .primary_guild import *
 from .onboarding import *
+from .collectible import *
 
 
 class VersionInfo(NamedTuple):

discord/abc.py

@@ -195,6 +195,9 @@ async def _purge_helper(
             count = 0
             await asyncio.sleep(1)
 
+        if not message.type.is_deletable():
+            continue
+
         if not check(message):
             continue
 

discord/app_commands/commands.py

@@ -2523,10 +2523,7 @@ def inner(f: T) -> T:
             allowed_contexts = getattr(f, '__discord_app_commands_contexts__', None) or AppCommandContext()
             f.__discord_app_commands_contexts__ = allowed_contexts  # type: ignore # Runtime attribute assignment
 
-        # Ensure that only Guild context is allowed
-        allowed_contexts.guild = True  # Enable guild context
-        allowed_contexts.private_channel = False  # Disable private channel context
-        allowed_contexts.dm_channel = False  # Disable DM context
+        allowed_contexts.guild = True
 
         return f
 
@@ -2578,10 +2575,7 @@ def inner(f: T) -> T:
             allowed_contexts = getattr(f, '__discord_app_commands_contexts__', None) or AppCommandContext()
             f.__discord_app_commands_contexts__ = allowed_contexts  # type: ignore # Runtime attribute assignment
 
-        # Ensure that only Private Channel context is allowed
-        allowed_contexts.guild = False  # Disable guild context
-        allowed_contexts.private_channel = True  # Enable private channel context
-        allowed_contexts.dm_channel = False  # Disable DM context
+        allowed_contexts.private_channel = True
 
         return f
 
@@ -2631,11 +2625,7 @@ def inner(f: T) -> T:
             allowed_contexts = getattr(f, '__discord_app_commands_contexts__', None) or AppCommandContext()
             f.__discord_app_commands_contexts__ = allowed_contexts  # type: ignore # Runtime attribute assignment
 
-        # Ensure that only DM context is allowed
-        allowed_contexts.guild = False  # Disable guild context
-        allowed_contexts.private_channel = False  # Disable private channel context
-        allowed_contexts.dm_channel = True  # Enable DM context
-
+        allowed_contexts.dm_channel = True
         return f
 
     # Check if called with parentheses or not
@@ -2727,7 +2717,6 @@ def inner(f: T) -> T:
             f.__discord_app_commands_installation_types__ = allowed_installs  # type: ignore # Runtime attribute assignment
 
         allowed_installs.guild = True
-        allowed_installs.user = False
 
         return f
 
@@ -2776,7 +2765,6 @@ def inner(f: T) -> T:
             f.__discord_app_commands_installation_types__ = allowed_installs  # type: ignore # Runtime attribute assignment
 
         allowed_installs.user = True
-        allowed_installs.guild = False
 
         return f
 

discord/asset.py

@@ -355,6 +355,16 @@ def _from_primary_guild(cls, state: _State, guild_id: int, icon_hash: str) -> Se
             animated=False,
         )
 
+    @classmethod
+    def _from_user_collectible(cls, state: _State, asset: str, animated: bool = False) -> Self:
+        name = 'static.png' if not animated else 'asset.webm'
+        return cls(
+            state,
+            url=f'{cls.BASE}/assets/collectibles/{asset}{name}',
+            key=asset,
+            animated=animated,
+        )
+
     def __str__(self) -> str:
         return self._url
 

discord/audit_logs.py

@@ -630,11 +630,6 @@ class _AuditLogProxyAutoModAction(_AuditLogProxy):
     channel: Optional[Union[abc.GuildChannel, Thread]]
 
 
-class _AuditLogProxyAutoModActionQuarantineUser(_AuditLogProxy):
-    automod_rule_name: str
-    automod_rule_trigger_type: str
-
-
 class _AuditLogProxyMemberKickOrMemberRoleUpdate(_AuditLogProxy):
     integration_type: Optional[str]
 
@@ -725,7 +720,6 @@ def _from_data(self, data: AuditLogEntryPayload) -> None:
             _AuditLogProxyStageInstanceAction,
             _AuditLogProxyMessageBulkDelete,
             _AuditLogProxyAutoModAction,
-            _AuditLogProxyAutoModActionQuarantineUser,
             _AuditLogProxyMemberKickOrMemberRoleUpdate,
             Member, User, None, PartialIntegration,
             Role, Object
@@ -766,6 +760,7 @@ def _from_data(self, data: AuditLogEntryPayload) -> None:
                 self.action is enums.AuditLogAction.automod_block_message
                 or self.action is enums.AuditLogAction.automod_flag_message
                 or self.action is enums.AuditLogAction.automod_timeout_member
+                or self.action is enums.AuditLogAction.automod_quarantine_user
             ):
                 channel_id = utils._get_as_snowflake(extra, 'channel_id')
                 channel = None
@@ -781,13 +776,6 @@ def _from_data(self, data: AuditLogEntryPayload) -> None:
                     ),
                     channel=channel,
                 )
-            elif self.action is enums.AuditLogAction.automod_quarantine_user:
-                self.extra = _AuditLogProxyAutoModActionQuarantineUser(
-                    automod_rule_name=extra['auto_moderation_rule_name'],
-                    automod_rule_trigger_type=enums.try_enum(
-                        enums.AutoModRuleTriggerType, int(extra['auto_moderation_rule_trigger_type'])
-                    ),
-                )
 
             elif self.action.name.startswith('overwrite_'):
                 # the overwrite_ actions have a dict with some information

discord/channel.py

@@ -2879,6 +2879,7 @@ async def create_thread(
         applied_tags: Sequence[ForumTag] = ...,
         view: LayoutView,
         suppress_embeds: bool = ...,
+        silent: bool = ...,
         reason: Optional[str] = ...,
     ) -> ThreadWithMessage: ...
 
@@ -2901,6 +2902,7 @@ async def create_thread(
         applied_tags: Sequence[ForumTag] = ...,
         view: View = ...,
         suppress_embeds: bool = ...,
+        silent: bool = ...,
         reason: Optional[str] = ...,
     ) -> ThreadWithMessage: ...
 
@@ -2922,6 +2924,7 @@ async def create_thread(
         applied_tags: Sequence[ForumTag] = MISSING,
         view: BaseView = MISSING,
         suppress_embeds: bool = False,
+        silent: bool = False,
         reason: Optional[str] = None,
     ) -> ThreadWithMessage:
         """|coro|
@@ -2979,6 +2982,11 @@ async def create_thread(
             A list of stickers to upload. Must be a maximum of 3.
         suppress_embeds: :class:`bool`
             Whether to suppress embeds for the message. This sends the message without any embeds if set to ``True``.
+        silent: :class:`bool`
+            Whether to suppress push and desktop notifications for the message. This will increment the mention counter
+            in the UI, but will not actually send a notification.
+
+            .. versionadded:: 2.7
         reason: :class:`str`
             The reason for creating a new thread. Shows up on the audit log.
 
@@ -3011,8 +3019,10 @@ async def create_thread(
         if view and not hasattr(view, '__discord_ui_view__'):
             raise TypeError(f'view parameter must be View not {view.__class__.__name__}')
 
-        if suppress_embeds:
-            flags = MessageFlags._from_value(4)
+        if suppress_embeds or silent:
+            flags = MessageFlags._from_value(0)
+            flags.suppress_embeds = suppress_embeds
+            flags.suppress_notifications = silent
         else:
             flags = MISSING
 

discord/client.py

@@ -124,25 +124,25 @@
     from .flags import MemberCacheFlags
 
     class _ClientOptions(TypedDict, total=False):
-        max_messages: int
-        proxy: str
-        proxy_auth: aiohttp.BasicAuth
-        shard_id: int
-        shard_count: int
+        max_messages: Optional[int]
+        proxy: Optional[str]
+        proxy_auth: Optional[aiohttp.BasicAuth]
+        shard_id: Optional[int]
+        shard_count: Optional[int]
         application_id: int
         member_cache_flags: MemberCacheFlags
         chunk_guilds_at_startup: bool
-        status: Status
-        activity: BaseActivity
-        allowed_mentions: AllowedMentions
+        status: Optional[Status]
+        activity: Optional[BaseActivity]
+        allowed_mentions: Optional[AllowedMentions]
         heartbeat_timeout: float
         guild_ready_timeout: float
         assume_unsync_clock: bool
         enable_debug_events: bool
         enable_raw_presences: bool
         http_trace: aiohttp.TraceConfig
-        max_ratelimit_timeout: float
-        connector: aiohttp.BaseConnector
+        max_ratelimit_timeout: Optional[float]
+        connector: Optional[aiohttp.BaseConnector]
 
 
 # fmt: off
@@ -2511,7 +2511,7 @@ async def fetch_invite(
         )
         return Invite.from_incomplete(state=self._connection, data=data)
 
-    async def delete_invite(self, invite: Union[Invite, str], /) -> Invite:
+    async def delete_invite(self, invite: Union[Invite, str], /, *, reason: Optional[str] = None) -> Invite:
         """|coro|
 
         Revokes an :class:`.Invite`, URL, or ID to an invite.
@@ -2527,6 +2527,8 @@ async def delete_invite(self, invite: Union[Invite, str], /) -> Invite:
         ----------
         invite: Union[:class:`.Invite`, :class:`str`]
             The invite to revoke.
+        reason: Optional[:class:`str`]
+            The reason for deleting the invite. Shows up on the audit log.
 
         Raises
         -------
@@ -2539,7 +2541,7 @@ async def delete_invite(self, invite: Union[Invite, str], /) -> Invite:
         """
 
         resolved = utils.resolve_invite(invite)
-        data = await self.http.delete_invite(resolved.code)
+        data = await self.http.delete_invite(resolved.code, reason=reason)
         return Invite.from_incomplete(state=self._connection, data=data)
 
     # Miscellaneous stuff