Merge branch 'master' into soundboard

Author: Paillat-dev

CHANGELOG.md

@@ -58,8 +58,10 @@ These changes are available on the `master` branch, but have not yet been releas
     ([#2623](https://github.com/Pycord-Development/pycord/pull/2623))
 - Added new `Subscription` object and related methods/events.
   ([#2564](https://github.com/Pycord-Development/pycord/pull/2564))
-- Added ability to change the API's base URL with `Route.API_BASE_URL`.
+- 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))
 
 ### Fixed
 
@@ -106,6 +108,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/cog.py

@@ -151,17 +151,6 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
 
         new_cls = super().__new__(cls, name, bases, attrs, **kwargs)
 
-        valid_commands = [
-            (c for i, c in j.__dict__.items() if isinstance(c, _BaseCommand))
-            for j in reversed(new_cls.__mro__)
-        ]
-        if any(isinstance(i, ApplicationCommand) for i in valid_commands) and any(
-            not isinstance(i, _BaseCommand) for i in valid_commands
-        ):
-            _filter = ApplicationCommand
-        else:
-            _filter = _BaseCommand
-
         for base in reversed(new_cls.__mro__):
             for elem, value in base.__dict__.items():
                 if elem in commands:
@@ -178,7 +167,7 @@ def __new__(cls: type[CogMeta], *args: Any, **kwargs: Any) -> CogMeta:
                 is_static_method = isinstance(value, staticmethod)
                 if is_static_method:
                     value = value.__func__
-                if isinstance(value, _filter):
+                if isinstance(value, _BaseCommand):
                     if is_static_method:
                         raise TypeError(
                             f"Command in method {base}.{elem!r} must not be"

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:

discord/utils.py

@@ -1238,7 +1238,9 @@ def resolve_annotation(
 TimestampStyle = Literal["f", "F", "d", "D", "t", "T", "R"]
 
 
-def format_dt(dt: datetime.datetime, /, style: TimestampStyle | None = None) -> str:
+def format_dt(
+    dt: datetime.datetime | datetime.time, /, style: TimestampStyle | None = None
+) -> str:
     """A helper function to format a :class:`datetime.datetime` for presentation within Discord.
 
     This allows for a locale-independent way of presenting data using Discord specific Markdown.
@@ -1268,7 +1270,7 @@ def format_dt(dt: datetime.datetime, /, style: TimestampStyle | None = None) ->
 
     Parameters
     ----------
-    dt: :class:`datetime.datetime`
+    dt: Union[:class:`datetime.datetime`, :class:`datetime.time`]
         The datetime to format.
     style: :class:`str`
         The style to format the datetime with.
@@ -1278,6 +1280,8 @@ def format_dt(dt: datetime.datetime, /, style: TimestampStyle | None = None) ->
     :class:`str`
         The formatted string.
     """
+    if isinstance(dt, datetime.time):
+        dt = datetime.datetime.combine(datetime.datetime.now(), dt)
     if style is None:
         return f"<t:{int(dt.timestamp())}>"
     return f"<t:{int(dt.timestamp())}:{style}>"