Merge branch 'master' into app_emojis

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

Author: NeloBlivion

.github/workflows/todo-checks.yml

@@ -23,7 +23,7 @@ jobs:
       - name: "Checkout Repository"
         uses: actions/checkout@v4
       - name: "Track TODO Action"
-        uses: ribtoks/[email protected].12-beta
+        uses: ribtoks/[email protected].13-beta
         with:
           TOKEN: ${{ secrets.GITHUB_TOKEN }}
           REPO: ${{ github.repository }}

.pre-commit-config.yaml

@@ -4,7 +4,7 @@ ci:
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
         exclude: \.(po|pot|yml|yaml)$

CHANGELOG.md

@@ -26,6 +26,8 @@ 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 `elapsed` method to `VoiceClient`.
+  ([#2587](https://github.com/Pycord-Development/pycord/pull/2587/))
 - Added optional `filter` parameter to `utils.basic_autocomplete()`.
   ([#2590](https://github.com/Pycord-Development/pycord/pull/2590))
 
@@ -44,6 +46,8 @@ These changes are available on the `master` branch, but have not yet been releas
 - Fixed `Guild.create_test_entitlement()` and `User.create_test_entitlement()` using the
   guild/user ID instead of the application ID.
   ([#2595](https://github.com/Pycord-Development/pycord/pull/2595))
+- Fixed commands with `BucketType.cagegory` cooldown causing issues in private channels.
+  ([#2603](https://github.com/Pycord-Development/pycord/pull/2603))
 
 ### Changed
 

discord/ext/commands/cooldowns.py

@@ -30,6 +30,7 @@
 from collections import deque
 from typing import TYPE_CHECKING, Any, Callable, Deque, TypeVar
 
+import discord.abc
 from discord.enums import Enum
 
 from ...abc import PrivateChannel
@@ -69,7 +70,12 @@ def get_key(self, msg: Message) -> Any:
         elif self is BucketType.member:
             return (msg.guild and msg.guild.id), msg.author.id
         elif self is BucketType.category:
-            return (msg.channel.category or msg.channel).id  # type: ignore
+            return (
+                msg.channel.category.id
+                if isinstance(msg.channel, discord.abc.GuildChannel)
+                and msg.channel.category
+                else msg.channel.id
+            )
         elif self is BucketType.role:
             # we return the channel id of a private-channel as there are only roles in guilds
             # and that yields the same result as for a guild with only the @everyone role

discord/message.py

@@ -1548,6 +1548,8 @@ async def edit(
 
         Raises
         ------
+        NotFound
+            The message was not found.
         HTTPException
             Editing the message failed.
         Forbidden

discord/player.py

@@ -724,6 +724,7 @@ def __init__(self, source: AudioSource, client: VoiceClient, *, after=None):
         self._current_error: Exception | None = None
         self._connected: threading.Event = client._connected
         self._lock: threading.Lock = threading.Lock()
+        self._played_frames_offset: int = 0
 
         if after is not None and not callable(after):
             raise TypeError('Expected a callable for the "after" parameter.')
@@ -751,10 +752,12 @@ def _do_run(self) -> None:
                 # wait until we are connected
                 self._connected.wait()
                 # reset our internal data
+                self._played_frames_offset += self.loops
                 self.loops = 0
                 self._start = time.perf_counter()
 
             self.loops += 1
+
             # Send the data read from the start of the function if it is not None
             if first_data is not None:
                 data = first_data
@@ -809,6 +812,7 @@ def pause(self, *, update_speaking: bool = True) -> None:
             self._speak(False)
 
     def resume(self, *, update_speaking: bool = True) -> None:
+        self._played_frames_offset += self.loops
         self.loops = 0
         self._start = time.perf_counter()
         self._resumed.set()
@@ -834,3 +838,7 @@ def _speak(self, speaking: bool) -> None:
             )
         except Exception as e:
             _log.info("Speaking call in player failed: %s", e)
+
+    def played_frames(self) -> int:
+        """Gets the number of 20ms frames played since the start of the audio file."""
+        return self._played_frames_offset + self.loops

discord/voice_client.py

@@ -40,6 +40,7 @@
 from __future__ import annotations
 
 import asyncio
+import datetime
 import logging
 import select
 import socket
@@ -988,3 +989,9 @@ def send_audio_packet(self, data: bytes, *, encode: bool = True) -> None:
             )
 
         self.checked_add("timestamp", opus.Encoder.SAMPLES_PER_FRAME, 4294967295)
+
+    def elapsed(self) -> datetime.timedelta:
+        """Returns the elapsed time of the playing audio."""
+        if self._player:
+            return datetime.timedelta(milliseconds=self._player.played_frames() * 20)
+        return datetime.timedelta()

docs/old_changelog.rst

@@ -625,7 +625,7 @@ Bug Fixes
 - Fix out of order files being sent in webhooks when there are 10 files.
 - |commands| Extensions that fail internally due to ImportError will no longer raise :exc:`~.ext.commands.ExtensionNotFound`. (:dpy-issue:`2244`, :dpy-issue:`2275`, :dpy-issue:`2291`)
 - |commands| Updating the :attr:`Paginator.suffix <.ext.commands.Paginator.suffix>` will not cause out of date calculations. (:dpy-issue:`2251`)
-- |commands| Allow converters from custom extension packages. (:dpy-issue:`2369`, :dpy-issue:`2374`)
+- |commands| Allow converters from custom extension packages. (:dpy-issue:`2369`, 2374)
 - |commands| Fix issue with paginator prefix being ``None`` causing empty pages. (:dpy-issue:`2471`)
 - |commands| :class:`~.commands.Greedy` now ignores parsing errors rather than propagating them.
 - |commands| :meth:`Command.can_run <.ext.commands.Command.can_run>` now checks whether a command is disabled.

requirements/dev.txt

@@ -5,7 +5,7 @@ pytest-asyncio~=0.23.8
 # pytest-order~=1.0.1
 mypy~=1.11.2
 coverage~=7.6
-pre-commit==3.8.0
+pre-commit==4.0.1
 codespell==2.3.0
 bandit==1.7.10
 flake8==7.1.1