fix: 修复 keyboard

.github/workflows/pylint.yml

@@ -7,7 +7,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                python-version: [ '3.8', '3.9' ]
+                python-version: [ '3.8' ]
         steps:
             -   uses: actions/checkout@v3
             -   name: Set up Python ${{ matrix.python-version }}

amiyabot/adapters/tencent/qqGroup/builder.py

@@ -213,6 +213,24 @@ async def insert_media(url: str, file_type: int = 1):
         if isinstance(item, Html):
             await insert_media(await item.create_html_image())
 
+        # Ark
+        if isinstance(item, Ark):
+            payload.msg_type = 3
+            payload.ark = item.get()['ark']
+
+            refresh_payload()
+
+        # Markdown
+        if isinstance(item, Markdown):
+            md = item.get()
+
+            payload.msg_type = 2
+            payload.markdown = md['markdown']
+            if 'keyboard' in md:
+                payload.keyboard = md['keyboard']
+
+            refresh_payload()
+
     if payload.content:
         payload_list.append(payload)
 

amiyabot/builtin/lib/imageCreator.py

@@ -81,8 +81,7 @@ def __parse(self):
             length += self.__font_seat(char)[0]
             sub_text += char
 
-            if length > self.width_seat:
-                self.width_seat = length
+            self.width_seat = max(self.width_seat, length)
 
             is_end = idx == len(text) - 1
             if length >= self.max_seat or char == '\n' or is_end:

amiyabot/builtin/messageChain/keyboard.py

@@ -4,7 +4,7 @@
 
 @dataclass
 class Permission:
-    type: int = 1
+    type: int = 2
     specify_role_ids: List[str] = field(default_factory=lambda: ['1', '2', '3'])
     specify_user_ids: List[str] = field(default_factory=lambda: [])
 
@@ -13,17 +13,20 @@ class Permission:
 class RenderData:
     label: str = ''
     visited_label: str = ''
+    style: int = 0
 
 
 @dataclass
 class Action:
-    type: int = 1
+    type: int = 2
     data: str = ''
+    anchor: int = 0
     unsupport_tips: str = ''
 
+    click_limit: int = 10
+
     reply: bool = False
     enter: bool = False
-    anchor: bool = False
     at_bot_show_channel_list: bool = False
 
     permission: Permission = field(default_factory=Permission)
@@ -43,21 +46,43 @@ class Row:
     def add_button(
         self,
         button: Union[str, Button],
-        label: str,
-        visited_label: Optional[str] = None,
-        action_type: int = 1,
+        rander_label: str,
+        rander_visited_label: str = '',
+        rander_style: int = 0,
+        action_type: int = 2,
         action_data: str = '',
+        action_anchor: int = 0,
+        action_unsupport_tips: str = '',
+        action_click_limit: int = 10,
+        action_reply: bool = False,
+        action_enter: bool = False,
+        action_at_bot_show_channel_list: bool = False,
+        permission_type: int = 2,
+        permission_specify_role_ids: Optional[List[str]] = None,
+        permission_specify_user_ids: Optional[List[str]] = None,
     ):
         if len(self.buttons) >= 5:
             raise OverflowError('Create up to 5 buttons per row')
 
         if isinstance(button, str):
             button = Button(button)
 
-        button.render_data.label = label
-        button.render_data.visited_label = visited_label or label
+        button.render_data.label = rander_label
+        button.render_data.visited_label = rander_visited_label or rander_label
+        button.render_data.style = rander_style
+
         button.action.type = action_type
-        button.action.data = action_data or button.id
+        button.action.data = action_data or rander_label
+        button.action.anchor = action_anchor
+        button.action.unsupport_tips = action_unsupport_tips
+        button.action.click_limit = action_click_limit
+        button.action.reply = action_reply
+        button.action.enter = action_enter
+        button.action.at_bot_show_channel_list = action_at_bot_show_channel_list
+
+        button.action.permission.type = permission_type
+        button.action.permission.specify_role_ids = permission_specify_role_ids
+        button.action.permission.specify_user_ids = permission_specify_user_ids
 
         self.buttons.append(button)
 

requirements.txt

@@ -9,12 +9,12 @@ jieba~=0.42.1
 peewee~=3.14.10
 pillow~=9.5.0
 playwright~=1.31.1
-pydantic~=1.9.1
+pydantic~=1.10.0
 pymysql~=1.0.2
 pyyaml~=6.0
 requests~=2.27.1
 setuptools~=60.2.0
 starlette~=0.19.1
 uvicorn~=0.18.2
 websockets~=10.1
-zhon~=1.1.5
+zhon~=1.1.5