1 files changed, 31 insertions, 15 deletions

diff --git a/utils/utils_history/__init__.py b/utils/utils_history/__init__.py
index 6afc1e0..1ee14f0 100644
--- a/utils/utils_history/__init__.py
+++ b/utils/utils_history/__init__.py
@@ -2,7 +2,7 @@
 # -*- encoding: utf-8 -*-
 '''
 @File    :   __init__.py
-@Time    :   2020/10/11 14:43:20
+@Time    :   2020/11/07 14:33:22
 @Author  :   Kyomotoi
 @Contact :   [email protected]
 @Github  :   https://github.com/Kyomotoi
@@ -15,26 +15,36 @@ import json
 from pathlib import Path
 from typing import Optional
 
-def saveMessage(message_id: str, message: str, user: str, group: Optional[str] = None) -> None:
-    '''储存消息'''
-    file_group = Path('.') / 'ATRI' / 'data' / 'data_Group' / f'{group}' / 'message.json'
-    file_private = Path('.') / 'ATRI' / 'data' / 'data_Log' / 'message_private.json'
+
+def saveMessage(message_id: str,
+                message: str,
+                user: str,
+                group: Optional[str] = None) -> None:
+    """储存消息"""
+    file_group = Path(
+        '.') / 'ATRI' / 'data' / 'data_Group' / f'{group}' / 'message.json'
+    file_private = Path(
+        '.') / 'ATRI' / 'data' / 'data_Log' / 'message_private.json'
 
     try:
         with open(file_group, 'r') as f:
             data_group = json.load(f)
     except:
         data_group = {}
-    
+
     try:
         with open(file_private, 'r') as f:
             data_private = json.load(f)
     except:
         data_private = {}
-    
+
     if group:
-        data_group[f"{message_id}"] = {"message": f"{message}", "user_id": f"{user}", "group_id": f"{group}"}
-    
+        data_group[f"{message_id}"] = {
+            "message": f"{message}",
+            "user_id": f"{user}",
+            "group_id": f"{group}"
+        }
+
         try:
             with open(file_group, 'w') as f:
                 f.write(json.dumps(data_group))
@@ -45,7 +55,10 @@ def saveMessage(message_id: str, message: str, user: str, group: Optional[str] =
                 f.write(json.dumps(data_group))
                 f.close()
     else:
-        data_private[f"{message_id}"] = {"message": f"{message}", "user_id": f"{user}"}
+        data_private[f"{message_id}"] = {
+            "message": f"{message}",
+            "user_id": f"{user}"
+        }
 
         try:
             with open(file_private, 'w') as f:
@@ -57,20 +70,23 @@ def saveMessage(message_id: str, message: str, user: str, group: Optional[str] =
                 f.write(json.dumps(data_private))
                 f.close()
 
+
 def getMessage(message_id: str, group: Optional[str] = None) -> dict:
     '''
     传入消息id以获取对应信息
     
     :return: dict
     '''
-    file_group = Path('.') / 'ATRI' / 'data' / 'data_Group' / f'{group}' / 'message.json'
-    file_private = Path('.') / 'ATRI' / 'data' / 'data_Log' / 'message_private.json'
+    file_group = Path(
+        '.') / 'ATRI' / 'data' / 'data_Group' / f'{group}' / 'message.json'
+    file_private = Path(
+        '.') / 'ATRI' / 'data' / 'data_Log' / 'message_private.json'
 
     if group:
         try:
             with open(file_group, 'r') as f:
                 data_group = json.load(f)
-            return data_group
+            return data_group[message_id]
 
         except:
             return {"status": "None"}
@@ -78,7 +94,7 @@ def getMessage(message_id: str, group: Optional[str] = None) -> dict:
         try:
             with open(file_private, 'r') as f:
                 data_private = json.load(f)
-            return data_private
+            return data_private[message_id]
 
         except:
-            return {"status": "None"}
\ No newline at end of file
+            return {"status": "None"}