fix: webhook factory to work in classes

Author: CoderJoshDK

app/components/github_integration/webhooks/core.py

@@ -24,7 +24,7 @@
     from app.config import WebhookFeedType
 
 type EmbedColor = Literal["green", "red", "purple", "gray", "orange", "blue"]
-type SubhookStore[E] = dict[str, Callable[[E], Awaitable[None]]]
+type SubhookStore[C, E] = dict[str, Callable[[C, E], Awaitable[None]]]
 
 EMBED_COLORS: dict[EmbedColor, int] = {
     "green": 0x3FB950,

app/components/github_integration/webhooks/discussions.py

@@ -35,7 +35,7 @@
     from app.bot import GhosttyBot
     from app.components.github_integration.emoji import EmojiName
 
-discussion_subhooks: SubhookStore[DiscussionEvent] = {}
+discussion_subhooks: SubhookStore[Discussions, DiscussionEvent] = {}
 
 register_discussion_subhook = make_subhook_registrar(discussion_subhooks)
 
@@ -88,7 +88,7 @@ async def _(event: DiscussionCommentEvent) -> None:
         async def _(event: DiscussionEvent) -> None:
             if subhook := discussion_subhooks.get(event.action):
                 with reraise_with_payload(event):
-                    await subhook(event)
+                    await subhook(self, event)
 
     @register_discussion_subhook("created")
     async def handle_created_discussion(self, event: WebhookDiscussionCreated) -> None:

app/components/github_integration/webhooks/issues.py

@@ -35,7 +35,7 @@
     from app.bot import GhosttyBot
     from app.components.github_integration.emoji import EmojiName
 
-issue_subhooks: SubhookStore[IssuesEvent] = {}
+issue_subhooks: SubhookStore[Issues, IssuesEvent] = {}
 
 register_issue_subhook = make_subhook_registrar(issue_subhooks)
 
@@ -105,7 +105,7 @@ async def _(event: IssueCommentEvent) -> None:
         async def _(event: IssuesEvent) -> None:
             if subhook := issue_subhooks.get(event.action):
                 with reraise_with_payload(event):
-                    await subhook(event)
+                    await subhook(self, event)
 
     @register_issue_subhook("opened")
     async def handle_opened_issue(self, event: WebhookIssuesOpened) -> None:

app/components/github_integration/webhooks/prs.py

@@ -20,7 +20,6 @@
     EmbedContent,
     Footer,
     SubhookStore,
-    client,
     make_subhook_registrar,
     reraise_with_payload,
     send_embed,
@@ -64,8 +63,8 @@
 
 HUNK_CODEBLOCK_OVERHEAD = len("```diff\n\n```\n")
 
-pr_subhooks: SubhookStore[PullRequestEvent] = {}
-pr_review_subhooks: SubhookStore[PullRequestReviewEvent] = {}
+pr_subhooks: SubhookStore[PRHook, PullRequestEvent] = {}
+pr_review_subhooks: SubhookStore[PRHook, PullRequestReviewEvent] = {}
 
 register_pr_subhook = make_subhook_registrar(pr_subhooks)
 register_pr_review_subhook = make_subhook_registrar(pr_review_subhooks)
@@ -98,13 +97,6 @@ def pr_embed_content(
     return EmbedContent(template.format(f"PR #{pr.number}"), pr.html_url, body)
 
 
-@client.on("pull_request")
-async def handle_pr_event(event: PullRequestEvent) -> None:
-    if subhook := pr_subhooks.get(event.action):
-        with reraise_with_payload(event):
-            await subhook(event)
-
-
 @final
 class PRHook(commands.Cog):
     def __init__(self, bot: GhosttyBot, monalisten_client: Monalisten) -> None:
@@ -123,7 +115,13 @@ async def _(event: PullRequestReviewCommentEvent) -> None:
         async def _(event: PullRequestReviewEvent) -> None:
             if subhook := pr_review_subhooks.get(event.action):
                 with reraise_with_payload(event):
-                    await subhook(event)
+                    await subhook(self, event)
+
+        @self.monalisten_client.on("pull_request")
+        async def _(event: PullRequestEvent) -> None:
+            if subhook := pr_subhooks.get(event.action):
+                with reraise_with_payload(event):
+                    await subhook(self, event)
 
     @register_pr_subhook("opened")
     async def handle_opened_pr(self, event: WebhookPullRequestOpened) -> None: