Merge pull request #184 from python-discord/bump-d.py

Bump d.py & update view with user and role check

Author: ChrisLovering

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.4.0
     hooks:
       - id: check-merge-conflict
       - id: check-toml

docs/changelog.rst

@@ -4,8 +4,12 @@
 Changelog
 =========
 
+
+- :feature:`184` Remove the message stored in the ``message`` attr of :obj:`pydis_core.utils.interactions.ViewWithUserAndRoleCheck` when the interaction is stopped, in additional to the exist logic for timeout.
+- :support:`184` Bump Discord.py to :literal-url:`2.3.1 <https://github.com/Rapptz/discord.py/releases/tag/v2.3.1>`.
 - :bug:`187` Fix :obj:`pydis_core.utils.channel.get_or_fetch_channel`'s return type to include :obj:`discord.abc.PrivateChannel` and :obj:`discord.Thread`.
 
+
 - :release:`9.9.2 <2nd July 2023>`
 - :bug:`185` Update expiry label from 1 month to 30 days in paste service.
 

poetry.lock

@@ -16,7 +16,7 @@ def __init__(
         loop: asyncio.AbstractEventLoop,
         host: str = "localhost",
         port: int = 8125,
-        prefix: str = None
+        prefix: str | None = None
     ):
         """
         Create a new :obj:`AsyncStatsClient`.

pydis_core/async_stats.py

@@ -4,6 +4,7 @@
 from discord import ButtonStyle, HTTPException, Interaction, Message, NotFound, ui
 
 from pydis_core.utils.logging import get_logger
+from pydis_core.utils.scheduling import create_task
 
 log = get_logger(__name__)
 
@@ -80,6 +81,12 @@ async def interaction_check(self, interaction: Interaction) -> bool:
         await interaction.response.send_message("This is not your button to click!", ephemeral=True)
         return False
 
+    def stop(self) -> None:
+        """Stop listening for interactions, and remove the view from ``self.message`` if set."""
+        super().stop()
+        if self.message:
+            create_task(_handle_modify_message(self.message, "edit"))
+
     async def on_timeout(self) -> None:
         """Remove the view from ``self.message`` if set."""
         if self.message:

pydis_core/utils/interactions.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pydis_core"
-version = "9.9.1"
+version = "9.9.2"
 description = "PyDis core provides core functionality and utility to the bots of the Python Discord community."
 authors = ["Python Discord <[email protected]>"]
 license = "MIT"
@@ -25,7 +25,7 @@ keywords = ["bot", "discord", "discord.py"]
 [tool.poetry.dependencies]
 python = "3.10.* || 3.11.*"
 
-"discord.py" = "2.3.0"
+"discord.py" = "2.3.1"
 async-rediscache = { version = "1.0.0rc2", extras = ["fakeredis"], optional = true }
 statsd  = "4.0.1"
 aiodns = "3.0.0"
@@ -38,20 +38,20 @@ taskipy = "1.11.0"
 python-dotenv = "1.0.0"
 
 [tool.poetry.group.test.dependencies]
-pytest = "7.3.2"
+pytest = "7.4.0"
 pytest-cov = "4.1.0"
 pytest-xdist = "3.3.1"
 
 [tool.poetry.group.lint.dependencies]
 isort = "5.12.0"
-ruff = "0.0.272"
-pre-commit = "3.3.2"
+ruff = "0.0.275"
+pre-commit = "3.3.3"
 typing-extensions = "4.6.3"
 
 [tool.poetry.group.doc.dependencies]
 Sphinx = "7.0.1"
 GitPython = "3.1.31"
-sphinx-autodoc-typehints = "1.23.0"
+sphinx-autodoc-typehints = "1.23.2"
 furo = "2023.5.20"
 six = "1.16.0"
 releases = "2.1.1"