Merge pull request #123 from MetaLe0/main

telegram：适配新的图文数据格式
OlivOS-Team · May 15, 2024 · ff6a406 · ff6a406
2 parents 349e44e + c7b72e9
commit ff6a406
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/OlivOS/adapter/telegram/telegramSDK.py b/OlivOS/adapter/telegram/telegramSDK.py
@@ -7,7 +7,7 @@
 \____/ /_____/___/  _____/  \____/ /____/
 
 @File      :   OlivOS/telegramSDK.py
-@Author    :   lunzhiPenxil仑质
+@Author    :   lunzhiPenxil仑质, MetaLeo元理
 @Contact   :   lunzhipenxil@gmail.com
 @License   :   AGPL
 @Copyright :   (C) 2020-2023, OlivOS-Team
@@ -222,12 +222,20 @@ def get_message_obj_from_SDK(target_event):
             checkInDictSafe('photo', target_event.sdk_event.json, ['message'])
         ]):
             message_list = []
-            if type(target_event.sdk_event.json['message']['photo']) == list:
+            if type(target_event.sdk_event.json['message']['photo']) is list:
                 message_list.append(
                     OlivOS.messageAPI.PARA.image(
                         target_event.sdk_event.json['message']['photo'][0]['file_id']
                     )
                 )
+            if checkByListAnd([
+                checkInDictSafe('caption', target_event.sdk_event.json, ['message'])
+            ]):
+                message_list.append(
+                    OlivOS.messageAPI.PARA.text(
+                        text = str(target_event.sdk_event.json['message']['caption'])
+                    )
+                )
             message_obj = OlivOS.messageAPI.Message_templet(
                 'olivos_para',
                 message_list
@@ -288,7 +296,7 @@ def get_Event_from_SDK(target_event):
         checkInDictSafe('message_id', target_event.sdk_event.json, ['message']),
         checkInDictSafe('from', target_event.sdk_event.json, ['message']),
         checkInDictSafe('first_name', target_event.sdk_event.json, ['message', 'from']),
-        checkInDictSafe('text', target_event.sdk_event.json, ['message']),
+        #checkInDictSafe('text', target_event.sdk_event.json, ['message']),
         checkEquelInDictSafe('private', target_event.sdk_event.json, ['message', 'chat', 'type'])
     ]):
         message_obj = None
@@ -324,7 +332,7 @@ def get_Event_from_SDK(target_event):
         checkInDictSafe('from', target_event.sdk_event.json, ['message']),
         checkInDictSafe('id', target_event.sdk_event.json, ['message', 'from']),
         checkInDictSafe('first_name', target_event.sdk_event.json, ['message', 'from']),
-        checkInDictSafe('text', target_event.sdk_event.json, ['message']),
+        #checkInDictSafe('text', target_event.sdk_event.json, ['message']),
         checkEquelInDictSafe('group', target_event.sdk_event.json, ['message', 'chat', 'type'])
     ]):
         message_obj = None
@@ -362,7 +370,7 @@ def get_Event_from_SDK(target_event):
         checkInDictSafe('from', target_event.sdk_event.json, ['message']),
         checkInDictSafe('id', target_event.sdk_event.json, ['message', 'from']),
         checkInDictSafe('first_name', target_event.sdk_event.json, ['message', 'from']),
-        checkInDictSafe('text', target_event.sdk_event.json, ['message']),
+        #checkInDictSafe('text', target_event.sdk_event.json, ['message']),
         checkEquelInDictSafe('supergroup', target_event.sdk_event.json, ['message', 'chat', 'type'])
     ]):
         message_obj = None