🚧 Middleware(Telegram): add more actions

Author: j1g5awi

nonebot_plugin_all4one/middlewares/telegram.py

@@ -48,7 +48,7 @@ async def to_onebot_event(self, event: Event) -> List[OneBotEvent]:
             event_dict["time"] = event.date
             event_dict["detail_type"] = event.get_event_name().split(".")[1]
             event_dict["sub_type"] = ""
-            event_dict["message_id"] = str(event.message_id)
+            event_dict["message_id"] = f"{event.chat.id}/{event.message_id}"
             event_dict["message"] = await self.to_onebot_message(event.message)
             event_dict["alt_message"] = str(event.message)
             if isinstance(event, PrivateMessageEvent):
@@ -65,7 +65,7 @@ async def to_onebot_event(self, event: Event) -> List[OneBotEvent]:
                 event_dict["message"].insert(
                     0,
                     OneBotMessageSegment.reply(
-                        str(event.reply_to_message.message_id),
+                        f"{event.reply_to_message.chat.id}/{event.reply_to_message.message_id}",
                         user_id=event.reply_to_message.get_user_id()
                         if not isinstance(event.reply_to_message, ChannelPostEvent)
                         else "",
@@ -204,7 +204,9 @@ async def send_message(
 
         reply_to_message_id = None
         if message.count("reply"):
-            reply_to_message_id = int(message["reply", 0].data["message_id"])
+            reply_to_message_id = int(
+                message["reply", 0].data["message_id"].split("/")[1]
+            )
 
         result = await self.send(
             int(chat_id),
@@ -217,6 +219,10 @@ async def send_message(
             result = result[0]
         return {"message_id": str(result.message_id), "time": result.date}
 
+    @supported_action
+    async def delete_message(self, *, message_id: str, **kwargs: Any) -> None:
+        await self.bot.delete_message(*map(int, message_id.split("/")))
+
     @supported_action
     async def get_self_info(
         self, **kwargs: Any
@@ -270,3 +276,48 @@ async def set_group_name(
     @supported_action
     async def leave_group(self, *, group_id: str, **kwargs: Any) -> None:
         await self.bot.leave_chat(int(group_id))
+
+    @supported_action
+    async def get_guild_info(
+        self, *, guild_id: str, **kwargs: Any
+    ) -> Dict[Union[Literal["guild_id", "guild_name"], str], str]:
+        result = await self.bot.get_chat(int(guild_id))
+        return {"guild_id": str(result.id), "guild_id": result.title}  # type: ignore
+
+    @supported_action
+    async def set_guild_name(
+        self, *, guild_id: str, guild_name: str, **kwargs: Any
+    ) -> None:
+        await self.bot.set_chat_title(int(guild_id), guild_name)
+
+    @supported_action
+    async def get_guild_member_info(
+        self, *, guild_id: str, user_id: str, **kwargs: Any
+    ) -> Dict[Union[Literal["user_id", "user_name", "user_displayname"], str], str]:
+        result = await self.bot.get_chat_member(int(guild_id), int(user_id))
+        return {
+            "user_id": str(result.user.id),
+            "user_name": result.user.username if result.user.username else "",
+            "user_displayname": result.user.first_name,
+        }
+
+    @supported_action
+    async def leave_guild(self, *, guild_id: str, **kwargs: Any) -> None:
+        await self.bot.leave_chat(int(guild_id))
+
+    @supported_action
+    async def set_channel_name(
+        self, *, guild_id: str, channel_id: str, channel_name: str, **kwargs: Any
+    ) -> None:
+        await self.bot.edit_forum_topic(int(guild_id), int(channel_id), channel_name)
+
+    @supported_action
+    async def get_channel_member_info(
+        self, *, guild_id: str, channel_id: str, user_id: str, **kwargs: Any
+    ) -> Dict[Union[Literal["user_id", "user_name", "user_displayname"], str], str]:
+        result = await self.bot.get_chat_member(int(guild_id), int(user_id))
+        return {
+            "user_id": str(result.user.id),
+            "user_name": result.user.username if result.user.username else "",
+            "user_displayname": result.user.first_name,
+        }

tests/middlewares/telegram/test_telegram.py

@@ -2,10 +2,14 @@
 from pathlib import Path
 
 from nonebug import App
-from nonebot.adapters.telegram import Bot, Event
-from nonebot.adapters.telegram.model import File
+from nonebot.adapters.telegram.model import Chat
+from nonebot.adapters.telegram.model import Message
 from nonebot.adapters.telegram.config import BotConfig
+from nonebot.adapters.telegram.message import File, Entity
 from nonebot.adapters.onebot.v12 import PrivateMessageEvent
+from nonebot.adapters.telegram import Bot, Event, MessageSegment
+from nonebot.adapters.telegram.model import File as TelegramFile
+from nonebot.adapters.onebot.v12 import MessageSegment as OneBotMessageSegment
 
 bot_config = BotConfig(token="1234567890:ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHI")
 
@@ -33,7 +37,7 @@ async def test_to_onebot_event(app: App):
         ctx.should_call_api(
             "get_file",
             {"file_id": "AwADBAADbXXXXXXXXXXXGBdhD2l6_XX"},
-            File(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
+            TelegramFile(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
         )
         event = await middleware.to_onebot_event(event)
         assert isinstance(event[0], PrivateMessageEvent)
@@ -43,7 +47,7 @@ async def test_to_onebot_event(app: App):
         ctx.should_call_api(
             "get_file",
             {"file_id": "AwADBAADbXXXXXXXXXXXGBdhD2l6_XX"},
-            File(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
+            TelegramFile(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
         )
         event = await middleware.to_onebot_event(event)
         assert isinstance(event[0], PrivateMessageEvent)
@@ -53,8 +57,58 @@ async def test_to_onebot_event(app: App):
         ctx.should_call_api(
             "get_file",
             {"file_id": "AwADBAADbXXXXXXXXXXXGBdhD2l6_XX"},
-            File(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
+            TelegramFile(file_id="AwADBAADbXXXXXXXXXXXGBdhD2l6_XX", file_unique_id=""),
         )
         event = await middleware.to_onebot_event(event)
         assert isinstance(event[0], PrivateMessageEvent)
         assert event[0].message[0].type == "file"
+
+
+async def test_send_message(app: App):
+    from nonebot_plugin_all4one.database import upload_file
+    from nonebot_plugin_all4one.middlewares.telegram import Middleware
+
+    async with app.test_api() as ctx:
+        bot = ctx.create_bot(base=Bot, self_id=bot_config)  # type:ignore
+        middleware = Middleware(bot)
+
+        class FakeEvent(Event):
+            chat: Chat
+
+        fake_event = FakeEvent(
+            **{
+                "chat": Chat(id=1111, type="private"),
+                "message_thread_id": None,
+            }
+        )
+
+        file_id = await upload_file(
+            name="test",
+            data=b"test",
+            src=middleware.get_platform(),
+            src_id="test",
+        )
+        ctx.should_call_send(
+            fake_event,
+            Entity.text("Test") + File.photo("test"),
+            Message(message_id=2222, date=1, chat=fake_event.chat),
+            reply_to_message_id=None,
+        )
+        await middleware.send_message(
+            detail_type="private",
+            user_id="1111",
+            message=OneBotMessageSegment.text("Test")
+            + OneBotMessageSegment.image(file_id),
+        )
+
+
+async def test_delete_message(app: App):
+    from nonebot_plugin_all4one.middlewares.telegram import Middleware
+
+    async with app.test_api() as ctx:
+        bot = ctx.create_bot(base=Bot, self_id=bot_config)  # type:ignore
+        middleware = Middleware(bot)
+        ctx.should_call_api(
+            "delete_message", {"chat_id": 1111, "message_id": 2222}, True
+        )
+        await middleware.delete_message(message_id="1111/2222")