Merge branch 'master' into unittest

Author: BobDotCom

.pre-commit-config.yaml

@@ -3,12 +3,12 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
   - repo: https://github.com/PyCQA/autoflake
-    rev: v1.7.7
+    rev: v2.0.0
     hooks:
       - id: autoflake
   #        args:

CHANGELOG.md

@@ -10,6 +10,17 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
+_No changes yet_
+
+## [2.3.1] - 2022-11-27
+
+### Fixed
+
+- Fixed `AttributeError` relating to the new `bridge_commands` attribute on
+  `ext.bridge.Bot`. ([#1802](https://github.com/Pycord-Development/pycord/pull/1802))
+
+## [2.3.0] - 2022-11-23
+
 ### Added
 
 - New brief Attribute to BridgeSlashCommand.
@@ -28,6 +39,8 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#1636](https://github.com/Pycord-Development/pycord/pull/1636))
 - Added `bridge_commands` attribute to `ext.bridge.Bot` for access to bridge command
   objects. ([#1787](https://github.com/Pycord-Development/pycord/pull/1787))
+- Updated `Guild.features` to include new and previously missing features.
+  ([#1788](https://github.com/Pycord-Development/pycord/pull/1788))
 
 ### Fixed
 
@@ -441,7 +454,9 @@ 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.2.2...HEAD
+[unreleased]: https://github.com/Pycord-Development/pycord/compare/v2.3.1...HEAD
+[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
 [2.2.2]: https://github.com/Pycord-Development/pycord/compare/v2.2.1...v2.2.2
 [2.2.1]: https://github.com/Pycord-Development/pycord/compare/v2.2.0...v2.2.1
 [2.2.0]: https://github.com/Pycord-Development/pycord/compare/v2.1.3...v2.2.0

discord/cog.py

@@ -199,6 +199,7 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
                     commands[f"ext_{elem}"] = value.ext_variant
                     commands[f"app_{elem}"] = value.slash_variant
+                    commands[elem] = value
                     for cmd in getattr(value, "subcommands", []):
                         commands[
                             f"ext_{cmd.ext_variant.qualified_name}"
@@ -229,9 +230,13 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
         # Either update the command with the cog provided defaults or copy it.
         # r.e type ignore, type-checker complains about overriding a ClassVar
-        new_cls.__cog_commands__ = tuple(c._update_copy(cmd_attrs) for c in new_cls.__cog_commands__)  # type: ignore
+        new_cls.__cog_commands__ = tuple(c._update_copy(cmd_attrs) if not hasattr(c, "add_to") else c for c in new_cls.__cog_commands__)  # type: ignore
 
-        name_filter = lambda c: "app" if isinstance(c, ApplicationCommand) else "ext"
+        name_filter = (
+            lambda c: "app"
+            if isinstance(c, ApplicationCommand)
+            else ("bridge" if not hasattr(c, "add_to") else "ext")
+        )
 
         lookup = {
             f"{name_filter(cmd)}_{cmd.qualified_name}": cmd
@@ -247,7 +252,9 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
             ):
                 command.guild_ids = new_cls.__cog_guild_ids__
 
-            if not isinstance(command, SlashCommandGroup):
+            if not isinstance(command, SlashCommandGroup) and not hasattr(
+                command, "add_to"
+            ):
                 # ignore bridge commands
                 cmd = getattr(new_cls, command.callback.__name__, None)
                 if hasattr(cmd, "add_to"):
@@ -534,6 +541,10 @@ def _inject(self: CogT, bot) -> CogT:
         # we've added so far for some form of atomic loading.
 
         for index, command in enumerate(self.__cog_commands__):
+            if hasattr(command, "add_to"):
+                bot._bridge_commands.append(command)
+                continue
+
             command._set_cog(self)
 
             if isinstance(command, ApplicationCommand):

discord/ext/bridge/bot.py

@@ -44,7 +44,7 @@ class BotBase(ABC):
     def bridge_commands(self) -> list[BridgeCommand | BridgeCommandGroup]:
         """Returns all of the bot's bridge commands."""
 
-        if cmds := getattr(self, "_bridge_commands", []):
+        if not (cmds := getattr(self, "_bridge_commands", None)):
             self._bridge_commands = cmds = []
 
         return cmds
@@ -73,6 +73,10 @@ def add_bridge_command(self, command: BridgeCommand):
         """
         # Ignore the type hinting error here. All subclasses of BotBase pass the type checks.
         command.add_to(self)  # type: ignore
+
+        if getattr(self, "_bridge_commands", None) is None:
+            self._bridge_commands = []
+
         self._bridge_commands.append(command)
 
     def bridge_command(self, **kwargs):

discord/ext/bridge/core.py

@@ -191,6 +191,10 @@ def description_localizations(self) -> dict[str, str]:
     def description_localizations(self, value):
         self.slash_variant.description_localizations = value
 
+    @property
+    def qualified_name(self) -> str:
+        return self.slash_variant.qualified_name
+
     def add_to(self, bot: ExtBot) -> None:
         """Adds the command to a bot. This method is inherited by :class:`.BridgeCommandGroup`.
 

discord/guild.py

@@ -208,17 +208,20 @@ class Guild(Hashable):
 
         - ``ANIMATED_BANNER``: Guild can upload an animated banner.
         - ``ANIMATED_ICON``: Guild can upload an animated icon.
+        - ``APPLICATION_COMMAND_PERMISSIONS_V2``: Guild is using the old command permissions behavior.
         - ``AUTO_MODERATION``: Guild has enabled the auto moderation system.
         - ``BANNER``: Guild can upload and use a banner. (i.e. :attr:`.banner`)
         - ``CHANNEL_BANNER``: Guild can upload and use a channel banners.
         - ``COMMERCE``: Guild can sell things using store channels, which have now been removed.
         - ``COMMUNITY``: Guild is a community server.
+        - ``DEVELOPER_SUPPORT_SERVER``: Guild has been set as a support server on the App Directory.
         - ``DISCOVERABLE``: Guild shows up in Server Discovery.
+        - ``FEATURABLE``: Guild can be featured in the Server Directory.
         - ``HAS_DIRECTORY_ENTRY``: Unknown.
         - ``HUB``: Hubs contain a directory channel that let you find school-related, student-run servers for your school or university.
         - ``INTERNAL_EMPLOYEE_ONLY``: Indicates that only users with the staff badge can join the guild.
-        - ``INVITE_SPLASH``: Guild's invite page can have a special splash.
         - ``INVITES_DISABLED``: Guild Invites are disabled.
+        - ``INVITE_SPLASH``: Guild's invite page can have a special splash.
         - ``LINKED_TO_HUB``: 'Guild is linked to a hub.
         - ``MEMBER_PROFILES``: Unknown.
         - ``MEMBER_VERIFICATION_GATE_ENABLED``: Guild has Membership Screening enabled.
@@ -233,8 +236,10 @@ class Guild(Hashable):
         - ``ROLE_ICONS``: Guild can set an image or emoji as a role icon.
         - ``ROLE_SUBSCRIPTIONS_AVAILABLE_FOR_PURCHASE``: Role subscriptions are available for purchasing.
         - ``ROLE_SUBSCRIPTIONS_ENABLED``: Guild is able to view and manage role subscriptions.
+        - ``SEVEN_DAY_THREAD_ARCHIVE``: Users can set the thread archive time to 7 days.
         - ``TEXT_IN_VOICE_ENABLED``: Guild has a chat button inside voice channels that opens a dedicated text channel in a sidebar similar to thread view.
         - ``THREADS_ENABLED_TESTING``: Used by bot developers to test their bots with threads in guilds with 5 or fewer members and a bot. Also gives the premium thread features.
+        - ``THREE_DAY_THREAD_ARCHIVE``: Users can set the thread archive time to 3 days.
         - ``TICKETED_EVENTS_ENABLED``: Guild has enabled ticketed events.
         - ``VANITY_URL``: Guild can have a vanity invite URL (e.g. discord.gg/discord-api).
         - ``VERIFIED``: Guild is a verified server.

discord/types/guild.py

@@ -59,14 +59,19 @@ class UnavailableGuild(TypedDict):
 GuildFeature = Literal[
     "ANIMATED_BANNER",
     "ANIMATED_ICON",
+    "APPLICATION_COMMAND_PERMISSIONS_V2",
     "AUTO_MODERATION",
     "BANNER",
+    "CHANNEL_BANNER",
     "COMMERCE",
     "COMMUNITY",
+    "DEVELOPER_SUPPORT_SERVER",
     "DISCOVERABLE",
     "FEATURABLE",
     "HAS_DIRECTORY_ENTRY",
     "HUB",
+    "INTERNAL_EMPLOYEE_ONLY",
+    "INVITES_DISABLED",
     "INVITE_SPLASH",
     "LINKED_TO_HUB",
     "MEMBER_PROFILES",

docs/api/enums.rst

@@ -51,7 +51,7 @@ of :class:`enum.Enum`.
 
     .. attribute:: attachment
 
-        An attachment. Currently in beta.
+        An attachment.
 
 .. class:: ChannelType
 

docs/faq.rst

@@ -9,8 +9,6 @@ Frequently Asked Questions
 This is a list of Frequently Asked Questions regarding using ``Pycord`` and its extension modules. Feel free to suggest a
 new question or submit one via pull requests.
 
-.. contents:: Questions
-    :local:
 
 Coroutines
 ----------

pyproject.toml

@@ -34,7 +34,7 @@ dynamic = ["version", "dependencies", "optional-dependencies"]
 
 [project.urls]
 Homepage = "https://pycord.dev"
-Changelog = "https://github.com/Pycord-Development/pycord/blob/master/CHANGELOG.md"
+Changelog = "https://docs.pycord.dev/en/master/changelog.html"
 Source = "https://github.com/Pycord-Development/pycord"
 Documentation = "https://docs.pycord.dev"
 Tracker = "https://github.com/Pycord-Development/pycord/issues"