From cd72e48bbb22cad94e8acb2c559bce99be95811c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=83=E7=90=86?= <metaleo@foxmail.com>
Date: Sat, 1 Jun 2024 12:19:38 +0800
Subject: [PATCH] =?UTF-8?q?OnebotV11=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=94=B6=E5=88=B0=E9=87=8D=E5=A4=8Dflag=E7=9A=84=E5=A5=BD?=
 =?UTF-8?q?=E5=8F=8B=E3=80=81=E5=8A=A0=E7=BE=A4=E9=82=80=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: 仑质 <benzenpenxil@foxmail.com>
---
 OlivOS/adapter/onebotV11/onebotSDK.py | 61 +++++++++++++++------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/OlivOS/adapter/onebotV11/onebotSDK.py b/OlivOS/adapter/onebotV11/onebotSDK.py
index b2a30900..5c3d6fac 100644
--- a/OlivOS/adapter/onebotV11/onebotSDK.py
+++ b/OlivOS/adapter/onebotV11/onebotSDK.py
@@ -29,6 +29,8 @@
     'para_default'
 ]
 
+gFlagCheckList = []
+
 class bot_info_T(object):
     def __init__(self, id=-1, host='', port=-1, access_token=None):
         self.id = id
@@ -184,6 +186,7 @@ def format_cq_code_msg(msg):
 
 # 支持OlivOS API事件生成的映射实现
 def get_Event_from_SDK(target_event):
+    global gFlagCheckList
     target_event.base_info['time'] = target_event.sdk_event.base_info.get('time', int(time.time()))
     target_event.base_info['self_id'] = str(target_event.sdk_event.base_info['self_id'])
     target_event.base_info['type'] = target_event.sdk_event.base_info['post_type']
@@ -420,33 +423,37 @@ def get_Event_from_SDK(target_event):
                 elif target_event.sdk_event.json['honor_type'] == 'emotion':
                     target_event.data.type = 'emotion'
     elif target_event.base_info['type'] == 'request':
-        if target_event.sdk_event.json['request_type'] == 'friend':
-            target_event.active = True
-            target_event.plugin_info['func_type'] = 'friend_add_request'
-            target_event.data = target_event.friend_add_request(
-                str(target_event.sdk_event.json['user_id']),
-                target_event.sdk_event.json['comment']
-            )
-            target_event.data.flag = target_event.sdk_event.json['flag']
-        elif target_event.sdk_event.json['request_type'] == 'group':
-            if target_event.sdk_event.json['sub_type'] == 'add':
-                target_event.active = True
-                target_event.plugin_info['func_type'] = 'group_add_request'
-                target_event.data = target_event.group_add_request(
-                    str(target_event.sdk_event.json['group_id']),
-                    str(target_event.sdk_event.json['user_id']),
-                    target_event.sdk_event.json['comment']
-                )
-                target_event.data.flag = target_event.sdk_event.json['flag']
-            elif target_event.sdk_event.json['sub_type'] == 'invite':
-                target_event.active = True
-                target_event.plugin_info['func_type'] = 'group_invite_request'
-                target_event.data = target_event.group_invite_request(
-                    str(target_event.sdk_event.json['group_id']),
-                    str(target_event.sdk_event.json['user_id']),
-                    target_event.sdk_event.json['comment']
-                )
-                target_event.data.flag = target_event.sdk_event.json['flag']
+        if 'flag' in target_event.sdk_event.json:
+            tmp_flag = target_event.sdk_event.json['flag']
+            if tmp_flag not in gFlagCheckList:
+                gFlagCheckList.append(tmp_flag)
+                if target_event.sdk_event.json['request_type'] == 'friend':
+                    target_event.active = True
+                    target_event.plugin_info['func_type'] = 'friend_add_request'
+                    target_event.data = target_event.friend_add_request(
+                        str(target_event.sdk_event.json['user_id']),
+                        target_event.sdk_event.json['comment']
+                    )
+                    target_event.data.flag = tmp_flag
+                elif target_event.sdk_event.json['request_type'] == 'group':
+                    if target_event.sdk_event.json['sub_type'] == 'add':
+                        target_event.active = True
+                        target_event.plugin_info['func_type'] = 'group_add_request'
+                        target_event.data = target_event.group_add_request(
+                            str(target_event.sdk_event.json['group_id']),
+                            str(target_event.sdk_event.json['user_id']),
+                            target_event.sdk_event.json['comment']
+                        )
+                        target_event.data.flag = tmp_flag
+                    elif target_event.sdk_event.json['sub_type'] == 'invite':
+                        target_event.active = True
+                        target_event.plugin_info['func_type'] = 'group_invite_request'
+                        target_event.data = target_event.group_invite_request(
+                            str(target_event.sdk_event.json['group_id']),
+                            str(target_event.sdk_event.json['user_id']),
+                            target_event.sdk_event.json['comment']
+                        )
+                        target_event.data.flag = tmp_flag
     elif target_event.base_info['type'] == 'meta_event':
         if target_event.sdk_event.json['meta_event_type'] == 'lifecycle':
             target_event.active = True