Merge branch 'Pycord-Development:feature/slash' into feature/slash

Author: plun1331

discord/abc.py

@@ -1529,6 +1529,59 @@ async def pins(self) -> List[Message]:
         state = self._state
         data = await state.http.pins_from(channel.id)
         return [state.create_message(channel=channel, data=m) for m in data]
+    
+    def can_send(self, *objects) -> bool:
+        """Returns a :class:`bool` indicating whether you have the permissions to send the object(s).
+
+        Raises
+        ------
+        TypeError
+            An invalid type has been passed.
+
+        Returns
+        --------
+        :class:`bool`
+            Indicates whether you have the permissions to send the object(s).
+        """
+        mapping = {
+            'Message': 'send_messages',
+            'Embed': 'embed_links',
+            'File': 'attach_files',
+            'Emoji': 'use_external_emojis',
+            'GuildSticker': 'use_external_stickers',
+        }
+        # Can't use channel = await self._get_channel() since its async
+        if hasattr(self, 'permissions_for'):
+            channel = self
+        elif hasattr(self, 'channel') and not type(self.channel).__name__ in ('DMChannel', 'GroupChannel'):
+            channel = self.channel
+        else:
+            return True # Permissions don't exist for User DMs
+
+        
+        objects = (None, ) + objects # Makes sure we check for send_messages first
+
+        for obj in objects:
+            try:
+                if obj is None:
+                    permission = mapping['Message']
+                else:
+                    permission = mapping.get(type(obj).__name__) or mapping[obj.__name__]
+                
+                if type(obj).__name__ == 'Emoji':
+                    if obj._to_partial().is_unicode_emoji or obj.guild_id == channel.guild.id:
+                        continue
+                elif type(obj).__name__ == 'GuildSticker':
+                    if obj.guild_id == channel.guild.id:
+                        continue
+
+            except (KeyError, AttributeError):
+                raise TypeError(f'The object {obj} is of an invalid type.')
+
+            if not getattr(channel.permissions_for(channel.guild.me), permission):
+                return False
+
+        return True 
 
     def history(
         self,

discord/app/commands.py

@@ -25,6 +25,7 @@
 from __future__ import annotations
 
 import asyncio
+import types
 from discord.types.channel import TextChannel, VoiceChannel
 import functools
 import inspect
@@ -336,7 +337,6 @@ def __init__(self, func: Callable, *args, **kwargs) -> None:
     def parse_options(self, params) -> List[Option]:
         final_options = []
 
-        params = self._get_signature_parameters()
         if list(params.items())[0][0] == "self":
             temp = list(params.items())
             temp.pop(0)
@@ -387,7 +387,10 @@ def parse_options(self, params) -> List[Option]:
         return final_options
 
     def _is_typing_union(self, annotation):
-        return getattr(annotation, "__origin__", None) is Union # type: ignore
+        return (
+            getattr(annotation, '__origin__', None) is Union
+            or type(annotation) is getattr(types, "UnionType", Union)
+        ) # type: ignore
 
     def _is_typing_optional(self, annotation):
         return self._is_typing_union(annotation) and type(None) in annotation.__args__  # type: ignore

discord/ext/commands/core.py

@@ -44,6 +44,7 @@
 import functools
 import inspect
 import datetime
+import types
 
 import discord
 
@@ -1019,8 +1020,11 @@ def short_doc(self) -> str:
         return ''
 
     def _is_typing_optional(self, annotation: Union[T, Optional[T]]) -> TypeGuard[Optional[T]]:
-        return getattr(annotation, '__origin__', None) is Union and type(None) in annotation.__args__  # type: ignore
-
+        return (
+            (getattr(annotation, '__origin__', None) is Union
+            or type(annotation) is getattr(types, "UnionType", Union))
+            and type(None) in annotation.__args__  # type: ignore
+        )
     @property
     def signature(self) -> str:
         """:class:`str`: Returns a POSIX-like signature useful for help command output."""

discord/message.py

@@ -503,9 +503,6 @@ class Message(Hashable):
 
             Returns the message's hash.
             
-        .. describe:: len(x)
-        
-            Returns the length of the message's content.
             
     Attributes
     -----------
@@ -716,8 +713,6 @@ def __repr__(self) -> str:
             f'<{name} id={self.id} channel={self.channel!r} type={self.type!r} author={self.author!r} flags={self.flags!r}>'
         )
 
-    def __len__(self):
-        return len(self.content)
 
     def _try_patch(self, data, key, transform=None) -> None:
         try: