Merge pull request #1591 from Pycord-Development/merge-conflicts

merge 2.1 changes

Author: BobDotCom

.github/ISSUE_TEMPLATE/vulnerability_report.yml

@@ -10,5 +10,5 @@
 ## Reporting a Vulnerability
 
 If you find a vulnerability you have two ways to report it:
-- Write us on https://pycord.dev/discord
-- Open an [issue](https://github.com/Pycord-Development/pycord/issues/new/choose)
+- Write a dm to one of our core developers on https://pycord.dev/discord
+- Write an email to admin@pycord.dev

.github/SECURITY.md

@@ -7,5 +7,5 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
-      - run: pip install codespell
-      - run: codespell --ignore-words-list="groupt,nd,ot"
+      - run: pip install codespell==2.1.0
+      - run: codespell --ignore-words-list="groupt,nd,ot,ro,falsy,BU" --exclude-file=".github/workflows/codespell.yml"

.github/workflows/codespell.yml

@@ -13,7 +13,8 @@
 __author__ = "Pycord Development"
 __license__ = "MIT"
 __copyright__ = "Copyright 2015-2021 Rapptz & Copyright 2021-present Pycord Development"
-__version__ = "2.0.1"
+__version__ = "2.1.0"
+
 
 __path__ = __import__("pkgutil").extend_path(__path__, __name__)
 
@@ -25,6 +26,7 @@
 from .appinfo import *
 from .asset import *
 from .audit_logs import *
+from .automod import *
 from .bot import *
 from .channel import *
 from .client import *
@@ -75,6 +77,7 @@ class VersionInfo(NamedTuple):
     serial: int
 
 
-version_info: VersionInfo = VersionInfo(major=2, minor=0, micro=1, releaselevel="final", serial=0)
+version_info: VersionInfo = VersionInfo(major=2, minor=1, micro=0, releaselevel="final", serial=0)
+
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())

discord/__init__.py

@@ -175,14 +175,6 @@ async def _purge_messages_helper(
     return ret
 
 
-class _Undefined:
-    def __repr__(self) -> str:
-        return "see-below"
-
-
-_undefined: Any = _Undefined()
-
-
 @runtime_checkable
 class Snowflake(Protocol):
     """An ABC that details the common operations on a Discord model.
@@ -382,7 +374,7 @@ async def _move(
         payload = []
         for index, c in enumerate(channels):
             d: Dict[str, Any] = {"id": c.id, "position": index}
-            if parent_id is not _undefined and c.id == self.id:
+            if parent_id is not MISSING and c.id == self.id:
                 d.update(parent_id=parent_id, lock_permissions=lock_permissions)
             payload.append(d)
 
@@ -392,7 +384,7 @@ async def _edit(self, options: Dict[str, Any], reason: Optional[str]) -> Optiona
         try:
             parent = options.pop("category")
         except KeyError:
-            parent_id = _undefined
+            parent_id = MISSING
         else:
             parent_id = parent and parent.id
 
@@ -420,7 +412,7 @@ async def _edit(self, options: Dict[str, Any], reason: Optional[str]) -> Optiona
         try:
             position = options.pop("position")
         except KeyError:
-            if parent_id is not _undefined:
+            if parent_id is not MISSING:
                 if lock_permissions:
                     category = self.guild.get_channel(parent_id)
                     if category:
@@ -603,7 +595,7 @@ def category(self) -> Optional[CategoryChannel]:
 
     @property
     def permissions_synced(self) -> bool:
-        """:class:`bool`: Whether or not the permissions for this channel are synced with the
+        """:class:`bool`: Whether the permissions for this channel are synced with the
         category it belongs to.
 
         If there is no category then this is ``False``.
@@ -658,7 +650,7 @@ def permissions_for(self, obj: Union[Member, Role], /) -> Permissions:
         # (or otherwise) are then OR'd together.
         # After the role permissions are resolved, the member permissions
         # have to take into effect.
-        # After all that is done.. you have to do the following:
+        # After all that is done, you have to do the following:
 
         # If manage permissions is True, then all permissions are set to True.
 
@@ -781,7 +773,7 @@ async def set_permissions(
         self,
         target: Union[Member, Role],
         *,
-        overwrite: Optional[Union[PermissionOverwrite, _Undefined]] = ...,
+        overwrite: Optional[PermissionOverwrite] = ...,
         reason: Optional[str] = ...,
     ) -> None:
         ...
@@ -796,7 +788,7 @@ async def set_permissions(
     ) -> None:
         ...
 
-    async def set_permissions(self, target, *, overwrite=_undefined, reason=None, **permissions):
+    async def set_permissions(self, target, *, overwrite=MISSING, reason=None, **permissions):
         r"""|coro|
 
         Sets the channel specific permission overwrites for a target in the
@@ -874,7 +866,7 @@ async def set_permissions(self, target, *, overwrite=_undefined, reason=None, **
         else:
             raise InvalidArgument("target parameter must be either Member or Role")
 
-        if overwrite is _undefined:
+        if overwrite is MISSING:
             if len(permissions) == 0:
                 raise InvalidArgument("No overwrite provided.")
             try:
@@ -1046,7 +1038,7 @@ async def move(self, **kwargs) -> None:
         Raises
         -------
         InvalidArgument
-            An invalid position was given or a bad mix of arguments were passed.
+            An invalid position was given or a bad mix of arguments was passed.
         Forbidden
             You do not have permissions to move the channel.
         HTTPException
@@ -1152,20 +1144,22 @@ async def create_invite(
             .. versionadded:: 2.0
 
         target_user: Optional[:class:`User`]
-            The user whose stream to display for this invite, required if `target_type` is `TargetType.stream`. The user must be streaming in the channel.
+            The user whose stream to display for this invite, required if `target_type` is `TargetType.stream`.
+            The user must be streaming in the channel.
 
             .. versionadded:: 2.0
 
         target_application_id: Optional[:class:`int`]
-            The id of the embedded application for the invite, required if `target_type` is `TargetType.embedded_application`.
+            The id of the embedded application for the invite, required if `target_type` is
+            `TargetType.embedded_application`.
 
             .. versionadded:: 2.0
 
-        target_event: Optional[:class:`ScheduledEvent`]
+        target_event: Optional[:class:`.ScheduledEvent`]
             The scheduled event object to link to the event.
-            Shortcut to :meth:`Invite.set_scheduled_event`
+            Shortcut to :meth:`.Invite.set_scheduled_event`
 
-            See :meth:`Invite.set_scheduled_event` for more
+            See :meth:`.Invite.set_scheduled_event` for more
             info on event invite linking.
 
             .. versionadded:: 2.0
@@ -1383,11 +1377,13 @@ async def send(
 
             .. versionadded:: 1.4
 
-        reference: Union[:class:`~discord.Message`, :class:`~discord.MessageReference`, :class:`~discord.PartialMessage`]
+        reference: Union[:class:`~discord.Message`, :class:`~discord.MessageReference`,
+        :class:`~discord.PartialMessage`]
             A reference to the :class:`~discord.Message` to which you are replying, this can be created using
             :meth:`~discord.Message.to_reference` or passed directly as a :class:`~discord.Message`. You can control
-            whether this mentions the author of the referenced message using the :attr:`~discord.AllowedMentions.replied_user`
-            attribute of ``allowed_mentions`` or by setting ``mention_author``.
+            whether this mentions the author of the referenced message using the
+            :attr:`~discord.AllowedMentions.replied_user` attribute of ``allowed_mentions`` or by
+            setting ``mention_author``.
 
             .. versionadded:: 1.6
 
@@ -1732,7 +1728,7 @@ def history(
             If a datetime is provided, it is recommended to use a UTC aware datetime.
             If the datetime is naive, it is assumed to be local time.
             When using this argument, the maximum limit is 101. Note that if the limit is an
-            even number then this will return at most limit + 1 messages.
+            even number, then this will return at most limit + 1 messages.
         oldest_first: Optional[:class:`bool`]
             If set to ``True``, return messages in oldest->newest order. Defaults to ``True`` if
             ``after`` is specified, otherwise ``False``.

discord/abc.py

@@ -97,7 +97,6 @@
     from .types.activity import Activity as ActivityPayload
     from .types.activity import (
         ActivityAssets,
-        ActivityButton,
         ActivityParty,
         ActivityTimestamps,
     )
@@ -166,15 +165,15 @@ class Activity(BaseActivity):
         The user's current state. For example, "In Game".
     details: Optional[:class:`str`]
         The detail of the user's current activity.
-    timestamps: :class:`dict`
+    timestamps: Dict[:class:`str`, :class:`int`]
         A dictionary of timestamps. It contains the following optional keys:
 
         - ``start``: Corresponds to when the user started doing the
           activity in milliseconds since Unix epoch.
         - ``end``: Corresponds to when the user will finish doing the
           activity in milliseconds since Unix epoch.
 
-    assets: :class:`dict`
+    assets: Dict[:class:`str`, :class:`str`]
         A dictionary representing the images and their hover text of an activity.
         It contains the following optional keys:
 
@@ -183,12 +182,12 @@ class Activity(BaseActivity):
         - ``small_image``: A string representing the ID for the small image asset.
         - ``small_text``: A string representing the text when hovering over the small image asset.
 
-    party: :class:`dict`
+    party: Dict[:class:`str`, Union[:class:`str`, List[:class:`int`]]]
         A dictionary representing the activity party. It contains the following optional keys:
 
         - ``id``: A string representing the party ID.
         - ``size``: A list of up to two integer elements denoting (current_size, maximum_size).
-    buttons: Union[List[:class:`dict`], List[:class:`str`]]
+    buttons: Union[List[Dict[:class:`str`, :class:`str`]], List[:class:`str`]]
         A list of dictionaries representing custom buttons shown in a rich presence.
         Each dictionary contains the following keys:
 
@@ -197,7 +196,7 @@ class Activity(BaseActivity):
 
         .. note::
 
-            Bots cannot access a user's activity button URLs. Therefore the type of this attribute
+            Bots cannot access a user's activity button URLs. Therefore, the type of this attribute
             will be List[:class:`str`] when received through the gateway.
 
         .. versionadded:: 2.0
@@ -475,8 +474,8 @@ class Streaming(BaseActivity):
 
     url: :class:`str`
         The stream's URL.
-    assets: :class:`dict`
-        A dictionary comprising of similar keys than those in :attr:`Activity.assets`.
+    assets: Dict[:class:`str`, :class:`str`]
+        A dictionary comprised of similar keys than those in :attr:`Activity.assets`.
     """
 
     __slots__ = ("platform", "name", "game", "url", "details", "assets")
@@ -509,7 +508,7 @@ def twitch_name(self):
         """Optional[:class:`str`]: If provided, the twitch name of the user streaming.
 
         This corresponds to the ``large_image`` key of the :attr:`Streaming.assets`
-        dictionary if it starts with ``twitch:``. Typically set by the Discord client.
+        dictionary if it starts with ``twitch:``. Typically this is set by the Discord client.
         """
 
         try:

discord/activity.py

@@ -67,7 +67,7 @@ class AppInfo:
         Whether the bot can be invited by anyone or if it is locked
         to the application owner.
     bot_require_code_grant: :class:`bool`
-        Whether the bot requires the completion of the full oauth2 code
+        Whether the bot requires the completion of the full OAuth2 code
         grant flow to join.
     rpc_origins: Optional[List[:class:`str`]]
         A list of RPC origin URLs, if RPC is enabled.
@@ -188,7 +188,7 @@ def cover_image(self) -> Optional[Asset]:
     @property
     def guild(self) -> Optional[Guild]:
         """Optional[:class:`Guild`]: If this application is a game sold on Discord,
-        this field will be the guild to which it has been linked
+        this field will be the guild to which it has been linked.
 
         .. versionadded:: 1.3
         """

discord/appinfo.py

@@ -412,7 +412,7 @@ class AuditLogEntry(Hashable):
         The reason this action was done.
     extra: Any
         Extra information that this entry has that might be useful.
-        For most actions, this is ``None``. However in some cases it
+        For most actions, this is ``None``. However, in some cases it
         contains extra information. See :class:`AuditLogAction` for
         which actions have this field filled out.
     """

discord/audit_logs.py

@@ -70,9 +70,11 @@ class AutoModActionMetadata:
     Attributes
     -----------
     channel_id: :class:`int`
-        The ID of the channel to send the message to. Only for actions of type :attr:`AutoModActionType.send_alert_message`.
+        The ID of the channel to send the message to.
+        Only for actions of type :attr:`AutoModActionType.send_alert_message`.
     timeout_duration: :class:`datetime.timedelta`
-        How long the member that triggered the action should be timed out for. Only for actions of type :attr:`AutoModActionType.timeout`.
+        How long the member that triggered the action should be timed out for.
+        Only for actions of type :attr:`AutoModActionType.timeout`.
     """
     # maybe add a table of action types and attributes?
 
@@ -124,7 +126,6 @@ def __repr__(self) -> str:
         return f"<AutoModActionMetadata {inner}>"
 
 
-
 class AutoModAction:
     """Represents an action for a guild's auto moderation rule.
     
@@ -200,7 +201,7 @@ def to_dict(self) -> Dict:
         return data
 
     @classmethod
-    def from_dict(cls, data: AutoModActionMetadataPayload):
+    def from_dict(cls, data: AutoModTriggerMetadataPayload):
         kwargs = {}
 
         if (keyword_filter := data.get("keyword_filter")) is not None:
@@ -339,8 +340,8 @@ def exempt_roles(self) -> List[Union[Role, Object]]:
 
     @cached_property
     def exempt_channels(self) -> List[Union[Union[TextChannel, ForumChannel, VoiceChannel], Object]]:
-        """List[Union[Union[:class:`TextChannel`, :class:`ForumChannel`, :class:`VoiceChannel`], :class:`Object`]]: The channels 
-        that are exempt from this rule.
+        """List[Union[Union[:class:`TextChannel`, :class:`ForumChannel`, :class:`VoiceChannel`], :class:`Object`]]:
+        The channels that are exempt from this rule.
        
         If a channel is not found in the guild's cache, 
         then it will be returned as an :class:`Object`.