Merge branch 'master' into actx-option-properties

Author: krittick

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,4 @@
-# Warning: We have a feature freeze till release
-That means we won't accept new features for now. Only bug fixes.
+<!-- Warning: No new features will be merged until the next stable release. -->
 
 ## Summary
 

discord/bot.py

@@ -576,8 +576,8 @@ async def sync_commands(
             guild_permissions: List = []
 
             for i in commands:
-                cmd = find(lambda cmd: cmd.name == i["name"] and cmd.type == i["type"] and cmd.guild_ids is not None
-                                       and (i["guild_id"]) in cmd.guild_ids, self.pending_application_commands)
+                cmd = find(lambda cmd: cmd.name == i["name"] and str(cmd.type) == str(i["type"]) and cmd.guild_ids is not None
+                                       and int(i["guild_id"]) in cmd.guild_ids, self.pending_application_commands)
                 if not cmd:
                     # command has not been added yet
                     continue

discord/commands/context.py

@@ -99,15 +99,19 @@ async def _get_channel(self) -> Optional[InteractionChannel]:
 
     async def invoke(self, command: ApplicationCommand[CogT, P, T], /, *args: P.args, **kwargs: P.kwargs) -> T:
         r"""|coro|
+
         Calls a command with the arguments given.
         This is useful if you want to just call the callback that a
         :class:`.ApplicationCommand` holds internally.
+
         .. note::
+
             This does not handle converters, checks, cooldowns, pre-invoke,
             or after-invoke hooks in any matter. It calls the internal callback
             directly as-if it was a regular function.
             You must take care in passing the proper arguments when
             using this function.
+
         Parameters
         -----------
         command: :class:`.ApplicationCommand`
@@ -159,7 +163,7 @@ def message(self) -> Optional[Message]:
     def user(self) -> Optional[Union[Member, User]]:
         return self.interaction.user
 
-    author = user
+    author: Optional[Union[Member, User]] = user
 
     @property
     def voice_client(self) -> Optional[VoiceProtocol]:

discord/voice_client.py

@@ -757,10 +757,10 @@ def start_recording(self, sink, callback, *args):
     def stop_recording(self):
         """Stops the recording.
         Must be already recording.
-        Raises
 
         .. versionadded:: 2.1
 
+        Raises
         ------
         RecordingException
             Not currently recording.