✨ add message and type

Author: yanyongyu

codegen/__init__.py

@@ -8,6 +8,21 @@
 from githubkit.webhooks.models import GitHubWebhookModel
 from githubkit.webhooks.types import webhook_action_types
 
+MESSAGE_EVENTS = {
+    "CommitCommentCreated",
+    "IssueCommentCreated",
+    "PullRequestReviewCommentCreated",
+}
+HAS_MESSAGE_EVENTS = {
+    "CommitCommentCreated",
+    "IssueCommentCreated",
+    "IssueCommentDeleted",
+    "IssueCommentEdited",
+    "PullRequestReviewCommentCreated",
+    "PullRequestReviewCommentDeleted",
+    "PullRequestReviewCommentEdited",
+}
+
 
 @dataclass
 class Data:
@@ -45,5 +60,10 @@ def build_event():
 
     env = Environment(loader=PackageLoader("codegen"))
     template = env.get_template("event.py.jinja")
-    event_text = template.render(imports=imports, events=events)
+    event_text = template.render(
+        imports=imports,
+        events=events,
+        message_events=MESSAGE_EVENTS,
+        has_message_events=HAS_MESSAGE_EVENTS,
+    )
     Path("./nonebot/adapters/github/event.py").write_text(event_text)

codegen/templates/event.py.jinja

@@ -1,14 +1,16 @@
 from typing import Any, Union
+from functools import cached_property
 
 {% for import_ in imports %}
 from githubkit.webhooks.models import {{ import_ }}
 {% endfor %}
-from githubkit.utils import UNSET
 from nonebot.typing import overrides
 from nonebot.utils import escape_tag
 
 from nonebot.adapters import Event as BaseEvent
 
+from .message import Message
+
 
 class Event(BaseEvent):
     id: str
@@ -67,4 +69,21 @@ class Event(BaseEvent):
 class {{ event.class_name }}(Event):
     payload: {{ event.payload_type }}
 
+    {% if event.class_name in message_events %}
+    @overrides(Event)
+    def get_type(self) -> str:
+        return "message"
+    {% endif %}
+
+    {% if event.class_name in has_message_events %}
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
+    {% endif %}
 {% endfor %}

nonebot/adapters/github/event.py

@@ -1,6 +1,6 @@
 from typing import Any, Union
+from functools import cached_property
 
-from githubkit.utils import UNSET
 from nonebot.typing import overrides
 from nonebot.utils import escape_tag
 from githubkit.webhooks.models import ForkEvent as ForkEventPayload
@@ -379,6 +379,8 @@
 
 from nonebot.adapters import Event as BaseEvent
 
+from .message import Message
+
 
 class Event(BaseEvent):
     id: str
@@ -551,6 +553,18 @@ class CodeScanningAlertReopenedByUser(Event):
 class CommitCommentCreated(Event):
     payload: CommitCommentCreatedPayload
 
+    @overrides(Event)
+    def get_type(self) -> str:
+        return "message"
+
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class DeployKeyCreated(Event):
     payload: DeployKeyCreatedPayload
@@ -667,14 +681,42 @@ class InstallationRepositoriesRemoved(Event):
 class IssueCommentCreated(Event):
     payload: IssueCommentCreatedPayload
 
+    @overrides(Event)
+    def get_type(self) -> str:
+        return "message"
+
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class IssueCommentDeleted(Event):
     payload: IssueCommentDeletedPayload
 
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class IssueCommentEdited(Event):
     payload: IssueCommentEditedPayload
 
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class IssuesAssigned(Event):
     payload: IssuesAssignedPayload
@@ -1021,14 +1063,42 @@ class PullRequestReviewSubmitted(Event):
 class PullRequestReviewCommentCreated(Event):
     payload: PullRequestReviewCommentCreatedPayload
 
+    @overrides(Event)
+    def get_type(self) -> str:
+        return "message"
+
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class PullRequestReviewCommentDeleted(Event):
     payload: PullRequestReviewCommentDeletedPayload
 
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class PullRequestReviewCommentEdited(Event):
     payload: PullRequestReviewCommentEditedPayload
 
+    @cached_property
+    def _message(self):
+        return Message(self.payload.comment.body)
+
+    @overrides(Event)
+    def get_message(self):
+        return self._message
+
 
 class PullRequestReviewThreadResolved(Event):
     payload: PullRequestReviewThreadResolvedPayload

nonebot/adapters/github/message.py

@@ -0,0 +1,39 @@
+from typing import Type, Iterable
+
+from nonebot.typing import overrides
+
+from nonebot.adapters import Message as BaseMessage
+from nonebot.adapters import MessageSegment as BaseMessageSegment
+
+
+class MessageSegment(BaseMessageSegment["Message"]):
+    @classmethod
+    @overrides(BaseMessageSegment)
+    def get_message_class(cls) -> Type["Message"]:
+        return Message
+
+    @overrides(BaseMessageSegment)
+    def __str__(self) -> str:
+        if self.type == "markdown":
+            return self.data["text"]
+        return f"<{self.type}:{','.join(f'{k}={v}' for k, v in self.data.items())}>"
+
+    @overrides(BaseMessageSegment)
+    def is_text(self) -> bool:
+        return self.type == "markdown"
+
+    @staticmethod
+    def markdown(text: str) -> "MessageSegment":
+        return MessageSegment("markdown", {"text": text})
+
+
+class Message(BaseMessage[MessageSegment]):
+    @classmethod
+    @overrides(BaseMessage)
+    def get_segment_class(cls) -> Type[MessageSegment]:
+        return MessageSegment
+
+    @staticmethod
+    @overrides(BaseMessage)
+    def _construct(msg: str) -> Iterable[MessageSegment]:
+        yield MessageSegment.markdown(msg)