Merge remote-tracking branch 'origin/developer' into oauth2

# Conflicts:
#	discord/application_commands.py
#	docs/index.rst
#	images/flag_ua.png

Author: mccoderpy

discord/application_commands.py

@@ -75,9 +75,7 @@
     'GuildOnlySubCommand',
     'UserCommand',
     'MessageCommand',
-    'generate_options',
-    'GuildAppCommandPermissions',
-    'AppCommandPermission'
+    'generate_options'
 )
 
 api_docs = 'https://discord.com/developers/docs'
@@ -129,7 +127,8 @@ class Localizations:
 
     """
 
-    __slots__ = tuple([locale_name for locale_name in getattr(Locale, '_enum_member_map_')] + ['__languages_dict__'])  # type: ignore
+    __slots__ = tuple([locale_name for locale_name in Locale._enum_member_map_] + ['__languages_dict__']
+                      )  # type: ignore
 
     def __init__(self, **localizations) -> None:
 

discord/channel.py

@@ -1501,7 +1501,7 @@ async def edit(self, *, reason=None, **options):
         await self._edit(options, reason=reason)
 
 
-class StageChannel(VocalGuildChannel):
+class StageChannel(VocalGuildChannel, abc.Messageable):
     """Represents a Discord guild stage channel.
 
     .. versionadded:: 1.7
@@ -1547,7 +1547,7 @@ class StageChannel(VocalGuildChannel):
         The region for the stage channel's voice communication.
         A value of ``None`` indicates automatic voice region detection.
     """
-    __slots__ = ('topic',)
+    __slots__ = ('topic', 'last_message_id')
 
     def __repr__(self):
         attrs = [
@@ -1561,15 +1561,18 @@ def __repr__(self):
             ('category_id', self.category_id)
         ]
         return '<%s %s>' % (self.__class__.__name__, ' '.join('%s=%r' % t for t in attrs))
-
+    
     def _update(self, guild, data):
         super()._update(guild, data)
         self.topic = data.get('topic')
 
     @staticmethod
     def channel_type():
         return ChannelType.stage_voice
-
+    
+    async def _get_channel(self):
+        return self
+    
     @property
     def requesting_to_speak(self):
         """List[:class:`Member`]: A list of members who are requesting to speak in the stage channel."""
@@ -1629,6 +1632,7 @@ async def edit(self, *, reason=None, **options):
 
         await self._edit(options, reason=reason)
 
+
 class CategoryChannel(abc.GuildChannel, Hashable):
     """Represents a Discord channel category.
 

discord/enums.py

@@ -634,7 +634,14 @@ class MessageType(Enum):
     guild_invite_reminder                        = 22
     context_menu_command                         = 23
     automoderation_action                        = 24
-
+    role_subscription_purchase                   = 25
+    interaction_premium_upsell                   = 26
+    stage_start                                  = 27
+    stage_end                                    = 28
+    stage_speaker_change                         = 29
+    stage_raise_hand                             = 30
+    stage_topic_change                           = 31
+    guild_application_premium_subscription       = 32
 
 
 class VoiceRegion(Enum):

docs/api.rst

@@ -1183,6 +1183,82 @@ of :class:`enum.Enum`.
         Discovery requirements for 3 weeks in a row.
 
         .. versionadded:: 1.7
+    .. attribute:: thread_created
+
+        The system message denoting that a thread has been created.
+
+        .. versionadded:: 2.0
+    .. attribute:: reply
+
+        A message that is a reply to another message.
+
+        .. versionadded:: 2.0
+    .. attribute::  chat_input_command
+
+        A message that is a slash command.
+
+        .. versionadded:: 2.0
+    .. attribute::  thread_starter_message
+
+        A message that is the first message in a thread.
+
+        .. versionadded:: 2.0
+    .. attribute:: guild_invite_reminder
+
+        The system message denoting that a guild invite reminder has been sent.
+
+        .. versionadded:: 2.0
+    .. attribute:: context_menu_command
+
+        A message that is a context menu command.
+
+        .. versionadded:: 2.0
+    .. attribute:: automoderation_action
+
+        A log message from discords auto moderation system.
+
+        .. versionadded:: 2.0
+    .. attribute:: role_subscription_purchase
+
+        A message informing about a role subscription purchase.
+
+        .. versionadded:: 2.0
+    .. attribute:: interaction_premium_upsell
+
+        A message informing about a premium upsell.
+
+        .. versionadded:: 2.0
+    .. attribute:: stage_start
+
+        A message informing about a stage starting.
+
+        .. versionadded:: 2.0
+    .. attribute:: stage_end
+
+        A message informing about a stage ending.
+
+        .. versionadded:: 2.0
+    .. attribute:: stage_speaker_change
+
+        A message informing about a stage having a new speaker.
+
+        .. versionadded:: 2.0
+    .. attribute:: stage_raise_hand
+
+        A message informing about someone raising their hand in a stage.
+
+        .. versionadded:: 2.0
+    .. attribute:: stage_topic_change
+
+        A message informing about the topic of a stage been changed.
+
+        .. versionadded:: 2.0
+    .. attribute:: guild_application_premium_subscription
+
+        The system message denoting that a member has subscribed to a guild application.
+
+        .. versionadded:: 2.4
+
 
 .. class:: ComponentType