Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Rapptz/discord.py into v2…
Browse files Browse the repository at this point in the history
…-martine
  • Loading branch information
PredaaA committed Feb 20, 2024
2 parents 976c30a + 76666fb commit f7b49d6
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions discord/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,12 @@ class FFmpegPCMAudio(FFmpegAudio):
passed to the stdin of ffmpeg.
executable: :class:`str`
The executable name (and path) to use. Defaults to ``ffmpeg``.
.. warning::
Since this class spawns a subprocess, care should be taken to not
pass in an arbitrary executable name when using this parameter.
pipe: :class:`bool`
If ``True``, denotes that ``source`` parameter will be passed
to the stdin of ffmpeg. Defaults to ``False``.
Expand Down Expand Up @@ -392,6 +398,12 @@ class FFmpegOpusAudio(FFmpegAudio):
executable: :class:`str`
The executable name (and path) to use. Defaults to ``ffmpeg``.
.. warning::
Since this class spawns a subprocess, care should be taken to not
pass in an arbitrary executable name when using this parameter.
pipe: :class:`bool`
If ``True``, denotes that ``source`` parameter will be passed
to the stdin of ffmpeg. Defaults to ``False``.
Expand Down
2 changes: 1 addition & 1 deletion discord/ui/view.py
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ def add_item(self, item: Item[Any]) -> Self:
or the row the item is trying to be added to is full.
"""

if len(self._children) > 25:
if len(self._children) >= 25:
raise ValueError('maximum number of children exceeded')

if not isinstance(item, Item):
Expand Down
2 changes: 1 addition & 1 deletion discord/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ async def edit(self, *, username: str = MISSING, avatar: Optional[bytes] = MISSI
then the file must be opened via ``open('some_filename', 'rb')`` and
the :term:`py:bytes-like object` is given through the use of ``fp.read()``.
The only image formats supported for uploading is JPEG and PNG.
.. versionchanged:: 2.0
The edit is no longer in-place, instead the newly edited client user is returned.
Expand All @@ -426,6 +425,7 @@ async def edit(self, *, username: str = MISSING, avatar: Optional[bytes] = MISSI
avatar: Optional[:class:`bytes`]
A :term:`py:bytes-like object` representing the image to upload.
Could be ``None`` to denote no avatar.
Only image formats supported for uploading are JPEG, PNG, GIF, and WEBP.
Raises
------
Expand Down

0 comments on commit f7b49d6

Please sign in to comment.