Merge branch 'master' into unittest

Author: BobDotCom

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,3 +20,4 @@
 - [ ] If code changes were made then they have been tested.
   - [ ] I have updated the documentation to reflect the changes.
 - [ ] If `type: ignore` comments were used, a comment is also left explaining why.
+- [ ] I have updated the changelog to include these changes.

.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/PyCQA/autoflake
-    rev: v2.0.0
+    rev: v2.0.2
     hooks:
       - id: autoflake
   #        args:
@@ -23,14 +23,13 @@ repos:
       - id: pyupgrade
         args: [--py38-plus]
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.3.0
     hooks:
       - id: black
-        # See https://github.com/psf/black/issues/2188#issuecomment-1289317647 for why we can't use the --preview flag.
         args: [--safe, --quiet]
   - repo: https://github.com/Pierre-Sassoulas/black-disable-checker
     rev: v1.1.3
@@ -77,7 +76,7 @@ repos:
   #      - id: mypy
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.4
+    rev: v3.0.0-alpha.6
     hooks:
       - id: prettier
         args: [--prose-wrap=always, --print-width=88]

CHANGELOG.md

@@ -12,34 +12,116 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Added
 
+- Added new events `on_bridge_command`, `on_bridge_command_completion`, and
+  `on_bridge_command_error`.
+  ([#1916](https://github.com/Pycord-Development/pycord/pull/1916))
+- Added the `@client.once()` decorator, which serves as a one-time event listener.
+  ([#1940](https://github.com/Pycord-Development/pycord/pull/1940))
+- Added support for text-related features in `StageChannel`.
+  ([#1936](https://github.com/Pycord-Development/pycord/pull/1936))
+- Added support for one-time event listeners in `@client.listen()`.
+  ([#1957](https://github.com/Pycord-Development/pycord/pull/1957))
+- Added `current_page` argument to Paginator.update().
+  ([#1983](https://github.com/Pycord-Development/pycord/pull/1983))
+- Added new `application_auto_moderation_rule_create_badge` to `ApplicationFlags`.
+  ([#1992](https://github.com/Pycord-Development/pycord/pull/1992))
+
+### Changed
+
+- Changed file-upload size limit from 8 MB to 25 MB accordingly.
+  ([#2014](https://github.com/Pycord-Development/pycord/pull/2014))
+
+### Removed
+
+- Removed `@client.once()` in favour of `@client.listen(once=True)`.
+  ([#1957](https://github.com/Pycord-Development/pycord/pull/1957))
+
+### Fixed
+
+- Fixed `AttributeError` caused by
+  [#1957](https://github.com/Pycord-Development/pycord/pull/1957) when using listeners
+  in cogs. ([#1989](https://github.com/Pycord-Development/pycord/pull/1989))
+- Fixed `None` being handled incorrectly for avatar in `ClientUser.edit`.
+  ([#1994](https://github.com/Pycord-Development/pycord/pull/1994))
+- Fixed scheduled events breaking when changing the location from external to a channel.
+  ([#1998](https://github.com/Pycord-Development/pycord/pull/1998))
+- Fixed boolean converter breaking for bridge commands. Fix bridge command Options not
+  working. ([#1999](https://github.com/Pycord-Development/pycord/pull/1999))
+- Fixed `TypeError` being raised when passing `name` argument to bridge groups.
+  ([#2000](https://github.com/Pycord-Development/pycord/pull/2000))
+
+## [2.4.1] - 2023-03-20
+
+### Changed
+
+- Updated the values of the `Color.embed_background()` classmethod to correspond with
+  new theme colors in the app.
+  ([#1931](https://github.com/Pycord-Development/pycord/pull/1931))
+
+### Fixed
+
+- Fixed the type-hinting of `SlashCommandGroup.walk_commands()` to reflect actual
+  behavior. ([#1838](https://github.com/Pycord-Development/pycord/pull/1838))
+- Fixed the voice ip discovery due to the recent
+  [announced change](https://discord.com/channels/613425648685547541/697138785317814292/1080623873629884486).
+  ([#1955](https://github.com/Pycord-Development/pycord/pull/1955))
+- Fixed `reason` being passed to wrong method in `guild.create_auto_moderation_rule`.
+  ([#1960](https://github.com/Pycord-Development/pycord/pull/1960))
+
+## [2.4.0] - 2023-02-10
+
+### Added
+
 - Added new AutoMod trigger metadata properties `regex_patterns`, `allow_list`, and
   `mention_total_limit`; and added the `mention_spam` trigger type.
   ([#1809](https://github.com/Pycord-Development/pycord/pull/1809))
 - Added missing `image` parameter to `Guild.create_scheduled_event()` method.
   ([#1831](https://github.com/Pycord-Development/pycord/pull/1831))
-- Added new message types, `interaction_premium_upsell`, `stage_start`, `stage_end`,
-  `stage_speaker`, `stage_raise_hand`, `stage_topic`, and
+- New `ApplicationRoleConnectionMetadata` class for application role connection
+  metadata, along with the `fetch_role_connection_metadata_records` and
+  `update_role_connection_metadata_records` methods in `Client`.
+  ([#1791](https://github.com/Pycord-Development/pycord/pull/1791))
+- Added new message types, `role_subscription_purchase`, `interaction_premium_upsell`,
+  `stage_start`, `stage_end`, `stage_speaker`, `stage_raise_hand`, `stage_topic`, and
   `guild_application_premium_subscription`.
   ([#1852](https://github.com/Pycord-Development/pycord/pull/1852))
 - Added new `EmbeddedActivity` values.
   ([#1859](https://github.com/Pycord-Development/pycord/pull/1859))
+- Added new `suppress_notifications` to `MessageFlags`.
+  ([#1912](https://github.com/Pycord-Development/pycord/pull/1912))
+- Added GIF sticker format type to the `StickerFormatType` enum.
+  ([#1915](https://github.com/Pycord-Development/pycord/pull/1915))
+- Added new raw events: `raw_member_remove`, `raw_thread_update`, and
+  `raw_thread_member_remove`.
+  ([#1880](https://github.com/Pycord-Development/pycord/pull/1880))
+- Improved support for setting channel types & added new channel types for
+  `discord.Option`. ([#1883](https://github.com/Pycord-Development/pycord/pull/1883))
 
 ### Changed
 
 - Changed `EmbeddedActivity` values to update accordingly with the new activities.
   ([#1859](https://github.com/Pycord-Development/pycord/pull/1859))
+- Advanced version info is now stored as a dict in `version_info.advanced` instead of
+  attributes on the `version_info` object.
+  ([#1920](https://github.com/Pycord-Development/pycord/pull/1920))
+- The `version_info.release_level` attribute has been reverted to its previous name,
+  `releaselevel`. ([#1920](https://github.com/Pycord-Development/pycord/pull/1920))
 
 ### Fixed
 
-- Fixed a bug in `Page.update_files` where file objects stored in memory were causing an
-  `AttributeError`. ([#1869](https://github.com/Pycord-Development/pycord/pull/1869))
-
-## [2.3.2] - 2022-12-03
-
-### Fixed
-
+- Fixed bugs in `Page.update_files` where file objects stored in memory were causing an
+  `AttributeError`, and `io.BytesIO` files didn't send properly more than once.
+  ([#1869](https://github.com/Pycord-Development/pycord/pull/1869) &
+  [#1881](https://github.com/Pycord-Development/pycord/pull/1881))
 - Fixed bridge groups missing the `parent` attribute.
   ([#1823](https://github.com/Pycord-Development/pycord/pull/1823))
+- Fixed issues with creating auto moderation rules.
+  ([#1822](https://github.com/Pycord-Development/pycord/pull/1822))
+
+## [2.3.3] - 2023-02-10
+
+- Fixed an unhandled `KeyError` exception when receiving GIF stickers, causing crashes.
+  ([#1915](https://github.com/Pycord-Development/pycord/pull/1915))
 
 ## [2.3.2] - 2022-12-03
 
@@ -99,6 +181,7 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#1678](https://github.com/Pycord-Development/pycord/pull/1678))
 - `get_application_command()` now supports retrieving subcommands and subcommand groups.
   ([#1678](https://github.com/Pycord-Development/pycord/pull/1678))
+-
 
 ### Removed
 
@@ -494,7 +577,10 @@ These changes are available on the `master` branch, but have not yet been releas
 - Fix py3.10 UnionType checks issue.
   ([#1240](https://github.com/Pycord-Development/pycord/pull/1240))
 
-[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.3.2...HEAD
+[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.4.1...HEAD
+[2.4.1]: https://github.com/Pycord-Development/pycord/compare/v2.4.0...v2.4.1
+[2.4.0]: https://github.com/Pycord-Development/pycord/compare/v2.3.3...v2.4.0
+[2.3.3]: https://github.com/Pycord-Development/pycord/compare/v2.3.2...v2.3.3
 [2.3.2]: https://github.com/Pycord-Development/pycord/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/Pycord-Development/pycord/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/Pycord-Development/pycord/compare/v2.2.2...v2.3.0

discord/__init__.py

@@ -27,6 +27,7 @@
 from . import abc, opus, sinks, ui, utils
 from .activity import *
 from .appinfo import *
+from .application_role_connection import *
 from .asset import *
 from .audit_logs import *
 from .automod import *

discord/_version.py

@@ -24,11 +24,13 @@
 """
 from __future__ import annotations
 
+import datetime
 import re
 import warnings
-from datetime import date
 from importlib.metadata import PackageNotFoundError, version
 
+from ._typed_dict import TypedDict
+
 __all__ = ("__version__", "VersionInfo", "version_info")
 
 from typing import Literal, NamedTuple
@@ -47,27 +49,63 @@
         # setuptools_scm is not installed
         __version__ = "0.0.0"
         warnings.warn(
-            "Package is not installed, and setuptools_scm is not installed. "
-            f"As a fallback, {__name__}.__version__ will be set to {__version__}",
+            (
+                "Package is not installed, and setuptools_scm is not installed. "
+                f"As a fallback, {__name__}.__version__ will be set to {__version__}"
+            ),
             RuntimeWarning,
             stacklevel=2,
         )
 
 
+class AdvancedVersionInfo(TypedDict):
+    serial: int
+    build: int | None
+    commit: str | None
+    date: datetime.date | None
+
+
 class VersionInfo(NamedTuple):
     major: int
     minor: int
     micro: int
-    release_level: Literal["alpha", "beta", "candidate", "final"]
-    serial: int
-    build: int | None = None
-    commit: str | None = None
-    date: date | None = None
+    releaselevel: Literal["alpha", "beta", "candidate", "final"]
+
+    # We can't set instance attributes on a NamedTuple, so we have to use a
+    # global variable to store the advanced version info.
+    @property
+    def advanced(self) -> AdvancedVersionInfo:
+        return _advanced
+
+    @advanced.setter
+    def advanced(self, value: object) -> None:
+        global _advanced
+        _advanced = value
+
+    @property
+    @deprecated("releaselevel", "2.4")
+    def release_level(self) -> Literal["alpha", "beta", "candidate", "final"]:
+        return self.releaselevel
 
     @property
-    @deprecated("release_level", "2.3")
-    def releaselevel(self) -> Literal["alpha", "beta", "candidate", "final"]:
-        return self.release_level
+    @deprecated('.advanced["serial"]', "2.4")
+    def serial(self) -> int:
+        return self.advanced["serial"]
+
+    @property
+    @deprecated('.advanced["build"]', "2.4")
+    def build(self) -> int | None:
+        return self.advanced["build"]
+
+    @property
+    @deprecated('.advanced["commit"]', "2.4")
+    def commit(self) -> str | None:
+        return self.advanced["commit"]
+
+    @property
+    @deprecated('.advanced["date"]', "2.4")
+    def date(self) -> datetime.date | None:
+        return self.advanced["date"]
 
 
 version_regex = re.compile(
@@ -95,7 +133,7 @@ def releaselevel(self) -> Literal["alpha", "beta", "candidate", "final"]:
     raise RuntimeError("Invalid release level")
 
 if (raw_date := raw_info["date"] or raw_info["date1"]) is not None:
-    date_info = date(
+    date_info = datetime.date(
         int(raw_date[:4]),
         int(raw_date[4:6]),
         int(raw_date[6:]),
@@ -107,7 +145,10 @@ def releaselevel(self) -> Literal["alpha", "beta", "candidate", "final"]:
     major=int(raw_info["major"] or 0) or None,
     minor=int(raw_info["minor"] or 0) or None,
     micro=int(raw_info["patch"] or 0) or None,
-    release_level=level_info,
+    releaselevel=level_info,
+)
+
+_advanced = AdvancedVersionInfo(
     serial=raw_info["serial"],
     build=int(raw_info["build"] or 0) or None,
     commit=raw_info["commit"],