feat: extra formatting on webhooks

Author: CoderJoshDK

app/components/github_integration/webhooks/commits.py

@@ -41,4 +41,5 @@ async def _(event: events.CommitComment) -> None:
                 event.comment.body,
             ),
             Footer("commit", f"Commit {sha}: {commit_title}"),
+            origin_repo=event.repository,
         )

app/components/github_integration/webhooks/discussions.py

@@ -65,6 +65,7 @@ async def _(event: events.DiscussionCreated) -> None:
             discussion_footer(discussion, emoji="discussion"),
             color="gray",
             feed_type="discussions",
+            origin_repo=event.repository,
         )
 
     @webhook.event.discussion.closed
@@ -106,6 +107,7 @@ async def _(event: events.DiscussionAnswered) -> None:
             discussion_footer(discussion, emoji="discussion_answered"),
             color="green",
             feed_type="discussions",
+            origin_repo=event.repository,
         )
 
     @webhook.event.discussion.unanswered
@@ -177,4 +179,5 @@ async def _(event: events.DiscussionCommentCreated) -> None:
             discussion_embed_content(discussion, "commented on", event.comment.body),
             discussion_footer(discussion),
             feed_type="discussions",
+            origin_repo=event.repository,
         )

app/components/github_integration/webhooks/issues.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import re
-from functools import partial
 from typing import TYPE_CHECKING, Any, Protocol, cast
 
 from loguru import logger
@@ -15,51 +14,18 @@
 
 if TYPE_CHECKING:
     from githubkit.typing import Missing
-    from githubkit.versions.latest.models import RepositoryWebhooks
     from monalisten import Monalisten, events
 
     from app.bot import EmojiName, GhosttyBot
 
 
-GITHUB_DISCUSSION_URL = re.compile(
-    # Ignore if already inside a link block
-    r"(?<!\()"
-        r"https://github\.com/"
-        r"(?P<owner>\b[a-zA-Z0-9\-]+/)"
-        r"(?P<repo>\b[a-zA-Z0-9\-\._]+)"
-        r"(?P<sep>/(?:issues|pull|discussions)/)"
-        r"(?P<number>\d+)"
-    r"(?!\))"
-)  # fmt: skip
-SUP_HTML = re.compile(r"\s*<sup>((?:.|\s)+?)</sup>\s*")
 DISUCSSION_DIV_TAG = re.compile(
     r"\s*<div type='discussions-op-text'>((?:.|\s)*?)\s*</div>\s*", re.MULTILINE
 )
 
 
-def shorten_same_repo_links(
-    origin_repo: RepositoryWebhooks, matchobj: re.Match[str]
-) -> str:
-    if (
-        matchobj.group("owner") == origin_repo.owner.name
-        and matchobj.group("repo") == origin_repo.name
-    ):
-        # Only short hand if link comes from same repo
-        return f"[#{matchobj.group('number')}]({matchobj.group()})"
-    return matchobj.group()
-
-
-def reformat_converted_discussion_header(
-    body: str | None, repo: RepositoryWebhooks
-) -> str | None:
-    if not body:
-        return body
-    body = SUP_HTML.sub(
-        lambda x: "".join(f"\n-# {line}\n" for line in x.group(1).splitlines()), body
-    )
-    body = DISUCSSION_DIV_TAG.sub(r"\g<1>", body)
-    body = GITHUB_DISCUSSION_URL.sub(partial(shorten_same_repo_links, repo), body)
-    return body  # noqa: RET504
+def remove_discussion_div(body: str | None) -> str | None:
+    return DISUCSSION_DIV_TAG.sub(r"\g<1>", body) if body else body
 
 
 class IssueLike(Protocol):
@@ -94,13 +60,14 @@ def register_hooks(bot: GhosttyBot, webhook: Monalisten) -> None:
     @webhook.event.issues.opened
     async def _(event: events.IssuesOpened) -> None:
         issue = event.issue
-        body = reformat_converted_discussion_header(issue.body, event.repository)
+        body = remove_discussion_div(issue.body)
         await send_embed(
             bot,
             event.sender,
             issue_embed_content(issue, "opened {}", body),
             issue_footer(issue, emoji="issue_open"),
             color="green",
+            origin_repo=event.repository,
         )
 
     @webhook.event.issues.closed
@@ -206,4 +173,5 @@ async def _(event: events.IssueCommentCreated) -> None:
             event.sender,
             EmbedContent(title, event.comment.html_url, event.comment.body),
             Footer(emoji, f"{entity}: {issue.title}"),
+            origin_repo=event.repository,
         )

app/components/github_integration/webhooks/prs.py

@@ -58,6 +58,7 @@ async def _(event: events.PullRequestOpened) -> None:
             pr_embed_content(pr, "opened {}", pr.body),
             pr_footer(pr, emoji="pull_open"),
             color="green",
+            origin_repo=event.repository,
         )
 
     @webhook.event.pull_request.closed
@@ -70,6 +71,7 @@ async def _(event: events.PullRequestClosed) -> None:
             pr_embed_content(pr, f"{action} {{}}"),
             pr_footer(pr, emoji="pull_" + action),
             color=color,
+            origin_repo=event.repository,
         )
 
     @webhook.event.pull_request.reopened
@@ -154,6 +156,7 @@ async def _(event: events.PullRequestReviewRequestRemoved) -> None:
             event.sender,
             pr_embed_content(pr, "removed review request for {}", content),
             pr_footer(pr),
+            origin_repo=event.repository,
         )
 
     @webhook.event.pull_request_review.submitted
@@ -186,6 +189,7 @@ async def _(event: events.PullRequestReviewSubmitted) -> None:
             EmbedContent(f"{title} PR #{pr.number}", review.html_url, review.body),
             pr_footer(pr, emoji=emoji),
             color=color,
+            origin_repo=event.repository,
         )
 
     @webhook.event.pull_request_review.dismissed
@@ -227,6 +231,7 @@ async def _(event: events.PullRequestReviewCommentCreated) -> None:
                 content,
             ),
             pr_footer(pr, from_review=True),
+            origin_repo=event.repository,
         )
 
 

app/components/github_integration/webhooks/utils.py

@@ -3,6 +3,7 @@
 import datetime as dt
 import difflib
 import re
+from functools import partial
 from typing import TYPE_CHECKING, Any, Literal, NamedTuple, Protocol, TypedDict
 
 import discord as dc
@@ -12,12 +13,23 @@
 from app.utils import truncate
 
 if TYPE_CHECKING:
-    from githubkit.versions.latest.models import SimpleUser
+    from githubkit.versions.latest.models import RepositoryWebhooks, SimpleUser
 
     from app.bot import EmojiName, GhosttyBot
     from app.config import WebhookFeedType
 
 CODEBLOCK = re.compile(r"`{3,}")
+SUP_HTML = re.compile(r"\s*<su[pb]>(.+?)</su[pb]>\s*")
+GITHUB_DISCUSSION_URL = re.compile(
+    # Ignore if already inside a link block
+    r"(?<!\()"
+        r"https://github\.com/"
+        r"(?P<owner>\b[a-zA-Z0-9\-]+/)"
+        r"(?P<repo>\b[a-zA-Z0-9\-\._]+)"
+        r"(?P<sep>/(?:issues|pull|discussions)/)"
+        r"(?P<number>\d+)"
+    r"(?!\))"
+)  # fmt: skip
 
 type EmbedColor = Literal["green", "red", "purple", "gray", "orange", "blue"]
 
@@ -127,6 +139,18 @@ async def send_edit_difference(
     )
 
 
+def _shorten_same_repo_links(
+    origin_repo: RepositoryWebhooks, matchobj: re.Match[str]
+) -> str:
+    if (
+        matchobj.group("owner") == origin_repo.owner.name
+        and matchobj.group("repo") == origin_repo.name
+    ):
+        # Only short hand if link comes from same repo
+        return f"[#{matchobj.group('number')}]({matchobj.group()})"
+    return matchobj.group()
+
+
 async def send_embed(  # noqa: PLR0913
     bot: GhosttyBot,
     actor: SimpleUser,
@@ -135,10 +159,19 @@ async def send_embed(  # noqa: PLR0913
     *,
     color: EmbedColor | None = None,
     feed_type: WebhookFeedType = "main",
+    origin_repo: RepositoryWebhooks | None = None,
 ) -> None:
+    content_dict = content.dict
+    if origin_repo and (body := content_dict.get("description")):
+        body = SUP_HTML.sub(r"\n-# \g<1>", body)
+        body = GITHUB_DISCUSSION_URL.sub(
+            partial(_shorten_same_repo_links, origin_repo), body
+        )
+        content_dict["description"] = body
+
     author = GitHubUser(**actor.model_dump())
     embed = (
-        dc.Embed(color=color and EMBED_COLORS.get(color), **content.dict)
+        dc.Embed(color=color and EMBED_COLORS.get(color), **content_dict)
         .set_footer(**footer.dict(bot))
         .set_author(**author.model_dump())
     )