Merge branch 'Pycord-Development:master' into master

Author: janu8ry

.github/CONTRIBUTING.md

@@ -34,6 +34,10 @@ If the bug report is missing this information then it'll take us longer to fix t
 
 Submitting a pull request is fairly simple, just make sure it focuses on a single aspect and doesn't manage to have scope creep and it's probably good to go. It would be incredibly lovely if the style is consistent to that found in the project. This project follows PEP-8 guidelines (mostly) with a column limit of 125.
 
+### Licensing
+
+By submitting a pull request, you agree that; 1) You hold the copyright on all submitted code inside said pull request; 2) You agree to transfer all rights to the owner of this repository, and; 3) If you are found to be in fault with any of the above, we shall not be held responsible in any way after the pull request has been merged.
+
 ### Git Commit Guidelines
 
 - Use present tense (e.g. "Add feature" not "Added feature")

about.md

@@ -1,11 +1,12 @@
 # About
 ## What Happened to Discord.py?
-Rapptz, also known as Danny, the maintainer and core developer of discord.py will no longer be updating it. Here's his full explanation: https://gist.github.com/Rapptz/4a2f62751b9600a31a0d3c78100287f1 <br>
+Rapptz, also known as Danny, the maintainer and core developer of discord.py will no longer be updating it. Here's his [Full explanation](https://gist.github.com/Rapptz/4a2f62751b9600a31a0d3c78100287f1)              
+</br>
 [Here](https://gist.github.com/Rapptz/4a2f62751b9600a31a0d3c78100287f1#FAQ) is a FAQ written by him.
 
 ## What is Pycord?
 Pycord ("py-cord" on PyPI) is a maintained fork of discord.py which will be updated with new changes to the API. Pycord was created by a group of developers that want to continue developing this Python module.
 
 ## Features
 Pycord v1.7.3 is the same as discord.py v1.7.3. However Pycord v2.0.0 will support interactions and other features introduces in v2.0.0a as it's a fork of the master branch. <br>
-We also have a FAQ channel in our Discord server. You can [click here](https://discord.gg/nRMbjMnxCz) to join.
+We also have a FAQ channel in our Discord server. You can [click here](https://discord.gg/nRMbjMnxCz) to join.

discord/__init__.py

@@ -61,6 +61,7 @@
 from .threads import *
 from .bot import *
 from .app import *
+from .welcome_screen import *
 
 
 class VersionInfo(NamedTuple):

discord/app/commands.py

@@ -169,7 +169,7 @@ async def invoke(self, ctx: InteractionContext) -> None:
 
 class Option:
     def __init__(
-        self, input_type: SlashCommandOptionType, /, description: str, **kwargs
+        self, input_type, /, description: str, **kwargs
     ) -> None:
         self.name: Optional[str] = kwargs.pop("name", None)
         self.description = description

discord/bot.py

@@ -247,7 +247,7 @@ async def handle_interaction(self, interaction: Interaction) -> None:
             context = await self.get_application_context(interaction)
             await command.invoke(context)
 
-    def slash_command(self, **kwargs) -> SlashCommand:
+    def slash_command(self, **kwargs):
         """A shortcut decorator that invokes :func:`.ApplicationCommandMixin.command` and adds it to
         the internal command list via :meth:`~.ApplicationCommandMixin.add_application_command`.
         This shortcut is made specifically for :class:`.SlashCommand`.
@@ -262,7 +262,7 @@ def slash_command(self, **kwargs) -> SlashCommand:
         """
         return self.application_command(cls=SlashCommand, **kwargs)
 
-    def user_command(self, **kwargs) -> UserCommand:
+    def user_command(self, **kwargs):
         """A shortcut decorator that invokes :func:`.ApplicationCommandMixin.command` and adds it to
         the internal command list via :meth:`~.ApplicationCommandMixin.add_application_command`.
         This shortcut is made specifically for :class:`.UserCommand`.
@@ -277,7 +277,7 @@ def user_command(self, **kwargs) -> UserCommand:
         """
         return self.application_command(cls=UserCommand, **kwargs)
 
-    def message_command(self, **kwargs) -> MessageCommand:
+    def message_command(self, **kwargs):
         """A shortcut decorator that invokes :func:`.ApplicationCommandMixin.command` and adds it to
         the internal command list via :meth:`~.ApplicationCommandMixin.add_application_command`.
         This shortcut is made specifically for :class:`.MessageCommand`.

discord/channel.py

@@ -45,7 +45,7 @@
 
 import discord.abc
 from .permissions import PermissionOverwrite, Permissions
-from .enums import ChannelType, StagePrivacyLevel, try_enum, VoiceRegion, VideoQualityMode
+from .enums import ChannelType, InviteTarget, StagePrivacyLevel, try_enum, VoiceRegion, VideoQualityMode
 from .mixins import Hashable
 from .object import Object
 from . import utils
@@ -55,6 +55,7 @@
 from .stage_instance import StageInstance
 from .threads import Thread
 from .iterators import ArchivedThreadIterator
+from .invite import Invite
 
 __all__ = (
     'TextChannel',
@@ -1037,6 +1038,64 @@ async def edit(self, *, reason=None, **options):
             # the payload will always be the proper channel payload
             return self.__class__(state=self._state, guild=self.guild, data=payload)  # type: ignore
 
+    async def create_activity_invite(self, event:str, **kwargs) -> Invite:
+        """|coro|
+
+        A shortcut method that creates an instant activity invite.
+
+        You must have the :attr:`~discord.Permissions.create_instant_invite` permission to
+        do this.
+
+        Parameters
+        ------------
+        event: :class:`str`
+            The event to create an invite for. 
+        max_age: :class:`int`
+            How long the invite should last in seconds. If it's 0 then the invite
+            doesn't expire. Defaults to ``0``.
+        max_uses: :class:`int`
+            How many uses the invite could be used for. If it's 0 then there
+            are unlimited uses. Defaults to ``0``.
+        temporary: :class:`bool`
+            Denotes that the invite grants temporary membership
+            (i.e. they get kicked after they disconnect). Defaults to ``False``.
+        unique: :class:`bool`
+            Indicates if a unique invite URL should be created. Defaults to True.
+            If this is set to ``False`` then it will return a previously created
+            invite.
+        reason: Optional[:class:`str`]
+            The reason for creating this invite. Shows up on the audit log.
+
+
+        Raises
+        -------
+        InvalidArgument
+            If the event is not a valid event.
+        ~discord.HTTPException
+            Invite creation failed.
+
+        Returns
+        --------
+        :class:`~discord.Invite`
+            The invite that was created.
+        """
+
+        application_ids = {
+            'youtube' : 755600276941176913,
+            'poker'   : 755827207812677713,
+            'betrayal': 773336526917861400,
+            'fishing' : 814288819477020702,
+            'chess'   : 832012774040141894,
+        }
+        event = application_ids.get(event)
+        if event is None:
+            raise InvalidArgument('Invalid event.')
+
+        return await self.create_invite(
+            target_type=InviteTarget.embedded_application,
+            target_application_id=event,
+            **kwargs
+        )
 
 class StageChannel(VocalGuildChannel):
     """Represents a Discord guild stage channel.

discord/colour.py

@@ -325,5 +325,13 @@ def yellow(cls: Type[CT]) -> CT:
         """
         return cls(0xFEE75C)
 
+    @classmethod
+    def nitro_pink(cls: Type[CT]) -> CT:
+        """A factory method that returns a :class:`Colour` with a value of ``0xf47fff``.
+
+        .. versionadded:: 2.0
+        """
+        return cls(0xf47fff)
+
 
 Color = Colour

discord/guild.py

@@ -76,6 +76,7 @@
 from .threads import Thread, ThreadMember
 from .sticker import GuildSticker
 from .file import File
+from .welcome_screen import WelcomeScreen, WelcomeScreenChannel
 
 
 __all__ = (
@@ -2942,3 +2943,103 @@ async def change_voice_state(
         ws = self._state._get_websocket(self.id)
         channel_id = channel.id if channel else None
         await ws.voice_state(self.id, channel_id, self_mute, self_deaf)
+
+    async def welcome_screen(self):
+        """|coro|
+        
+        Returns the :class:`WelcomeScreen` of the guild.
+       
+        The guild must have ``COMMUNITY`` in :attr:`~Guild.features`.
+       
+        You must have the :attr:`~Permissions.manage_guild` permission in order to get this.
+        
+        .. versionadded:: 2.0
+
+        Raises
+        -------
+        Forbidden
+            You do not have the proper permissions to get this.
+        HTTPException
+            Retrieving the welcome screen failed somehow.
+        NotFound
+            The guild doesn't has a welcome screen or community feature is disabled.
+        
+        
+        Returns
+        --------
+        :class:`WelcomeScreen`
+            The welcome screen of guild.
+        """
+        data = await self._state.http.get_welcome_screen(self.id)
+        return WelcomeScreen(data=data, guild=self)
+
+
+    @overload
+    async def edit_welcome_screen(
+        self,
+        *,
+        description: Optional[str] = ...,
+        welcome_channels: Optional[List[WelcomeChannel]] = ...,
+        enabled: Optional[bool] = ...,
+    ) -> WelcomeScreen:
+        ...
+
+    @overload
+    async def edit_welcome_screen(self) -> None:
+        ...        
+    
+    
+    async def edit_welcome_screen(self, **options):
+        """|coro|
+        
+        A shorthand for :attr:`WelcomeScreen.edit` without fetching the welcome screen.
+        
+        You must have the :attr:`~Permissions.manage_guild` permission in the
+        guild to do this.
+        
+        The guild must have ``COMMUNITY`` in :attr:`Guild.features`
+        
+        Parameters
+        ------------
+        
+        description: Optional[:class:`str`]
+            The new description of welcome screen.
+        welcome_channels: Optional[List[:class:`WelcomeChannel`]]
+            The welcome channels. The order of the channels would be same as the passed list order.
+        enabled: Optional[:class:`bool`]
+            Whether the welcome screen should be displayed.
+        reason: Optional[:class:`str`]
+            The reason that shows up on audit log.
+
+        Raises
+        -------
+        
+        HTTPException
+            Editing the welcome screen failed somehow.
+        Forbidden
+            You don't have permissions to edit the welcome screen.
+        NotFound
+            This welcome screen does not exist.
+        
+        Returns
+        --------
+        
+        :class:`WelcomeScreen`
+            The edited welcome screen.
+        """
+        
+        welcome_channels = options.get('welcome_channels', [])
+        welcome_channels_data = []
+       
+        for channel in welcome_channels:
+            if not isinstance(channel, WelcomeScreenChannel):
+                raise TypeError('welcome_channels parameter must be a list of WelcomeScreenChannel.')
+                
+            welcome_channels_data.append(channel.to_dict())
+            
+        options['welcome_channels'] = welcome_channels_data
+
+        if options:
+            new = await self._state.http.edit_welcome_screen(self.id, options, reason=options.get('reason'))
+            return WelcomeScreen(data=new, guild=self)
+        

discord/http.py

@@ -1490,6 +1490,22 @@ def delete_channel_permissions(
     ) -> Response[None]:
         r = Route('DELETE', '/channels/{channel_id}/permissions/{target}', channel_id=channel_id, target=target)
         return self.request(r, reason=reason)
+    
+    # Welcome Screen
+    
+    def get_welcome_screen(self, guild_id: Snowflake) -> Response[welcome_screen.WelcomeScreen]:
+        return self.request(Route('GET', '/guilds/{guild_id}/welcome-screen', guild_id=guild_id))
+
+    def edit_welcome_screen(self, guild_id: Snowflake, payload: Any, *, reason: Optional[str] = None) -> Response[welcome_screen.WelcomeScreen]:
+        keys = (
+            'description',
+            'welcome_channels',
+            'enabled',
+        )
+        payload = {
+            key: val for key, val in payload.items() if key in keys
+        }
+        return self.request(Route('PATCH', '/guilds/{guild_id}/welcome-screen', guild_id=guild_id), json=payload, reason=reason)
 
     # Voice management
 

discord/raw_models.py

@@ -26,6 +26,8 @@
 
 from typing import TYPE_CHECKING, Optional, Set, List
 
+from .enums import ChannelType, try_enum
+
 if TYPE_CHECKING:
     from .types.raw_models import (
         MessageDeleteEvent,
@@ -34,11 +36,14 @@
         MessageUpdateEvent,
         ReactionClearEvent,
         ReactionClearEmojiEvent,
-        IntegrationDeleteEvent
+        IntegrationDeleteEvent,
+        ThreadDeleteEvent,
     )
     from .message import Message
     from .partial_emoji import PartialEmoji
     from .member import Member
+    from .threads import Thread
+
 
 
 __all__ = (
@@ -49,6 +54,7 @@
     'RawReactionClearEvent',
     'RawReactionClearEmojiEvent',
     'RawIntegrationDeleteEvent',
+    'RawThreadDeleteEvent',
 )
 
 
@@ -276,3 +282,33 @@ def __init__(self, data: IntegrationDeleteEvent) -> None:
             self.application_id: Optional[int] = int(data['application_id'])
         except KeyError:
             self.application_id: Optional[int] = None
+
+class RawThreadDeleteEvent(_RawReprMixin):
+    """Represents the payload for :func:`on_raw_thread_delete` event.
+
+    .. versionadded:: 2.0
+    
+    Attributes
+    ----------
+
+    thread_id: :class:`int`
+        The ID of the thread that was deleted.
+    thread_type: :class:`discord.ChannelType`
+        The channel type of the deleted thread.
+    guild_id: :class:`int`
+        The ID of the guild the deleted thread belonged to.
+    parent_id: :class:`int`
+        The ID of the channel the thread belonged to.
+    thread: Optional[:class:`discord.Thread`]
+        The thread that was deleted. This may be ``None`` if deleted thread is not found in internal cache.
+    """
+    __slots__ = ('thread_id', 'thread_type', 'guild_id', 'parent_id', 'thread')
+
+    def __init__(self, data: ThreadDeleteEvent) -> None:
+        self.thread_id: int = int(data['id'])
+        self.thread_type: ChannelType = try_enum(ChannelType, int(data['type']))
+        self.guild_id: int = int(data['guild_id'])
+        self.parent_id: int = int(data['parent_id'])
+        self.thread: Optional[Thread] = None
+
+