Merge branch 'master' into app_emojis

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

Author: NeloBlivion

CHANGELOG.md

@@ -10,7 +10,7 @@ possible (see our [Version Guarantees] for more info).
 
 These changes are available on the `master` branch, but have not yet been released.
 
-⚠️ **This Version Removes Support For Python 3.8** ⚠️
+⚠️ **This version removes support for Python 3.8.** ⚠️
 
 ### Added
 
@@ -26,13 +26,27 @@ These changes are available on the `master` branch, but have not yet been releas
   ([#2501](https://github.com/Pycord-Development/pycord/pull/2501))
 - Added `cache_app_emojis` parameter to `Client`.
   ([#2501](https://github.com/Pycord-Development/pycord/pull/2501))
+- Added optional `filter` parameter to `utils.basic_autocomplete()`.
+  ([#2590](https://github.com/Pycord-Development/pycord/pull/2590))
+
+### Fixed
+
+- Fixed `Enum` options not setting the correct type when only one choice is available.
+  ([#2577](https://github.com/Pycord-Development/pycord/pull/2577))
+- Fixed `codec` option for `FFmpegOpusAudio` class to make it in line with
+  documentation. ([#2581](https://github.com/Pycord-Development/pycord/pull/2581))
+- Fixed a possible bug where audio would play too fast at the beginning of audio files.
+  ([#2584](https://github.com/Pycord-Development/pycord/pull/2584))
+- Fixed the `is_owner()` `user` type hint: `User` -> `User | Member`.
+  ([#2593](https://github.com/Pycord-Development/pycord/pull/2593))
+
 
 ### Changed
 
 - Renamed `cover` property of `ScheduledEvent` and `cover` argument of
   `ScheduledEvent.edit` to `image`.
   ([#2496](https://github.com/Pycord-Development/pycord/pull/2496))
-- ⚠️ **This Version Removes Support For Python 3.8** ⚠️
+- ⚠️ **Removed support for Python 3.8.**
   ([#2521](https://github.com/Pycord-Development/pycord/pull/2521))
 - `Emoji` has been renamed to `GuildEmoji`.
   ([#2501](https://github.com/Pycord-Development/pycord/pull/2501))
@@ -42,24 +56,32 @@ These changes are available on the `master` branch, but have not yet been releas
 - Deprecated `AppInfo.summary` in favor of `AppInfo.description`.
   ([#2520](https://github.com/Pycord-Development/pycord/pull/2520))
 
+## [2.6.1] - 2024-09-15
+
 ### Fixed
 
-- Fixed `EntitlementIterator` behavior with `limit > 100`.
+- Fixed premature garbage collection of tasks.
+  ([#2510](https://github.com/Pycord-Development/pycord/pull/2510))
+- Fixed `EntitlementIterator` type hints and behavior with `limit > 100`.
   ([#2555](https://github.com/Pycord-Development/pycord/pull/2555))
 - Fixed missing `stacklevel` parameter in `warn_deprecated` function call inside
   `@utils.deprecated`. ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
-- Fixed the typehint in `ConnectionState._polls` to reflect actual behavior, changing it
-  from `Guild` to `Poll`.
+- Fixed the type hint in `ConnectionState._polls` to reflect actual behavior, changing
+  it from `Guild` to `Poll`.
   ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed missing `__slots__` attributes in `RawReactionClearEmojiEvent` and
   `RawMessagePollVoteEvent`.
   ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed the type of `ForumChannel.default_sort_order`, changing it from `int` to
   `SortOrder`. ([#2500](https://github.com/Pycord-Development/pycord/pull/2500))
-- Fixed `PartialMessage`s causing errors when created from `PartialMessageable`.
+- Fixed `PartialMessage` causing errors when created from `PartialMessageable`.
   ([#2568](https://github.com/Pycord-Development/pycord/pull/2500))
 - Fixed the `guild` attribute of `Member`s recieved from a `UserCommand` being `None`.
   ([#2573](https://github.com/Pycord-Development/pycord/pull/2573))
+- Fixed `Webhook.send` not including attachment data.
+  ([#2513](https://github.com/Pycord-Development/pycord/pull/2513))
+- Fixed inverted type hints in `CheckAnyFailure`.
+  ([#2502](https://github.com/Pycord-Development/pycord/pull/2502))
 
 ## [2.6.0] - 2024-07-09
 

discord/bot.py

@@ -1407,7 +1407,7 @@ def after_invoke(self, coro):
         self._after_invoke = coro
         return coro
 
-    async def is_owner(self, user: User) -> bool:
+    async def is_owner(self, user: User | Member) -> bool:
         """|coro|
 
         Checks if a :class:`~discord.User` or :class:`~discord.Member` is the owner of
@@ -1422,7 +1422,7 @@ async def is_owner(self, user: User) -> bool:
 
         Parameters
         ----------
-        user: :class:`.abc.User`
+        user: Union[:class:`.abc.User`, :class:`.member.Member`]
             The user to check for.
 
         Returns

discord/commands/options.py

@@ -198,7 +198,7 @@ def __init__(
         enum_choices = []
         input_type_is_class = isinstance(input_type, type)
         if input_type_is_class and issubclass(input_type, (Enum, DiscordEnum)):
-            if description is None:
+            if description is None and input_type.__doc__ is not None:
                 description = inspect.cleandoc(input_type.__doc__)
                 if description and len(description) > 100:
                     description = description[:97] + "..."
@@ -209,7 +209,9 @@ def __init__(
                     )
             enum_choices = [OptionChoice(e.name, e.value) for e in input_type]
             value_class = enum_choices[0].value.__class__
-            if all(isinstance(elem.value, value_class) for elem in enum_choices):
+            if value_class in SlashCommandOptionType.__members__ and all(
+                isinstance(elem.value, value_class) for elem in enum_choices
+            ):
                 input_type = SlashCommandOptionType.from_datatype(
                     enum_choices[0].value.__class__
                 )

discord/player.py

@@ -355,8 +355,9 @@ class FFmpegOpusAudio(FFmpegAudio):
         The codec to use to encode the audio data.  Normally this would be
         just ``libopus``, but is used by :meth:`FFmpegOpusAudio.from_probe` to
         opportunistically skip pointlessly re-encoding Opus audio data by passing
-        ``copy`` as the codec value.  Any values other than ``copy``, ``opus``, or
-        ``libopus`` will be considered ``libopus``.  Defaults to ``libopus``.
+        ``copy`` as the codec value.  Any values other than ``copy``, or
+        ``libopus`` will be considered ``libopus``. ``opus`` will also be considered
+        ``libopus`` since the ``opus`` encoder is still in development. Defaults to ``libopus``.
 
         .. warning::
 
@@ -407,7 +408,9 @@ def __init__(
         args.append("-i")
         args.append("-" if pipe else source)
 
-        codec = "copy" if codec in ("opus", "libopus") else "libopus"
+        # use "libopus" when "opus" is specified since the "opus" encoder is incomplete
+        # link to ffmpeg docs: https://www.ffmpeg.org/ffmpeg-codecs.html#opus
+        codec = "copy" if codec == "copy" else "libopus"
 
         args.extend(
             (
@@ -417,17 +420,24 @@ def __init__(
                 "opus",
                 "-c:a",
                 codec,
-                "-ar",
-                "48000",
-                "-ac",
-                "2",
-                "-b:a",
-                f"{bitrate}k",
                 "-loglevel",
                 "warning",
             )
         )
 
+        # only pass in bitrate, sample rate, channels arguments when actually encoding to avoid ffmpeg warnings
+        if codec != "copy":
+            args.extend(
+                (
+                    "-ar",
+                    "48000",
+                    "-ac",
+                    "2",
+                    "-b:a",
+                    f"{bitrate}k",
+                )
+            )
+
         if isinstance(options, str):
             args.extend(shlex.split(options))
 
@@ -501,6 +511,8 @@ def custom_probe(source, executable):
 
         executable = kwargs.get("executable")
         codec, bitrate = await cls.probe(source, method=method, executable=executable)
+        # only re-encode if the source isn't already opus, else directly copy the source audio stream
+        codec = "copy" if codec in ("opus", "libopus") else "libopus"
         return cls(source, bitrate=bitrate, codec=codec, **kwargs)  # type: ignore
 
     @classmethod
@@ -717,6 +729,9 @@ def __init__(self, source: AudioSource, client: VoiceClient, *, after=None):
             raise TypeError('Expected a callable for the "after" parameter.')
 
     def _do_run(self) -> None:
+        # attempt to read first audio segment from source before starting
+        # some sources can take a few seconds and may cause problems
+        first_data = self.source.read()
         self.loops = 0
         self._start = time.perf_counter()
 
@@ -740,7 +755,13 @@ def _do_run(self) -> None:
                 self._start = time.perf_counter()
 
             self.loops += 1
-            data = self.source.read()
+            # Send the data read from the start of the function if it is not None
+            if first_data is not None:
+                data = first_data
+                first_data = None
+            # Else read the next bit from the source
+            else:
+                data = self.source.read()
 
             if not data:
                 self.stop()

discord/utils.py

@@ -1306,9 +1306,12 @@ def generate_snowflake(dt: datetime.datetime | None = None) -> int:
 AV = Awaitable[V]
 Values = Union[V, Callable[[AutocompleteContext], Union[V, AV]], AV]
 AutocompleteFunc = Callable[[AutocompleteContext], AV]
+FilterFunc = Callable[[AutocompleteContext, Any], Union[bool, Awaitable[bool]]]
 
 
-def basic_autocomplete(values: Values) -> AutocompleteFunc:
+def basic_autocomplete(
+    values: Values, *, filter: FilterFunc | None = None
+) -> AutocompleteFunc:
     """A helper function to make a basic autocomplete for slash commands. This is a pretty standard autocomplete and
     will return any options that start with the value from the user, case-insensitive. If the ``values`` parameter is
     callable, it will be called with the AutocompleteContext.
@@ -1320,18 +1323,21 @@ def basic_autocomplete(values: Values) -> AutocompleteFunc:
     values: Union[Union[Iterable[:class:`.OptionChoice`], Iterable[:class:`str`], Iterable[:class:`int`], Iterable[:class:`float`]], Callable[[:class:`.AutocompleteContext`], Union[Union[Iterable[:class:`str`], Iterable[:class:`int`], Iterable[:class:`float`]], Awaitable[Union[Iterable[:class:`str`], Iterable[:class:`int`], Iterable[:class:`float`]]]]], Awaitable[Union[Iterable[:class:`str`], Iterable[:class:`int`], Iterable[:class:`float`]]]]
         Possible values for the option. Accepts an iterable of :class:`str`, a callable (sync or async) that takes a
         single argument of :class:`.AutocompleteContext`, or a coroutine. Must resolve to an iterable of :class:`str`.
+    filter: Optional[Callable[[:class:`.AutocompleteContext`, Any], Union[:class:`bool`, Awaitable[:class:`bool`]]]]
+        An optional callable (sync or async) used to filter the autocomplete options. It accepts two arguments:
+        the :class:`.AutocompleteContext` and an item from ``values`` iteration treated as callback parameters. If ``None`` is provided, a default filter is used that includes items whose string representation starts with the user's input value, case-insensitive.
+
+        .. versionadded:: 2.7
 
     Returns
     -------
     Callable[[:class:`.AutocompleteContext`], Awaitable[Union[Iterable[:class:`.OptionChoice`], Iterable[:class:`str`], Iterable[:class:`int`], Iterable[:class:`float`]]]]
         A wrapped callback for the autocomplete.
 
-    Note
-    ----
-    Autocomplete cannot be used for options that have specified choices.
+    Examples
+    --------
 
-    Example
-    -------
+    Basic usage:
 
     .. code-block:: python3
 
@@ -1344,7 +1350,17 @@ async def autocomplete(ctx):
 
         Option(str, "name", autocomplete=basic_autocomplete(autocomplete))
 
+    With filter parameter:
+
+    .. code-block:: python3
+
+        Option(str, "color", autocomplete=basic_autocomplete(("red", "green", "blue"), filter=lambda c, i: str(c.value or "") in i))
+
     .. versionadded:: 2.0
+
+    Note
+    ----
+    Autocomplete cannot be used for options that have specified choices.
     """
 
     async def autocomplete_callback(ctx: AutocompleteContext) -> V:
@@ -1355,11 +1371,23 @@ async def autocomplete_callback(ctx: AutocompleteContext) -> V:
         if asyncio.iscoroutine(_values):
             _values = await _values
 
-        def check(item: Any) -> bool:
-            item = getattr(item, "name", item)
-            return str(item).lower().startswith(str(ctx.value or "").lower())
+        if filter is None:
+
+            def _filter(ctx: AutocompleteContext, item: Any) -> bool:
+                item = getattr(item, "name", item)
+                return str(item).lower().startswith(str(ctx.value or "").lower())
+
+            gen = (val for val in _values if _filter(ctx, val))
+
+        elif asyncio.iscoroutinefunction(filter):
+            gen = (val for val in _values if await filter(ctx, val))
+
+        elif callable(filter):
+            gen = (val for val in _values if filter(ctx, val))
+
+        else:
+            raise TypeError("``filter`` must be callable.")
 
-        gen = (val for val in _values if check(val))
         return iter(itertools.islice(gen, 25))
 
     return autocomplete_callback

discord/webhook/async_.py

@@ -644,8 +644,9 @@ def handle_message_parameters(
         payload["embeds"] = [] if embed is None else [embed.to_dict()]
     if content is not MISSING:
         payload["content"] = str(content) if content is not None else None
+    _attachments = []
     if attachments is not MISSING:
-        payload["attachments"] = [a.to_dict() for a in attachments]
+        _attachments = [a.to_dict() for a in attachments]
 
     if view is not MISSING:
         payload["components"] = view.to_components() if view is not None else []
@@ -674,32 +675,35 @@ def handle_message_parameters(
         payload["allowed_mentions"] = previous_allowed_mentions.to_dict()
 
     multipart = []
+    multipart_files = []
     if file is not MISSING:
         files = [file]
 
     if files:
-        multipart.append({"name": "payload_json", "value": utils._to_json(payload)})
-        payload = None
-        if len(files) == 1:
-            file = files[0]
-            multipart.append(
+        for index, file in enumerate(files):
+            multipart_files.append(
                 {
-                    "name": "file",
+                    "name": f"files[{index}]",
                     "value": file.fp,
                     "filename": file.filename,
                     "content_type": "application/octet-stream",
                 }
             )
-        else:
-            for index, file in enumerate(files):
-                multipart.append(
-                    {
-                        "name": f"file{index}",
-                        "value": file.fp,
-                        "filename": file.filename,
-                        "content_type": "application/octet-stream",
-                    }
-                )
+            _attachments.append(
+                {
+                    "id": index,
+                    "filename": file.filename,
+                    "description": file.description,
+                }
+            )
+
+    if _attachments:
+        payload["attachments"] = _attachments
+
+    if multipart_files:
+        multipart.append({"name": "payload_json", "value": utils._to_json(payload)})
+        payload = None
+        multipart += multipart_files
 
     return ExecuteWebhookParameters(payload=payload, multipart=multipart, files=files)
 

requirements/dev.txt

@@ -1,11 +1,11 @@
 -r _.txt
-pylint~=3.2.7
-pytest~=8.3.2
+pylint~=3.3.1
+pytest~=8.3.3
 pytest-asyncio~=0.23.8
 # pytest-order~=1.0.1
 mypy~=1.11.2
 coverage~=7.6
 pre-commit==3.8.0
 codespell==2.3.0
-bandit==1.7.9
+bandit==1.7.10
 flake8==7.1.1

requirements/docs.txt

@@ -8,4 +8,4 @@ furo==2024.8.6
 sphinx-autodoc-typehints==2.2.3
 sphinx-intl==2.2.0
 typing_extensions==4.12.2
-levenshtein==0.25.1
+levenshtein==0.26.0