Merge branch 'master' into master

Signed-off-by: Dorukyum <[email protected]>

Author: Dorukyum

.github/workflows/docs-localization-download.yml

@@ -40,7 +40,7 @@ jobs:
         working-directory: ./docs
       - name: "Crowdin"
         id: crowdin
-        uses: crowdin/[email protected].0
+        uses: crowdin/[email protected].1
         with:
           upload_sources: false
           upload_translations: false

.github/workflows/docs-localization-upload.yml

@@ -44,7 +44,7 @@ jobs:
           sphinx-intl update -p ./build/locales ${{ vars.SPHINX_LANGUAGES }}
         working-directory: ./docs
       - name: "Crowdin"
-        uses: crowdin/[email protected].0
+        uses: crowdin/[email protected].1
         with:
           upload_sources: true
           upload_translations: false

.pre-commit-config.yaml

@@ -26,7 +26,7 @@ repos:
       - id: pyupgrade
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/PyCQA/isort
-    rev: 6.0.0
+    rev: 6.0.1
     hooks:
       - id: isort
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -49,6 +49,10 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2579](https://github.com/Pycord-Development/pycord/pull/2579))
 - Added new `Subscription` object and related methods/events.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
+- Added the ability to change the API's base URL with `Route.API_BASE_URL`.
+  ([#2714](https://github.com/Pycord-Development/pycord/pull/2714))
+- Added the ability to pass a `datetime.time` object to `format_dt`
+  ([#2747](https://github.com/Pycord-Development/pycord/pull/2747))
 - Added `positional` argument to `commands.Flag`.
   ([#2443](https://github.com/Pycord-Development/pycord/pull/2443))
 
@@ -97,6 +101,10 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
 - Fixed `Subscription.renewal_sku_ids` not accepting `None` from the received payload.
   ([#2709](https://github.com/Pycord-Development/pycord/pull/2709))
+- Fixed `ForumChannel.edit` allowing `default_reaction_emoji` to be `None`
+  ([#2739](https://github.com/Pycord-Development/pycord/pull/2739))
+- Fixed missing `None` type hints in `Select.__init__`.
+  ([#2746])(https://github.com/Pycord-Development/pycord/pull/2746)
 
 ### Changed
 

discord/abc.py

@@ -521,13 +521,17 @@ async def _edit(
                 )
             elif isinstance(default_reaction_emoji, str):
                 default_reaction_emoji = PartialEmoji.from_str(default_reaction_emoji)
+            elif default_reaction_emoji is None:
+                pass
             else:
                 raise InvalidArgument(
-                    "default_reaction_emoji must be of type: GuildEmoji | int | str"
+                    "default_reaction_emoji must be of type: GuildEmoji | int | str | None"
                 )
 
             options["default_reaction_emoji"] = (
                 default_reaction_emoji._to_forum_reaction_payload()
+                if default_reaction_emoji
+                else None
             )
 
         if options:

discord/ext/bridge/core.py

@@ -232,7 +232,7 @@ def __getattribute__(self, name):
         except AttributeError as e:
             # if it doesn't exist, check this list, if the name of
             # the parameter is here
-            if name is self.__special_attrs__:
+            if name in self.__special_attrs__:
                 raise e
 
             # looks up the result in the variants.

discord/ext/pages/pagination.py

@@ -1163,7 +1163,7 @@ async def respond(
         if target is not None and not isinstance(target, discord.abc.Messageable):
             raise TypeError(f"expected abc.Messageable not {target.__class__!r}")
 
-        if ephemeral and (self.timeout >= 900 or self.timeout is None):
+        if ephemeral and (self.timeout is None or self.timeout >= 900):
             raise ValueError(
                 "paginator responses cannot be ephemeral if the paginator timeout is 15"
                 " minutes or greater"

discord/http.py

@@ -106,6 +106,8 @@ async def json_or_text(response: aiohttp.ClientResponse) -> dict[str, Any] | str
 
 
 class Route:
+    API_BASE_URL: str = "https://discord.com/api/v{API_VERSION}"
+
     def __init__(self, method: str, path: str, **parameters: Any) -> None:
         self.path: str = path
         self.method: str = method
@@ -127,7 +129,7 @@ def __init__(self, method: str, path: str, **parameters: Any) -> None:
 
     @property
     def base(self) -> str:
-        return f"https://discord.com/api/v{API_VERSION}"
+        return self.API_BASE_URL.format(API_VERSION=API_VERSION)
 
     @property
     def bucket(self) -> str:

discord/role.py

@@ -62,7 +62,7 @@ class RoleTags:
 
     Role tags are a fairly complex topic, since it's usually hard to determine which role tag combination represents which role type.
     We aim to improve the documentation / introduce new attributes in future.
-    For the meantime read `this <https://lulalaby.notion.site/Special-Roles-Documentation-17411d3839e680abbb1eff63c51bd7a7?pvs=4>`_ if you need detailed information about how role tags work.
+    For the meantime read `this <https://discord-lib-devs.notion.site/special-roles-role-tags>`_ if you need detailed information about how role tags work.
 
     .. versionadded:: 1.6
 

discord/ui/select.py

@@ -130,8 +130,8 @@ def __init__(
         placeholder: str | None = None,
         min_values: int = 1,
         max_values: int = 1,
-        options: list[SelectOption] = None,
-        channel_types: list[ChannelType] = None,
+        options: list[SelectOption] | None = None,
+        channel_types: list[ChannelType] | None = None,
         disabled: bool = False,
         row: int | None = None,
     ) -> None: