feat: add more discussion state emojis (#383)

Author: trag1c

app/bot.py

@@ -29,6 +29,8 @@
     "commit",
     "discussion",
     "discussion_answered",
+    "discussion_duplicate",
+    "discussion_outdated",
     "issue_closed_completed",
     "issue_closed_unplanned",
     "issue_open",

app/components/github_integration/comments/discussions.py

@@ -25,6 +25,8 @@
         }
         created_at: createdAt
         html_url: url
+        state_reason: stateReason
+        closed
         answer {
           user: author {
             login

app/components/github_integration/entities/discussions.py

@@ -15,6 +15,8 @@
       }
       created_at: createdAt
       html_url: url
+      state_reason: stateReason
+      closed
       answer {
         user: author {
           login

app/components/github_integration/entities/fmt.py

@@ -35,8 +35,12 @@ def get_entity_emoji(bot: GhosttyBot, entity: Entity) -> dc.Emoji:
         )  # fmt: skip
     elif isinstance(entity, Discussion):
         emoji_name = "discussion"
-        if entity.answered_by:
-            emoji_name += "_answered"
+        if entity.closed or entity.answered_by:
+            emoji_name += (
+                "_duplicate" if entity.state_reason == "DUPLICATE"
+                else "_outdated" if entity.state_reason == "OUTDATED"
+                else "_answered"
+            )  # fmt: skip
     else:
         msg = f"Unknown entity type: {type(entity)}"
         raise TypeError(msg)

app/components/github_integration/models.py

@@ -117,6 +117,8 @@ class PullRequest(Entity):
 
 class Discussion(Entity):
     answered_by: GitHubUser | None
+    closed: bool
+    state_reason: Literal["DUPLICATE", "RESOLVED", "OUTDATED", "REOPENED"] | None
 
 
 class EntityGist(NamedTuple):

app/components/github_integration/webhooks/discussions.py

@@ -23,17 +23,25 @@ class DiscussionLike(Protocol):
     category: DiscussionPropCategory
     answer_html_url: str | None
     state: Literal["open", "closed", "locked", "converting", "transferring"]
+    state_reason: Literal["resolved", "outdated", "duplicate", "reopened"] | None
+
+
+def get_discussion_emoji(discussion: DiscussionLike) -> EmojiName:
+    emoji = "discussion"
+    if discussion.state_reason in ("outdated", "duplicate"):
+        emoji += "_" + discussion.state_reason
+    elif discussion.answer_html_url or discussion.state == "closed":
+        emoji += "_answered"
+    return emoji
 
 
 def discussion_footer(
     discussion: DiscussionLike, *, emoji: EmojiName | None = None
 ) -> Footer:
-    emoji = emoji or (
-        "discussion_answered"
-        if discussion.answer_html_url or discussion.state == "closed"
-        else "discussion"
+    return Footer(
+        emoji or get_discussion_emoji(discussion),
+        f"Discussion #{discussion.number}: {discussion.title}",
     )
-    return Footer(emoji, f"Discussion #{discussion.number}: {discussion.title}")
 
 
 def discussion_embed_content(
@@ -74,12 +82,11 @@ async def _(event: events.DiscussionClosed) -> None:
     @webhook.event.discussion.reopened
     async def _(event: events.DiscussionReopened) -> None:
         discussion = event.discussion
-        emoji = "discussion_answered" if discussion.answer_html_url else "discussion"
         await send_embed(
             bot,
             event.sender,
             discussion_embed_content(discussion, "reopened"),
-            discussion_footer(discussion, emoji=emoji),
+            discussion_footer(discussion),
             color="gray",
             feed_type="discussions",
         )
@@ -104,25 +111,23 @@ async def _(event: events.DiscussionAnswered) -> None:
     @webhook.event.discussion.unanswered
     async def _(event: events.DiscussionUnanswered) -> None:
         discussion = event.discussion
-        emoji = "discussion_answered" if discussion.state == "closed" else "discussion"
         await send_embed(
             bot,
             event.sender or cast("SimpleUser", GitHubUser.default()),
             discussion_embed_content(discussion, "unmarked an answer for"),
-            discussion_footer(discussion, emoji=emoji),
+            discussion_footer(discussion),
             color="red",
             feed_type="discussions",
         )
 
     @webhook.event.discussion.locked
     async def _(event: events.DiscussionLocked) -> None:
         discussion = event.discussion
-        emoji = "discussion_answered" if discussion.answer_html_url else "discussion"
         await send_embed(
             bot,
             event.sender,
             discussion_embed_content(discussion, "locked"),
-            discussion_footer(discussion, emoji=emoji),
+            discussion_footer(discussion),
             color="orange",
             feed_type="discussions",
         )

tests/test_close_help_post.py

@@ -22,6 +22,7 @@ def fill_entity(**kwargs: Any) -> SimpleNamespace:
         "user": GitHubUser(login="", url="", icon_url=""),
         "created_at": dt.datetime(1, 1, 1, tzinfo=dt.UTC),
         "state": False,
+        "closed": False,
         "state_reason": None,
         "draft": False,
         "merged": False,