Merge branch 'master' into components/file-upload

Author: Soheab

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/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|
@@ -2976,6 +2979,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.
 
@@ -3008,8 +3016,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]) -> 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

discord/enums.py

@@ -75,6 +75,8 @@
     'EntitlementType',
     'EntitlementOwnerType',
     'PollLayoutType',
+    'InviteType',
+    'ReactionType',
     'VoiceChannelEffectAnimationType',
     'SubscriptionStatus',
     'MessageReferenceType',
@@ -277,6 +279,16 @@ class MessageType(Enum):
     poll_result = 46
     emoji_added = 63
 
+    def is_deletable(self) -> bool:
+        return self not in {
+            MessageType.recipient_add,
+            MessageType.recipient_remove,
+            MessageType.call,
+            MessageType.channel_name_change,
+            MessageType.channel_icon_change,
+            MessageType.thread_starter_message,
+        }
+
 
 class SpeakingState(Enum):
     none = 0

discord/ext/commands/bot.py

@@ -89,8 +89,8 @@
     PrefixType = Union[_Prefix, _PrefixCallable[BotT]]
 
     class _BotOptions(_ClientOptions, total=False):
-        owner_id: int
-        owner_ids: Collection[int]
+        owner_id: Optional[int]
+        owner_ids: Optional[Collection[int]]
         strip_after_prefix: bool
         case_insensitive: bool
 

discord/ext/commands/cog.py

@@ -45,29 +45,18 @@
     Tuple,
     TypeVar,
     Union,
-    TypedDict,
 )
 
 from ._types import _BaseCommand, BotT
 
 if TYPE_CHECKING:
-    from typing_extensions import Self, Unpack
+    from typing_extensions import Self
     from discord.abc import Snowflake
     from discord._types import ClientT
 
     from .bot import BotBase
     from .context import Context
-    from .core import Command, _CommandDecoratorKwargs
-
-    class _CogKwargs(TypedDict, total=False):
-        name: str
-        group_name: Union[str, app_commands.locale_str]
-        description: str
-        group_description: Union[str, app_commands.locale_str]
-        group_nsfw: bool
-        group_auto_locale_strings: bool
-        group_extras: Dict[Any, Any]
-        command_attrs: _CommandDecoratorKwargs
+    from .core import Command
 
 
 __all__ = (
@@ -182,7 +171,7 @@ async def bar(self, ctx):
     __cog_app_commands__: List[Union[app_commands.Group, app_commands.Command[Any, ..., Any]]]
     __cog_listeners__: List[Tuple[str, str]]
 
-    def __new__(cls, *args: Any, **kwargs: Unpack[_CogKwargs]) -> CogMeta:
+    def __new__(cls, *args: Any, **kwargs: Any) -> CogMeta:
         name, bases, attrs = args
         if any(issubclass(base, app_commands.Group) for base in bases):
             raise TypeError(

discord/ext/commands/core.py

@@ -68,11 +68,11 @@
 
     class _CommandDecoratorKwargs(TypedDict, total=False):
         enabled: bool
-        help: str
-        brief: str
-        usage: str
+        help: Optional[str]
+        brief: Optional[str]
+        usage: Optional[str]
         rest_is_raw: bool
-        aliases: List[str]
+        aliases: Union[List[str], Tuple[str, ...]]
         description: str
         hidden: bool
         checks: List[UserCheck[Context[Any]]]
@@ -449,7 +449,7 @@ def __init__(
         self.brief: Optional[str] = kwargs.get('brief')
         self.usage: Optional[str] = kwargs.get('usage')
         self.rest_is_raw: bool = kwargs.get('rest_is_raw', False)
-        self.aliases: Union[List[str], Tuple[str]] = kwargs.get('aliases', [])
+        self.aliases: Union[List[str], Tuple[str, ...]] = kwargs.get('aliases', [])
         self.extras: Dict[Any, Any] = kwargs.get('extras', {})
 
         if not isinstance(self.aliases, (list, tuple)):

discord/ext/commands/help.py

@@ -69,12 +69,12 @@
 
     class _HelpCommandOptions(TypedDict, total=False):
         show_hidden: bool
-        verify_checks: bool
+        verify_checks: Optional[bool]
         command_attrs: _CommandKwargs
 
     class _BaseHelpCommandOptions(_HelpCommandOptions, total=False):
         sort_commands: bool
-        dm_help: bool
+        dm_help: Optional[bool]
         dm_help_threshold: int
         no_category: str
         paginator: Paginator
@@ -394,7 +394,7 @@ def __new__(cls, *args: Any, **kwargs: Any) -> Self:
 
     def __init__(self, **options: Unpack[_HelpCommandOptions]) -> None:
         self.show_hidden: bool = options.pop('show_hidden', False)
-        self.verify_checks: bool = options.pop('verify_checks', True)
+        self.verify_checks: Optional[bool] = options.pop('verify_checks', True)
         self.command_attrs = attrs = options.pop('command_attrs', {})
         attrs.setdefault('name', 'help')
         attrs.setdefault('help', 'Shows this message')
@@ -1070,7 +1070,7 @@ def __init__(self, **options: Unpack[_DefaultHelpCommandOptions]) -> None:
         self.width: int = options.pop('width', 80)
         self.indent: int = options.pop('indent', 2)
         self.sort_commands: bool = options.pop('sort_commands', True)
-        self.dm_help: bool = options.pop('dm_help', False)
+        self.dm_help: Optional[bool] = options.pop('dm_help', False)
         self.dm_help_threshold: int = options.pop('dm_help_threshold', 1000)
         self.arguments_heading: str = options.pop('arguments_heading', 'Arguments:')
         self.commands_heading: str = options.pop('commands_heading', 'Commands:')
@@ -1364,7 +1364,7 @@ class MinimalHelpCommand(HelpCommand):
     def __init__(self, **options: Unpack[_MinimalHelpCommandOptions]) -> None:
         self.sort_commands: bool = options.pop('sort_commands', True)
         self.commands_heading: str = options.pop('commands_heading', 'Commands')
-        self.dm_help: bool = options.pop('dm_help', False)
+        self.dm_help: Optional[bool] = options.pop('dm_help', False)
         self.dm_help_threshold: int = options.pop('dm_help_threshold', 1000)
         self.aliases_heading: str = options.pop('aliases_heading', 'Aliases:')
         self.no_category: str = options.pop('no_category', 'No Category')

discord/ext/commands/hybrid.py

@@ -67,10 +67,12 @@ class _HybridGroupKwargs(_HybridCommandDecoratorKwargs, total=False):
         default_permissions: bool
         nsfw: bool
         description: str
+        case_insensitive: bool
 
     class _HybridGroupDecoratorKwargs(_HybridGroupKwargs, total=False):
         description: Union[str, app_commands.locale_str]
-        fallback: Union[str, app_commands.locale_str]
+        fallback: Optional[str]
+        fallback_locale: Optional[app_commands.locale_str]
 
 
 __all__ = (

discord/http.py

@@ -1136,18 +1136,15 @@ def guild_voice_state(
     def edit_profile(self, payload: Dict[str, Any]) -> Response[user.User]:
         return self.request(Route('PATCH', '/users/@me'), json=payload)
 
-    def change_my_nickname(
+    def edit_my_member(
         self,
         guild_id: Snowflake,
-        nickname: str,
         *,
         reason: Optional[str] = None,
-    ) -> Response[member.Nickname]:
-        r = Route('PATCH', '/guilds/{guild_id}/members/@me/nick', guild_id=guild_id)
-        payload = {
-            'nick': nickname,
-        }
-        return self.request(r, json=payload, reason=reason)
+        **fields: Any,
+    ) -> Response[member.MemberWithUser]:
+        r = Route('PATCH', '/guilds/{guild_id}/members/@me', guild_id=guild_id)
+        return self.request(r, json=fields, reason=reason)
 
     def change_nickname(
         self,