Make the show issues loading button re-parse the message

object-Object · object-Object · commit 8ebf65c486df · 2025-08-25T21:57:29.000-04:00
diff --git a/bot/src/ghutils/cogs/app_commands/context_menus.py b/bot/src/ghutils/cogs/app_commands/context_menus.py
@@ -1,5 +1,4 @@
 import logging
-import re
 from dataclasses import dataclass
 from types import MethodType
 from typing import Any, Callable
@@ -10,10 +9,8 @@
 from discord.utils import Coro
 
 from ghutils.core.cog import GHUtilsCog
-from ghutils.utils.discord.components import RefreshIssueButton
-from ghutils.utils.discord.embeds import create_issue_embed
-from ghutils.utils.discord.references import IssueReference, IssueReferenceTransformer
-from ghutils.utils.discord.visibility import respond_with_visibility
+from ghutils.utils.discord.components import RefreshIssuesButton
+from ghutils.utils.discord.embeds import create_issue_embeds
 
 logger = logging.getLogger(__name__)
 
@@ -50,20 +47,6 @@ def builder(group: GroupT):
     return decorator
 
 
-_issue_pattern = re.compile(
-    r"""
-    (?<![a-zA-Z`</])
-    (?P<value>
-        (?P<repo>[\w-]+/[\w-]+)?
-        \#
-        (?P<reference>[0-9]+)
-    )
-    (?![a-zA-Z`>])
-    """,
-    flags=re.VERBOSE,
-)
-
-
 @dataclass(eq=False)
 class ContextMenusCog(GHUtilsCog):
     """Context menu commands."""
@@ -90,51 +73,9 @@ async def cog_unload(self) -> None:
     async def show_issues(self, interaction: Interaction, message: Message):
         await interaction.response.defer()
 
-        seen = set[str]()
-        issues = list[IssueReference]()
-        transformer = IssueReferenceTransformer()
-
         async with self.bot.github_app(interaction) as (github, _):
-            for match in _issue_pattern.finditer(message.content):
-                value = match.group("value")
-                try:
-                    repo, issue = await transformer.transform_with_github(
-                        github, interaction, value
-                    )
-                except Exception:
-                    logger.warning(
-                        f"Failed to transform issue reference: {value}", exc_info=True
-                    )
-                    continue
-
-                if issue.html_url in seen:
-                    continue
-
-                seen.add(issue.html_url)
-                issues.append((repo, issue))
-
-            visibility = "public"
-            match issues:
-                case []:
-                    await respond_with_visibility(
-                        interaction,
-                        visibility,
-                        content="❌ No issue references found.",
-                    )
-                case [reference]:
-                    button = await RefreshIssueButton.from_reference(github, reference)
-                    await respond_with_visibility(
-                        interaction,
-                        visibility,
-                        embed=create_issue_embed(*reference),
-                        items=[button],
-                    )
-                case _:
-                    await respond_with_visibility(
-                        interaction,
-                        visibility,
-                        embeds=[
-                            create_issue_embed(*reference, add_body=False)
-                            for reference in issues
-                        ],
-                    )
+            contents = await create_issue_embeds(github, interaction, message)
+
+        contents.items.append(RefreshIssuesButton(message))
+
+        await contents.send(interaction, "public")
diff --git a/bot/src/ghutils/cogs/events.py b/bot/src/ghutils/cogs/events.py
@@ -5,7 +5,11 @@
 
 from ghutils.core.cog import GHUtilsCog
 from ghutils.utils.discord.commands import get_command, print_command
-from ghutils.utils.discord.components import RefreshCommitButton, RefreshIssueButton
+from ghutils.utils.discord.components import (
+    RefreshCommitButton,
+    RefreshIssueButton,
+    RefreshIssuesButton,
+)
 from ghutils.utils.discord.visibility import PermanentDeleteButton
 
 logger = logging.getLogger(__name__)
@@ -21,6 +25,7 @@ async def on_ready(self):
             PermanentDeleteButton,
             RefreshCommitButton,
             RefreshIssueButton,
+            RefreshIssuesButton,
         )
         await self.bot.fetch_custom_emojis()
 
diff --git a/bot/src/ghutils/utils/discord/components.py b/bot/src/ghutils/utils/discord/components.py
@@ -1,27 +1,28 @@
+from dataclasses import dataclass
 from datetime import UTC, datetime, timedelta
 from re import Match
 from typing import Any, override
 
-from discord import Color, Embed, Interaction
+from discord import Color, Embed, Interaction, Message
 from discord.ui import Button, DynamicItem, Item
 from githubkit import GitHub
 from githubkit.rest import Commit, Issue
 from pydantic import TypeAdapter
-from pydantic.dataclasses import dataclass
+from pydantic.dataclasses import dataclass as pydantic_dataclass
 
 from ghutils.core.bot import GHUtilsBot
 from ghutils.core.types import LoginState
-from ghutils.utils.discord.references import (
+
+from ..github import RepositoryName, gh_request
+from .embeds import create_commit_embed, create_issue_embed, create_issue_embeds
+from .references import (
     CommitReference,
     IssueReference,
     PRReference,
 )
-from ghutils.utils.github import RepositoryName, gh_request
-
-from .embeds import create_commit_embed, create_issue_embed
 
 
-@dataclass
+@pydantic_dataclass
 class RefreshIssueButton(
     DynamicItem[Button[Any]],
     template=r"RefreshIssue:(?P<repo_id>[0-9]+):(?P<issue>[0-9]+)",
@@ -86,6 +87,54 @@ async def callback(self, interaction: Interaction):
 
 
 @dataclass
+class RefreshIssuesButton(
+    DynamicItem[Button[Any]],
+    template=r"RefreshIssues:(?P<message_id>[0-9]+)",
+):
+    message: Message
+
+    def __post_init__(self):
+        super().__init__(
+            Button(
+                emoji="🔄",
+                custom_id=f"RefreshIssues:{self.message.id}",
+            )
+        )
+
+    @classmethod
+    @override
+    async def from_custom_id(
+        cls,
+        interaction: Interaction,
+        item: Item[Any],
+        match: Match[str],
+    ):
+        assert interaction.message is not None
+        message_id = int(match["message_id"])
+        return cls(
+            message=await interaction.message.channel.fetch_message(message_id),
+        )
+
+    @override
+    async def callback(self, interaction: Interaction):
+        async with GHUtilsBot.github_app_of(interaction) as (github, state):
+            if not await _check_ratelimit(interaction, state):
+                return
+
+            # disable the button while we're working to give a loading indication
+            self.item.disabled = True
+            await interaction.response.edit_message(view=self.view)
+
+            self.item.disabled = False
+            try:
+                contents = await create_issue_embeds(github, interaction, self.message)
+                await contents.edit_original_response(interaction, view=self.view)
+            except Exception:
+                await interaction.response.edit_message(view=self.view)
+                raise
+
+
+@pydantic_dataclass
 class RefreshCommitButton(
     DynamicItem[Button[Any]],
     template=r"RefreshCommit:(?P<repo_id>[0-9]+):(?P<sha>[^:]+)",
diff --git a/bot/src/ghutils/utils/discord/embeds.py b/bot/src/ghutils/utils/discord/embeds.py
@@ -1,13 +1,17 @@
 from __future__ import annotations
 
+import logging
+import re
 from datetime import datetime
 from typing import Any
 
-from discord import Embed
+from discord import Embed, Interaction, Message
 from githubkit import GitHub
 from githubkit.exception import GitHubException
 from githubkit.rest import Commit, Issue, IssuePropPullRequest, PullRequest, SimpleUser
 
+from ghutils.utils.discord.visibility import MessageContents
+
 from ..github import (
     CommitCheckState,
     IssueState,
@@ -18,6 +22,9 @@
     shorten_sha,
 )
 from ..strings import truncate_str
+from .references import IssueReference, IssueReferenceTransformer
+
+logger = logging.getLogger(__name__)
 
 
 def set_embed_author(embed: Embed, user: SimpleUser):
@@ -62,6 +69,65 @@ def create_issue_embed(
     return embed
 
 
+_ISSUE_PATTERN = re.compile(
+    r"""
+    (?<![a-zA-Z`</])
+    (?P<value>
+        (?P<repo>[\w-]+/[\w-]+)?
+        \#
+        (?P<reference>[0-9]+)
+    )
+    (?![a-zA-Z`>])
+    """,
+    flags=re.VERBOSE,
+)
+
+
+async def create_issue_embeds(
+    github: GitHub[Any],
+    interaction: Interaction,
+    message: Message,
+):
+    seen = set[str]()
+    issues = list[IssueReference]()
+    transformer = IssueReferenceTransformer()
+
+    for match in _ISSUE_PATTERN.finditer(message.content):
+        value = match.group("value")
+        try:
+            repo, issue = await transformer.transform_with_github(
+                github, interaction, value
+            )
+        except Exception:
+            logger.warning(
+                f"Failed to transform issue reference: {value}", exc_info=True
+            )
+            continue
+
+        if issue.html_url in seen:
+            continue
+
+        seen.add(issue.html_url)
+        issues.append((repo, issue))
+
+    content = None
+    embeds = list[Embed]()
+    match issues:
+        case []:
+            content = "❌ No issue references found."
+        case [reference]:
+            embeds.append(create_issue_embed(*reference))
+        case _:
+            embeds.extend(
+                create_issue_embed(*reference, add_body=False) for reference in issues
+            )
+    return MessageContents(
+        command=interaction.command,
+        content=content,
+        embeds=embeds,
+    )
+
+
 async def create_commit_embed(
     github: GitHub[Any],
     repo: RepositoryName,
diff --git a/bot/src/ghutils/utils/discord/visibility.py b/bot/src/ghutils/utils/discord/visibility.py
@@ -23,28 +23,35 @@ async def respond_with_visibility(
     content: Any | None = None,
     embed: Embed = MISSING,
     embeds: Sequence[Embed] = MISSING,
-    items: Sequence[Item[Any]] = [],
+    items: list[Item[Any]] | None = None,
 ):
     data = MessageContents(
         command=interaction.command,
         content=content,
         embed=embed,
         embeds=embeds,
-        items=items,
+        items=items if items is not None else [],
     )
-    if interaction.response.is_done():
-        await data.send_followup(interaction, visibility)
-    else:
-        await data.send_response(interaction, visibility)
+    await data.send(interaction, visibility)
 
 
 @dataclass(kw_only=True)
 class MessageContents:
     command: AnyCommand | ContextMenu | None
-    content: Any | None = None
+    content: Any | None = MISSING
     embed: Embed = MISSING
     embeds: Sequence[Embed] = MISSING
-    items: Sequence[Item[Any]] = field(default_factory=lambda: list())
+    items: list[Item[Any]] = field(default_factory=lambda: list())
+
+    async def send(
+        self,
+        interaction: Interaction,
+        visibility: MessageVisibility,
+    ):
+        if interaction.response.is_done():
+            await self.send_followup(interaction, visibility)
+        else:
+            await self.send_response(interaction, visibility)
 
     async def send_response(
         self,
@@ -74,6 +81,19 @@ async def send_followup(
             view=self._get_view(interaction, visibility, show_user),
         )
 
+    async def edit_original_response(
+        self,
+        interaction: Interaction,
+        *,
+        view: View | None = MISSING,
+    ):
+        await interaction.edit_original_response(
+            content=self.content,
+            embed=self.embed,
+            embeds=self.embeds,
+            view=view,
+        )
+
     def _get_view(
         self,
         interaction: Interaction,
diff --git a/bot/src/ghutils/utils/github.py b/bot/src/ghutils/utils/github.py
@@ -84,7 +84,9 @@ def __init__(self, color: Color | None):
         self.color = color
 
 
-REPOSITORY_NAME_URL_PATTERN = re.compile(r"github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)")
+_REPOSITORY_NAME_URL_PATTERN = re.compile(
+    r"github.com/(?P<owner>[^/]+)/(?P<repo>[^/]+)"
+)
 
 
 @dataclass
@@ -112,7 +114,7 @@ def try_parse(cls, value: str) -> Self | None:
 
     @classmethod
     def from_url(cls, url: str) -> Self:
-        match = REPOSITORY_NAME_URL_PATTERN.search(url)
+        match = _REPOSITORY_NAME_URL_PATTERN.search(url)
         if not match:
             raise ValueError("GitHub URL not found")
         return cls(owner=match["owner"], repo=match["repo"])
