Skip to content

The agent that grows with you

fix(discord): keep the resolved footer when a prompt view times out

oddtazz6abdd20449a1
diff --git a/plugins/platforms/discord/adapter.py b/plugins/platforms/discord/adapter.py
index 509b4cc6cac..1f63644e729 100644
--- a/plugins/platforms/discord/adapter.py
+++ b/plugins/platforms/discord/adapter.py
@@ -1201,7 +1201,8 @@ class VoiceReceiver:
from plugins.platforms.discord.adapter_config_readers import (
- _DISCORD_PROMPT_TIMEOUT_DEFAULT, _DISCORD_PROMPT_TIMEOUT_MIN, _read_discord_prompt_timeout, _read_dm_role_auth_guild)
+ _DISCORD_PROMPT_TIMEOUT_DEFAULT, _DISCORD_PROMPT_TIMEOUT_MIN, _read_discord_prompt_timeout, _read_dm_role_auth_guild,
+ _resolve_exec_approval_admin_gate)
from plugins.platforms.discord.adapter_exec_approval_view import build_exec_approval_view
@@ -6354,24 +6355,6 @@ class DiscordAdapter(DiscordAuthorizationMixin, DiscordMediaMixin, DiscordThread
# ---------------------------------------------------------------------------
-def _resolve_exec_approval_admin_gate(config_extra: Optional[dict]) -> tuple[bool, set]:
- """Resolve the exec-approval admin gate from ``extra``; returns ``(require_admin, admin_user_ids)``.
- Default OFF (user-scope buttons). When ``require_admin_for_exec_approval`` is true only
- ``allow_admin_from`` ids may click; on with no admins -> ``(True, set())`` (fail closed, log once).
- """
- extra = config_extra if isinstance(config_extra, dict) else {}
- raw_toggle = extra.get("require_admin_for_exec_approval", False)
- require_admin = str(raw_toggle).strip().lower() in {"true", "1", "yes"}
- if not require_admin:
- return (False, set())
- try:
- from gateway.slash_access import _coerce_id_list
- admin_ids = set(_coerce_id_list(extra.get("allow_admin_from")))
- except Exception:
- admin_ids = set()
- return (True, admin_ids)
-
-
def _define_discord_view_classes() -> None:
"""Register Discord UI view classes as module globals.
Called at module load and after a lazy install so the classes exist whenever DISCORD_AVAILABLE."""
@@ -6459,6 +6442,9 @@ def _define_discord_view_classes() -> None:
item.label = _t_discord(key, _DISCORD_BUTTON_LABEL_LIMIT)
async def on_timeout(self):
+ # A click already resolved the prompt: keep its "Approved/Denied by" footer.
+ if self.resolved:
+ return
self.resolved = True
self._disable_all()
await self._expire_embed(t("platform.discord.prompt.expired_footer"))
@@ -6730,6 +6716,8 @@ def _define_discord_view_classes() -> None:
await self._edit(interaction, t("platform.discord.picker.cancelled"), color=discord.Color.greyple())
async def on_timeout(self):
+ if self.resolved:
+ return
self.resolved = True
self.clear_items()
msg = self._message
diff --git a/plugins/platforms/discord/adapter_config_readers.py b/plugins/platforms/discord/adapter_config_readers.py
index bbfca1b4a95..648e39fbe14 100644
--- a/plugins/platforms/discord/adapter_config_readers.py
+++ b/plugins/platforms/discord/adapter_config_readers.py
@@ -1,4 +1,5 @@
-"""config.yaml readers for the Discord adapter: DM role-auth guild opt-in and button-view timeout.
+"""config.yaml readers for the Discord adapter: DM role-auth guild opt-in, button-view timeout and
+exec-approval admin gate.
Re-exported from ``plugins.platforms.discord.adapter`` (callers and tests import them there).
"""
@@ -54,3 +55,21 @@ def _read_discord_prompt_timeout() -> int:
if seconds > _DISCORD_PROMPT_TIMEOUT_MAX:
return _DISCORD_PROMPT_TIMEOUT_MAX
return seconds
+
+
+def _resolve_exec_approval_admin_gate(config_extra: Optional[dict]) -> tuple[bool, set]:
+ """Resolve the exec-approval admin gate from ``extra``; returns ``(require_admin, admin_user_ids)``.
+ Default OFF (user-scope buttons). When ``require_admin_for_exec_approval`` is true only
+ ``allow_admin_from`` ids may click; on with no admins -> ``(True, set())`` (fail closed, log once).
+ """
+ extra = config_extra if isinstance(config_extra, dict) else {}
+ raw_toggle = extra.get("require_admin_for_exec_approval", False)
+ require_admin = str(raw_toggle).strip().lower() in {"true", "1", "yes"}
+ if not require_admin:
+ return (False, set())
+ try:
+ from gateway.slash_access import _coerce_id_list
+ admin_ids = set(_coerce_id_list(extra.get("allow_admin_from")))
+ except Exception:
+ admin_ids = set()
+ return (True, admin_ids)
diff --git a/tests/gateway/test_discord_view_base_parity.py b/tests/gateway/test_discord_view_base_parity.py
index 320fb395a0d..cc3f441e44d 100644
--- a/tests/gateway/test_discord_view_base_parity.py
+++ b/tests/gateway/test_discord_view_base_parity.py
@@ -127,3 +127,15 @@ async def test_on_timeout_disables_and_greys_embed(name):
async def test_on_timeout_without_message_is_safe():
for view in _views().values():
await view.on_timeout()
+
+
[email protected]("name", ["slash", "update", "clarify", "model"])
+async def test_timeout_after_resolution_keeps_the_resolved_embed(name):
+ """A prompt resolved by a click must not be relabelled 'expired' when the view times out."""
+ view = _views()[name]
+ msg = SimpleNamespace(embeds=[SimpleNamespace(color=None, set_footer=lambda **_: None)], edit=AsyncMock())
+ view._message = msg
+ view.resolved = True
+ await view.on_timeout()
+ msg.edit.assert_not_called()