Merge branch 'rc/new-plugin' into refactor/new-plugin-system

pkg/platform/sources/aiocqhttp.py

@@ -61,13 +61,13 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 for node in msg.node_list:
                     msg_list.extend((await AiocqhttpMessageConverter.yiri2target(node.message_chain))[0])
             elif isinstance(msg, platform_message.File):
-                msg_list.append({"type":"file", "data":{'file': msg.url, "name": msg.name}})
+                msg_list.append({'type': 'file', 'data': {'file': msg.url, 'name': msg.name}})
             elif isinstance(msg, platform_message.Face):
-                if msg.face_type=='face':
+                if msg.face_type == 'face':
                     msg_list.append(aiocqhttp.MessageSegment.face(msg.face_id))
-                elif msg.face_type=='rps':
+                elif msg.face_type == 'rps':
                     msg_list.append(aiocqhttp.MessageSegment.rps())
-                elif msg.face_type=='dice':
+                elif msg.face_type == 'dice':
                     msg_list.append(aiocqhttp.MessageSegment.dice())
 
             else:
@@ -76,44 +76,130 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
         return msg_list, msg_id, msg_time
 
     @staticmethod
-    async def target2yiri(message: str, message_id: int = -1, bot=None):
+    async def target2yiri(message: str, message_id: int = -1, bot: aiocqhttp.CQHttp = None):
         message = aiocqhttp.Message(message)
 
         def get_face_name(face_id):
             face_code_dict = {
-                "2": '好色',
-                "4": "得意", "5": "流泪", "8": "睡", "9": "大哭", "10": "尴尬", "12": "调皮", "14": "微笑", "16": "酷",
-                "21": "可爱",
-                "23": "傲慢", "24": "饥饿", "25": "困", "26": "惊恐", "27": "流汗", "28": "憨笑", "29": "悠闲",
-                "30": "奋斗",
-                "32": "疑问", "33": "嘘", "34": "晕", "38": "敲打", "39": "再见", "41": "发抖", "42": "爱情",
-                "43": "跳跳",
-                "49": "拥抱", "53": "蛋糕", "60": "咖啡", "63": "玫瑰", "66": "爱心", "74": "太阳", "75": "月亮",
-                "76": "赞",
-                "78": "握手", "79": "胜利", "85": "飞吻", "89": "西瓜", "96": "冷汗", "97": "擦汗", "98": "抠鼻",
-                "99": "鼓掌",
-                "100": "糗大了", "101": "坏笑", "102": "左哼哼", "103": "右哼哼", "104": "哈欠", "106": "委屈",
-                "109": "左亲亲",
-                "111": "可怜", "116": "示爱", "118": "抱拳", "120": "拳头", "122": "爱你", "123": "NO", "124": "OK",
-                "125": "转圈",
-                "129": "挥手", "144": "喝彩", "147": "棒棒糖", "171": "茶", "173": "泪奔", "174": "无奈", "175": "卖萌",
-                "176": "小纠结", "179": "doge", "180": "惊喜", "181": "骚扰", "182": "笑哭", "183": "我最美",
-                "201": "点赞",
-                "203": "托脸", "212": "托腮", "214": "啵啵", "219": "蹭一蹭", "222": "抱抱", "227": "拍手",
-                "232": "佛系",
-                "240": "喷脸", "243": "甩头", "246": "加油抱抱", "262": "脑阔疼", "264": "捂脸", "265": "辣眼睛",
-                "266": "哦哟",
-                "267": "头秃", "268": "问号脸", "269": "暗中观察", "270": "emm", "271": "吃瓜", "272": "呵呵哒",
-                "273": "我酸了",
-                "277": "汪汪", "278": "汗", "281": "无眼笑", "282": "敬礼", "284": "面无表情", "285": "摸鱼",
-                "287": "哦",
-                "289": "睁眼", "290": "敲开心", "293": "摸锦鲤", "294": "期待", "297": "拜谢", "298": "元宝",
-                "299": "牛啊",
-                "305": "右亲亲", "306": "牛气冲天", "307": "喵喵", "314": "仔细分析", "315": "加油", "318": "崇拜",
-                "319": "比心",
-                "320": "庆祝", "322": "拒绝", "324": "吃糖", "326": "生气"
+                '2': '好色',
+                '4': '得意',
+                '5': '流泪',
+                '8': '睡',
+                '9': '大哭',
+                '10': '尴尬',
+                '12': '调皮',
+                '14': '微笑',
+                '16': '酷',
+                '21': '可爱',
+                '23': '傲慢',
+                '24': '饥饿',
+                '25': '困',
+                '26': '惊恐',
+                '27': '流汗',
+                '28': '憨笑',
+                '29': '悠闲',
+                '30': '奋斗',
+                '32': '疑问',
+                '33': '嘘',
+                '34': '晕',
+                '38': '敲打',
+                '39': '再见',
+                '41': '发抖',
+                '42': '爱情',
+                '43': '跳跳',
+                '49': '拥抱',
+                '53': '蛋糕',
+                '60': '咖啡',
+                '63': '玫瑰',
+                '66': '爱心',
+                '74': '太阳',
+                '75': '月亮',
+                '76': '赞',
+                '78': '握手',
+                '79': '胜利',
+                '85': '飞吻',
+                '89': '西瓜',
+                '96': '冷汗',
+                '97': '擦汗',
+                '98': '抠鼻',
+                '99': '鼓掌',
+                '100': '糗大了',
+                '101': '坏笑',
+                '102': '左哼哼',
+                '103': '右哼哼',
+                '104': '哈欠',
+                '106': '委屈',
+                '109': '左亲亲',
+                '111': '可怜',
+                '116': '示爱',
+                '118': '抱拳',
+                '120': '拳头',
+                '122': '爱你',
+                '123': 'NO',
+                '124': 'OK',
+                '125': '转圈',
+                '129': '挥手',
+                '144': '喝彩',
+                '147': '棒棒糖',
+                '171': '茶',
+                '173': '泪奔',
+                '174': '无奈',
+                '175': '卖萌',
+                '176': '小纠结',
+                '179': 'doge',
+                '180': '惊喜',
+                '181': '骚扰',
+                '182': '笑哭',
+                '183': '我最美',
+                '201': '点赞',
+                '203': '托脸',
+                '212': '托腮',
+                '214': '啵啵',
+                '219': '蹭一蹭',
+                '222': '抱抱',
+                '227': '拍手',
+                '232': '佛系',
+                '240': '喷脸',
+                '243': '甩头',
+                '246': '加油抱抱',
+                '262': '脑阔疼',
+                '264': '捂脸',
+                '265': '辣眼睛',
+                '266': '哦哟',
+                '267': '头秃',
+                '268': '问号脸',
+                '269': '暗中观察',
+                '270': 'emm',
+                '271': '吃瓜',
+                '272': '呵呵哒',
+                '273': '我酸了',
+                '277': '汪汪',
+                '278': '汗',
+                '281': '无眼笑',
+                '282': '敬礼',
+                '284': '面无表情',
+                '285': '摸鱼',
+                '287': '哦',
+                '289': '睁眼',
+                '290': '敲开心',
+                '293': '摸锦鲤',
+                '294': '期待',
+                '297': '拜谢',
+                '298': '元宝',
+                '299': '牛啊',
+                '305': '右亲亲',
+                '306': '牛气冲天',
+                '307': '喵喵',
+                '314': '仔细分析',
+                '315': '加油',
+                '318': '崇拜',
+                '319': '比心',
+                '320': '庆祝',
+                '322': '拒绝',
+                '324': '吃糖',
+                '326': '生气',
             }
-            return face_code_dict.get(face_id,'')
+            return face_code_dict.get(face_id, '')
 
         async def process_message_data(msg_data, reply_list):
             if msg_data['type'] == 'image':
@@ -156,10 +242,10 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
             elif msg.type == 'text':
                 yiri_msg_list.append(platform_message.Plain(text=msg.data['text']))
             elif msg.type == 'image':
-                emoji_id = msg.data.get("emoji_package_id", None)
+                emoji_id = msg.data.get('emoji_package_id', None)
                 if emoji_id:
                     face_id = emoji_id
-                    face_name = msg.data.get("summary", '')
+                    face_name = msg.data.get('summary', '')
                     image_msg = platform_message.Face(face_id=face_id, face_name=face_name)
                 else:
                     image_base64, image_format = await image.qq_image_url_to_base64(msg.data['url'])
@@ -185,27 +271,28 @@ class AiocqhttpMessageConverter(abstract_platform_adapter.AbstractMessageConvert
                 yiri_msg_list.append(reply_msg)
 
             elif msg.type == 'file':
+                pass
                 # file_name = msg.data['file']
-                file_id = msg.data['file_id']
-                file_data = await bot.get_file(file_id=file_id)
-                file_name = file_data.get('file_name')
-                file_path = file_data.get('file')
-                _ = file_path
-                file_url = file_data.get('file_url')
-                file_size = file_data.get('file_size')
-                yiri_msg_list.append(platform_message.File(id=file_id, name=file_name,url=file_url,size=file_size))
+                # file_id = msg.data['file_id']
+                # file_data = await bot.get_file(file_id=file_id)
+                # file_name = file_data.get('file_name')
+                # file_path = file_data.get('file')
+                # _ = file_path
+                # file_url = file_data.get('file_url')
+                # file_size = file_data.get('file_size')
+                # yiri_msg_list.append(platform_message.File(id=file_id, name=file_name,url=file_url,size=file_size))
             elif msg.type == 'face':
                 face_id = msg.data['id']
                 face_name = msg.data['raw']['faceText']
                 if not face_name:
                     face_name = get_face_name(face_id)
-                yiri_msg_list.append(platform_message.Face(face_id=int(face_id),face_name=face_name.replace('/','')))
+                yiri_msg_list.append(platform_message.Face(face_id=int(face_id), face_name=face_name.replace('/', '')))
             elif msg.type == 'rps':
                 face_id = msg.data['result']
-                yiri_msg_list.append(platform_message.Face(face_type="rps",face_id=int(face_id),face_name='猜拳'))
+                yiri_msg_list.append(platform_message.Face(face_type='rps', face_id=int(face_id), face_name='猜拳'))
             elif msg.type == 'dice':
                 face_id = msg.data['result']
-                yiri_msg_list.append(platform_message.Face(face_type='dice',face_id=int(face_id),face_name='骰子'))
+                yiri_msg_list.append(platform_message.Face(face_type='dice', face_id=int(face_id), face_name='骰子'))
 
         chain = platform_message.MessageChain(yiri_msg_list)
 
@@ -221,7 +308,6 @@ class AiocqhttpEventConverter(abstract_platform_adapter.AbstractEventConverter):
     async def target2yiri(event: aiocqhttp.Event, bot=None):
         yiri_chain = await AiocqhttpMessageConverter.target2yiri(event.message, event.message_id, bot)
 
-
         if event.message_type == 'group':
             permission = 'MEMBER'