Merge branch 'master' into feat/get-guild-role-member-counts

Author: Paillat-dev

.github/workflows/lib-checks.yml

@@ -83,7 +83,7 @@ jobs:
           pip install -r requirements/dev.txt
       - name: "Setup cache"
         id: cache-pylint
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .pylint.d
           key: pylint
@@ -107,7 +107,7 @@ jobs:
           pip install -r requirements/dev.txt
       - name: "Setup cache"
         id: cache-mypy
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .mypy_cache
           key: mypy
@@ -142,7 +142,7 @@ jobs:
           pip install -r requirements/dev.txt
       - name: "Setup cache"
         id: cache-pytest
-        uses: actions/cache@v4
+        uses: actions/cache@v5
         with:
           path: .pytest_cache
           key: ${{ matrix.os }}-${{ matrix.python-version }}-pytest

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
       - id: isort
         exclude: \.(po|pot|yml|yaml)$
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.11.0
+    rev: 25.12.0
     hooks:
       - id: black
         args: [--safe, --quiet]

CHANGELOG.md

@@ -24,8 +24,13 @@ These changes are available on the `master` branch, but have not yet been releas
 
 ### Fixed
 
+- Fixed `TypeError` in paginator implementation when only passing `PageGroup` objects
+  and `show_menu` is falsy.
+  ([#2993](https://github.com/Pycord-Development/pycord/pull/2993))
 - Fixed breaking change in `ui.Select` Generic typing by adding default values to
   TypeVars. ([#3002](https://github.com/Pycord-Development/pycord/pull/3002))
+- Fixed `View`'s `disable_on_timeout` not working in private (DM) channels.
+  ([#3016](https://github.com/Pycord-Development/pycord/pull/3016))
 
 ### Deprecated
 

discord/ext/pages/pagination.py

@@ -418,17 +418,20 @@ def __init__(
         self.default_page_group: int = 0
 
         if all(isinstance(pg, PageGroup) for pg in pages):
-            self.page_groups = self.pages if show_menu else None
-            if sum(pg.default is True for pg in self.page_groups) > 1:
+            if sum(pg.default is True for pg in pages) > 1:
                 raise ValueError("Only one PageGroup can be set as the default.")
-            for pg in self.page_groups:
+
+            default_pg_index = 0
+            for pg in pages:
                 if pg.default:
-                    self.default_page_group = self.page_groups.index(pg)
+                    default_pg_index = pages.index(pg)
                     break
+
             self.pages: list[Page] = self.get_page_group_content(
-                self.page_groups[self.default_page_group]
+                pages[default_pg_index]
             )
 
+            self.page_groups = self.pages if show_menu else None
         self.page_count = max(len(self.pages) - 1, 0)
         self.buttons = {}
         self.custom_buttons: list = custom_buttons
@@ -530,16 +533,20 @@ async def update(
         ) = (pages if pages is not None else self.pages)
         self.show_menu = show_menu if show_menu is not None else self.show_menu
         if pages is not None and all(isinstance(pg, PageGroup) for pg in pages):
-            self.page_groups = self.pages if self.show_menu else None
-            if sum(pg.default is True for pg in self.page_groups) > 1:
+            if sum(pg.default is True for pg in pages) > 1:
                 raise ValueError("Only one PageGroup can be set as the default.")
-            for pg in self.page_groups:
+
+            default_pg_index = 0
+            for pg in pages:
                 if pg.default:
-                    self.default_page_group = self.page_groups.index(pg)
+                    default_pg_index = pages.index(pg)
                     break
+
             self.pages: list[Page] = self.get_page_group_content(
-                self.page_groups[self.default_page_group]
+                pages[default_pg_index]
             )
+
+            self.page_groups = self.pages if show_menu else None
         self.page_count = max(len(self.pages) - 1, 0)
         self.current_page = current_page if current_page <= self.page_count else 0
         # Apply config changes, if specified

discord/ui/view.py

@@ -55,6 +55,7 @@
 from ..components import TextDisplay as TextDisplayComponent
 from ..components import Thumbnail as ThumbnailComponent
 from ..components import _component_factory
+from ..enums import ChannelType
 from ..utils import find
 from .core import ItemInterface
 from .item import ItemCallbackType, ViewItem
@@ -303,7 +304,11 @@ async def on_timeout(self) -> None:
         if self.disable_on_timeout:
             self.disable_all_items()
 
-            if not self._message or self._message.flags.ephemeral:
+            if (
+                not self._message
+                or self._message.flags.ephemeral
+                or (self._message.channel.type == ChannelType.private)
+            ):
                 message = self.parent
             else:
                 message = self.message