Merge branch 'master' into get_or_fetch

Author: Lulalaby

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-* @Pycord-Development/maintainers
+* @Pycord-Development/library-maintainers @Pycord-Development/library-contributors
 
 /discord/ @Pycord-Development/maintain-discord-api
 

.github/SECURITY.md

@@ -5,7 +5,7 @@
 | Version | Supported          |
 | ------- | ------------------ |
 | 2.x     | :white_check_mark: |
-| <2.0.0  | :x:                |
+| <2.6.1  | :x:                |
 
 ## Reporting a Vulnerability
 

.github/workflows/docs-json-export.yml

@@ -0,0 +1,51 @@
+name: Docs JSON Export
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  export-docs-json:
+    name: Export docs.json
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        id: checkout
+        uses: actions/checkout@v5
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        id: setup-python
+        with:
+          python-version: "3.13"
+          cache: "pip"
+          cache-dependency-path: "requirements/docs.txt"
+          check-latest: true
+      - name: Install dependencies
+        id: install-deps
+        run: |
+          python -m pip install -U pip
+          pip install ".[docs]"
+          pip install beautifulsoup4
+      - name: Build Sphinx HTML docs
+        id: build-sphinx
+        run: sphinx-build -b html docs docs/_build/html
+      - name: Export docs.json
+        id: generate-json
+        run: python scripts/docs_json_exporter.py
+      - name: Upload docs.json as artifact
+        uses: actions/[email protected]
+        id: artifact-upload
+        with:
+          name: Pycord Docs JSON
+          path: docs.json
+          retention-days: 1
+      - name: Show docs.json summary
+        run: |
+          head -n 40 docs.json || tail -n 40 docs.json
+      - name: Output artifact ID
+        run:  |
+          echo "artifact-id=${{ steps.artifact-upload.outputs.artifact-id }}" >> $GITHUB_OUTPUT
+          echo "artifact-url=${{ steps.artifact-upload.outputs.artifact-url }}" >> $GITHUB_OUTPUT
+          echo "::notice::Artifact uploaded: ${{ steps.artifact-upload.outputs.artifact-url }}"

CHANGELOG.md

@@ -16,6 +16,9 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Fixed
 
+- Manage silence for new SSRC with existing user_id.
+  ([#2808](https://github.com/Pycord-Development/pycord/pull/2808))
+
 ### Removed
 
 ## [2.7.0rc1] - 2025-08-30

README.rst

@@ -17,11 +17,12 @@ Pycord is a modern, easy to use, feature-rich, and async ready API wrapper for D
 .. image:: https://img.shields.io/github/v/release/Pycord-Development/pycord?include_prereleases&label=Latest%20Release&logo=github&sort=semver&style=for-the-badge&logoColor=white
    :target: https://github.com/Pycord-Development/pycord/releases
    :alt: Latest release
-
 .. image:: https://img.shields.io/discord/881207955029110855?label=discord&style=for-the-badge&logo=discord&color=5865F2&logoColor=white
    :target: https://pycord.dev/discord
    :alt: Discord server invite
-
+.. image:: https://img.shields.io/github/sponsors/Pycord-Development?style=for-the-badge
+   :target: https://github.com/sponsors/Pycord-Development
+   :alt: GitHub Sponsors
 .. image:: https://badges.crowdin.net/badge/dark/crowdin-on-light.png
    :target: https://translations.pycord.dev/documentation/?utm_source=badge&utm_medium=referral&utm_campaign=badge-add-on
    :alt: Crowdin | Agile localization for tech companies

discord/commands/core.py

@@ -806,6 +806,7 @@ def _parse_options(self, params, *, check_params: bool = True) -> list[Option]:
             if option == inspect.Parameter.empty:
                 option = str
 
+            option = Option._strip_none_type(option)
             if self._is_typing_literal(option):
                 literal_values = get_args(option)
                 if not all(isinstance(v, (str, int, float)) for v in literal_values):

discord/commands/options.py

@@ -386,9 +386,9 @@ def _strip_none_type(input_type):
                 raise TypeError("Option type cannot be only NoneType")
             if len(filtered) == 1:
                 return filtered[0]
-            if all(getattr(t, "__origin__", None) is Literal for t in filtered):
-                return Union[filtered]
-            return Union[filtered]
+
+            return filtered
+
         return input_type
 
     def to_dict(self) -> dict:

discord/voice_client.py

@@ -265,6 +265,7 @@ def __init__(self, client: Client, channel: abc.Connectable):
         self.sink = None
         self.starting_time = None
         self.stopping_time = None
+        self.temp_queued_data: dict[int, list] = {}
 
     warn_nacl = not has_nacl
     supported_modes: tuple[SupportedModes, ...] = (
@@ -890,7 +891,7 @@ def recv_audio(self, sink, callback, *args):
         # it by user, handles pcm files and
         # silence that should be added.
 
-        self.user_timestamps: dict[int, tuple[int, float]] = {}
+        self.user_timestamps: dict[int, tuple[int, int, float]] = {}
         self.starting_time = time.perf_counter()
         self.first_packet_timestamp: float
         while self.recording:
@@ -918,7 +919,30 @@ def recv_audio(self, sink, callback, *args):
 
     def recv_decoded_audio(self, data: RawData):
         # Add silence when they were not being recorded.
-        if data.ssrc not in self.user_timestamps:  # First packet from user
+        data.user_id = self.ws.ssrc_map.get(data.ssrc, {}).get("user_id")
+
+        if data.user_id is None:
+            _log.debug(
+                f"DEBUG: received packet with SSRC {data.ssrc} not linked to a user_id."
+                f"Queueing for later processing."
+            )
+            self.temp_queued_data.setdefault(data.ssrc, []).append(data)
+            return
+        elif data.ssrc in self.temp_queued_data:
+            _log.debug(
+                "DEBUG: We got %d packet(s) in queue for SSRC %d",
+                len(self.temp_queued_data[data.ssrc]),
+                data.ssrc,
+            )
+            queued_packets = self.temp_queued_data.pop(data.ssrc)
+            for q_packet in queued_packets:
+                q_packet.user_id = data.user_id
+                self._process_audio_packet(q_packet)
+
+        self._process_audio_packet(data)
+
+    def _process_audio_packet(self, data: RawData):
+        if data.user_id not in self.user_timestamps:  # First packet from user
             if (
                 not self.user_timestamps or not self.sync_start
             ):  # First packet from anyone
@@ -931,19 +955,33 @@ def recv_decoded_audio(self, data: RawData):
                 ) - 960
 
         else:  # Previously received a packet from user
-            dRT = (
-                data.receive_time - self.user_timestamps[data.ssrc][1]
-            ) * 48000  # delta receive time
-            dT = data.timestamp - self.user_timestamps[data.ssrc][0]  # delta timestamp
-            diff = abs(100 - dT * 100 / dRT)
-            if (
-                diff > 60 and dT != 960
-            ):  # If the difference in change is more than 60% threshold
-                silence = dRT - 960
+            prev_ssrc = self.user_timestamps[data.user_id][0]
+            prev_timestamp = self.user_timestamps[data.user_id][1]
+            prev_receive_time = self.user_timestamps[data.user_id][2]
+
+            if data.ssrc != prev_ssrc:
+                _log.info(
+                    f"Received audio data from USER_ID {data.user_id} with a previous SSRC {prev_ssrc} and new "
+                    f"SSRC {data.ssrc}."
+                )
+                dRT = (data.receive_time - prev_receive_time) * 1000
+                silence = max(0, int(dRT / (1000 / 48000))) - 960
             else:
-                silence = dT - 960
+                dRT = (
+                    data.receive_time - prev_receive_time
+                ) * 48000  # delta receive time
+                dT = data.timestamp - prev_timestamp  # delta timestamp
+                diff = abs(100 - dT * 100 / dRT)
+                if (
+                    diff > 60 and dT != 960
+                ):  # If the difference in change is more than 60% threshold
+                    silence = dRT - 960
+                else:
+                    silence = dT - 960
 
-        self.user_timestamps.update({data.ssrc: (data.timestamp, data.receive_time)})
+        self.user_timestamps.update(
+            {data.user_id: (data.ssrc, data.timestamp, data.receive_time)}
+        )
 
         data.decoded_data = (
             struct.pack("<h", 0) * max(0, int(silence)) * opus._OpusStruct.CHANNELS

scripts/count_sourcelines.py

@@ -0,0 +1,23 @@
+import os
+
+cur_path = os.getcwd()
+ignore_set = {"__init__.py", "count_sourcelines.py", "docs-json-exporter.py"}
+
+loc_list = []
+
+for py_dir, _, py_files in os.walk(cur_path):
+    for py_file in py_files:
+        if py_file.endswith(".py") and py_file not in ignore_set:
+            total_path = os.path.join(py_dir, py_file)
+            try:
+                with open(total_path, encoding="utf-8") as file:
+                    loc_list.append(
+                        (len(file.read().splitlines()), total_path.split(cur_path)[1])
+                    )
+            except UnicodeDecodeError as e:
+                print(f"Skipping file {total_path} due to encoding error: {e}")
+
+for line_number_count, filename in loc_list:
+    print("%05d lines in %s" % (line_number_count, filename))
+
+print("\nTotal: {} lines ({})".format(sum([x[0] for x in loc_list]), cur_path))

scripts/docs_json_exporter.py

@@ -0,0 +1,66 @@
+import json
+import os
+
+from bs4 import BeautifulSoup
+
+
+def log(msg):
+    print(f"::notice::{msg}")
+
+
+log("Starting docs JSON export...")
+folders = [
+    "docs/_build/html/api",
+    "docs/_build/html/ext",
+]
+result = {}
+try:
+    for folder in folders:
+        if not os.path.isdir(folder):
+            log(f"Skipping missing folder: {folder}")
+            continue
+        base_html = os.path.normpath("docs/_build/html")
+        for root, _, files in os.walk(folder):
+            rel_dir = os.path.relpath(root, base_html).replace("\\", "/") + "/"
+            if rel_dir not in result:
+                result[rel_dir] = {}
+            for html_file in files:
+                if not html_file.endswith(".html"):
+                    continue
+                file_path = os.path.join(root, html_file)
+                with open(file_path, encoding="utf-8") as f:
+                    soup = BeautifulSoup(f, "html.parser")
+                    page_index = {}
+                    for class_dl in soup.find_all("dl", class_="class"):
+                        dt = class_dl.find("dt")
+                        class_name = dt.get("id") if dt else None
+                        if not class_name:
+                            class_name = dt.text.split(":")[-1].strip() if dt else None
+                        members = []
+                        for member_dl in class_dl.find_all(
+                            "dl", class_=["attribute", "method"]
+                        ):
+                            for member_dt in member_dl.find_all("dt"):
+                                member_id = member_dt.get("id")
+                                member_name = (
+                                    member_id.split(".")[-1]
+                                    if member_id
+                                    else member_dt.text.split(":")[-1].strip()
+                                )
+                                if member_name:
+                                    members.append(member_name)
+                        page_index[class_name] = members
+                    for func_dl in soup.find_all("dl", class_="function"):
+                        dt = func_dl.find("dt")
+                        func_name = dt.get("id") if dt else None
+                        if not func_name:
+                            func_name = dt.text.split(":")[-1].strip() if dt else None
+                        page_index[func_name] = []
+                    result[rel_dir][html_file] = page_index
+    cleaned_result = {k: v for k, v in result.items() if v}
+    with open("docs.json", "w", encoding="utf-8") as out:
+        json.dump(cleaned_result, out, indent=2, ensure_ascii=False)
+    log("Exported docs to docs.json")
+    log("To upload as artifact: docs.json")
+except Exception as e:
+    print(f"::error::Docs JSON export failed: {e}")