Merge pull request #21 from ieew/dev

Dev
ieew · Apr 9, 2022 · 7417013 · 7417013
2 parents 52c9978 + a6607ff
commit 7417013
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 55 deletions.
diff --git a/nonebot/adapters/mirai2/adapter.py b/nonebot/adapters/mirai2/adapter.py
@@ -1,5 +1,6 @@
 import asyncio
 import json
+import re
 from typing import Any, Dict, List, Literal, Optional, cast
 from nonebot.typing import overrides
 from nonebot.exception import ActionFailed
@@ -122,6 +123,9 @@ async def _call_api(
     ) -> Any:
 
         def snake_to_camel(name: str):
+            for i in ['anno', 'resp']:
+                if re.match(i, name):
+                    return name
             first, *rest = name.split('_')
             return ''.join([first.lower(), *(r.title() for r in rest)])
 

diff --git a/nonebot/adapters/mirai2/bot.pyi b/nonebot/adapters/mirai2/bot.pyi
@@ -625,12 +625,12 @@ class Bot(BaseBot):
         content: str,
         send_to_new_member: Optional[bool],
         pinned: Optional[bool],
-        showEditCard: Optional[bool],
-        showPopup: Optional[bool],
-        requireConfirmation: Optional[bool],
-        imageUrl: Optional[str],
-        imagePath: Optional[str],
-        imageBase64: Optional[str]
+        show_edit_card: Optional[bool],
+        show_popup: Optional[bool],
+        require_confirmation: Optional[bool],
+        image_url: Optional[str],
+        image_path: Optional[str],
+        image_base64: Optional[str]
     ):
         """
         :说明:

diff --git a/nonebot/adapters/mirai2/event/request.py b/nonebot/adapters/mirai2/event/request.py
@@ -1,3 +1,4 @@
+from ast import operator
 from typing import TYPE_CHECKING
 
 from pydantic import Field
@@ -31,14 +32,14 @@ async def approve(self, bot: "Bot"):
 
           * ``bot: Bot``: 当前的 ``Bot`` 对象
         """
-        return await bot.api.post('/resp/newFriendRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': 0,
-                                      'message': ''
-                                  })
+        return await bot.resp_newFriendRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=0,
+                              message=''
+                          )
+
 
     async def reject(self,
                      bot: "Bot",
@@ -60,14 +61,13 @@ async def reject(self,
           * ``message: str``: 回复的信息
         """
         assert operate > 0
-        return await bot.api.post('/resp/newFriendRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': operate,
-                                      'message': message
-                                  })
+        return await bot.resp_newFriendRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=operate,
+                              message=message
+                          )
 
 
 class MemberJoinRequestEvent(RequestEvent):
@@ -86,14 +86,14 @@ async def approve(self, bot: "Bot"):
 
           * ``bot: Bot``: 当前的 ``Bot`` 对象
         """
-        return await bot.api.post('/resp/memberJoinRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': 0,
-                                      'message': ''
-                                  })
+        return await bot.resp_memberJoinRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=0,
+                              message=''
+                          )
+
 
     async def reject(self,
                      bot: "Bot",
@@ -117,14 +117,13 @@ async def reject(self,
           * ``message: str``: 回复的信息
         """
         assert operate > 0
-        return await bot.api.post('/resp/memberJoinRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': operate,
-                                      'message': message
-                                  })
+        return await bot.resp_memberJoinRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=operate,
+                              message=message
+                          )
 
 
 class BotInvitedJoinGroupRequestEvent(RequestEvent):
@@ -143,14 +142,14 @@ async def approve(self, bot: "Bot"):
 
           * ``bot: Bot``: 当前的 ``Bot`` 对象
         """
-        return await bot.api.post('/resp/botInvitedJoinGroupRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': 0,
-                                      'message': ''
-                                  })
+        return await bot.resp_botInvitedJoinGroupRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=0,
+                              message=''
+                          )
+
 
     async def reject(self, bot: "Bot", message: str = ""):
         """
@@ -163,11 +162,10 @@ async def reject(self, bot: "Bot", message: str = ""):
           * ``bot: Bot``: 当前的 ``Bot`` 对象
           * ``message: str``: 邀请消息
         """
-        return await bot.api.post('/resp/botInvitedJoinGroupRequestEvent',
-                                  params={
-                                      'eventId': self.event_id,
-                                      'groupId': self.group_id,
-                                      'fromId': self.from_id,
-                                      'operate': 1,
-                                      'message': message
-                                  })
+        return await bot.resp_botInvitedJoinGroupRequestEvent(
+                              event_id=self.event_id,
+                              group_id=self.group_id,
+                              from_id=self.from_id,
+                              operate=1,
+                              message=message
+                          )
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot_adapter_mirai2"
-version = "0.0.10"
+version = "0.0.11"
 description = "兼容 MiraiApiHttp2.x 的 nonebot2_adapter"
 authors = ["ieew <i@ieew.cc>"]
 license = "AGPL-3.0"