[Fix]

3 files changed, 79 insertions, 105 deletions

diff --git a/ATRI/modules/funcControl/__init__.py b/ATRI/modules/funcControl/__init__.py
index c111b61..089e673 100644
--- a/ATRI/modules/funcControl/__init__.py
+++ b/ATRI/modules/funcControl/__init__.py
@@ -7,8 +7,8 @@ def checkSwitch(funcName: str, g: int):
     file = Path('.') / 'ATRI' / 'modules' / 'funcControl' / 'ALLswitch.json'
     with open(file, 'r') as f:
         data = json.load(f)
-    if data[funcName] == "on":
-        return True
+    if data[funcName] == "off":
+        return False
     else:
         file = Path('.') / 'ATRI' / 'data' / 'groupData' / f'{g}' / 'switch.json'
         with open(file, 'r') as f:
diff --git a/config.json b/config.json
new file mode 100644
index 0000000..420a44e
--- /dev/null
+++ b/config.json
@@ -0,0 +1,30 @@
+{
+    "HOST": "127.0.0.1",
+    "PORT": 8080,
+    "SESSION_RUNNING_EXPRESSION": "欸欸欸...能否等一下呢...ATRI处理不过来啦！",
+    "SESSION_CANCEL_EXPRESSION": [
+        "好吧...",
+        "ATRI会随时待命的！毕竟我可是高性能的！",
+        "下次如有需要请尽管依赖ATRI吧！"
+    ],
+    "SUPERUSERS": [
+        123456789
+    ],
+    "NICKNAME": [
+        "ATRI",
+        "亚托莉",
+        "アトリ"
+    ],
+    "COMMAND_START": [
+        ""
+    ],
+    "API": {
+        "LoliconAPI": "",
+        "FaceplusAPI": "",
+        "FaceplusSECRET": "",
+        "BaiduApiID": 12345678,
+        "BaiduApiKEY": "",
+        "BaiduApiSECRET": "",
+        "SauceNaoKEY": ""
+    }
+}
\ No newline at end of file
diff --git a/config.py b/config.py
index 1afde53..d525371 100644
--- a/config.py
+++ b/config.py
@@ -1,92 +1,38 @@
 import os

+import json

 import time

 from nonebot.default_config import *

 

-# 配置监听的 IP 和 端口

-HOST = '127.0.0.1'

-PORT = 8080

+print("正在导入记忆模块ing...")

+with open('config.json', 'r', encoding='UTF-8') as f:

+    data = json.load(f)

+

+# 加载监听的 IP 和 端口

+HOST = data["HOST"]

+PORT = data["PORT"]

 

 # 机器人在繁忙之时的回复

-SESSION_RUNNING_EXPRESSION = '欸欸欸...能否等一下呢...ATRI处理不过来啦！'

+SESSION_RUNNING_EXPRESSION = data["SESSION_RUNNING_EXPRESSION"]

 

 # 机器人在用户取消操作时的回复

-SESSION_CANCEL_EXPRESSION = (

-    '好吧...',

-    'ATRI会随时待命的！毕竟我可是高性能的！',

-    '下次如有需要请尽管依赖ATRI吧！'

-    )

+SESSION_CANCEL_EXPRESSION = data["SESSION_CANCEL_EXPRESSION"]

 

 # 机器人的主人（QQ号）即 超级用户

-SUPERUSERS = [123456789]

-def MASTER():

-    return SUPERUSERS

-

-# 机器人名称，替代 @ 和 命令开头

-NICKNAME = {'ATRI', '亚托莉', 'アトリ'}

-

-# 自定义命令开头

-COMMAND_START = {''}

-

-# API url:https://api.lolicon.app/#/setu

-a = "" # key

-def LOLICONAPI():

-    return a

-

-# API url:https://www.faceplusplus.com.cn/

-b = "" # key

-def FACE_KEY():

-    return b

-

-c = "" # secret

-def FACE_SECRET():

-    return c

-

-# API url:https://cloud.baidu.com/

-def BAIDU_APP_ID():

-    return 123456 # id

-

-d = "" # key

-def BAIDU_API_KEY():

-    return d

-

-e = "" # secret

-def BAIDU_SECRET():

-    return e

-

-# API url:https://saucenao.com/search.php

-f = "" # key

-def SAUCENAO_KEY():

-    return f

-

-

-

-

-

-

-

-

-

-

-

-

-

-

-#以下请勿删除

-

-print("正在导入记忆模块ing...")

-

-if SUPERUSERS:

+try:

+    SUPERUSERS = data["SUPERUSERS"]

     print("主人已识别！")

-else:

+except:

     print("ATRI无法从记忆储蓄模块找到主人...如需帮助，请查看安装手册")

     time.sleep(1)

     print("仿生人没有主人是无法继续存在的！将于三秒后执行休眠...")

     time.sleep(3)

     os._exit(0)

 

-if NICKNAME:

+# 机器人名称，替代 @ 和 命令开头

+try:

+    NICKNAME = data["NICKNAME"]

     print("对ATRI的特别称呼已加载！")

-else:

+except:

     print("ATRI没特别的小昵称嘛...彳亍8")

     time.sleep(1)

     print("既然这样那叫我ATRI就好力！")

@@ -97,10 +43,12 @@ else:
         pass

     else:

         os._exit(0)

-    

-if COMMAND_START:

+

+# 自定义命令开头

+try:

+    COMMAND_START = data["COMMAND_START"]

     print("呼叫指令已加载！")

-else:

+except:

     print("如果没指定特别呼叫ATRI的手势的话，直接称呼我名称吧！")

     COMMAND_START = {'ATRI', ''}

     time.sleep(1)

@@ -110,9 +58,11 @@ else:
     else:

         os._exit(0)

 

-if LOLICONAPI():

+# API url:https://api.lolicon.app/#/setu

+try:

+    LoliconAPI = data["API"]["LoliconAPI"]

     print("涩图大门的钥匙已到手！")

-else:

+except:

     print("似乎没拿到大门的钥匙呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -122,9 +72,11 @@ else:
     else:

         os._exit(0)

 

-if FACE_KEY():

+# API url:https://www.faceplusplus.com.cn/

+try:

+    FaceplusAPI = data["API"]["FaceplusAPI"]

     print("用于人脸识别的钥匙已到手！")

-else:

+except:

     print("貌似没拿到人脸识别的钥匙呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -133,10 +85,10 @@ else:
         pass

     else:

         os._exit(0)

-

-if FACE_SECRET():

+try:

+    FaceplusSECRET = data["API"]["FaceplusSECRET"]

     print("用于人脸识别的验证码已到手！")

-else:

+except:

     print("貌似没拿到人脸识别的验证码呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -146,9 +98,11 @@ else:
     else:

         os._exit(0)

 

-if BAIDU_APP_ID():

+# API url:https://cloud.baidu.com/

+try:

+    BaiduApiID = data["API"]["BaiduApiID"]

     print("用于图片识别的ID已到手！")

-else:

+except:

     print("貌似没拿到图片识别的ID呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -157,10 +111,10 @@ else:
         pass

     else:

         os._exit(0)

-

-if BAIDU_API_KEY():

+try:

+    BaiduApiKEY = data["API"]["BaiduApiKEY"]

     print("用于图片识别的KEY已到手！")

-else:

+except:

     print("貌似没拿到图片识别的KEY呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -169,10 +123,10 @@ else:
         pass

     else:

         os._exit(0)

-

-if BAIDU_SECRET():

+try:

+    BaiduApiSECRET = data["API"]["BaiduApiSECRET"]

     print("用于图片识别的SECRET已到手！")

-else:

+except:

     print("貌似没拿到图片识别的SECRET呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)

@@ -182,21 +136,11 @@ else:
     else:

         os._exit(0)

 

-if BAIDU_SECRET():

-    print("用于图片识别的SECRET已到手！")

-else:

-    print("貌似没拿到图片识别的SECRET呢...如需帮助，请查看安装手册")

-    print("...跳过！")

-    time.sleep(1)

-    wait = input("是否继续： Y/N\n")

-    if wait == "Y" or wait == 'y':

-        pass

-    else:

-        os._exit(0)

-

-if SAUCENAO_KEY():

+# API url:https://saucenao.com/search.php

+try:

+    SauceNaoKEY = data["API"]["SauceNaoKEY"]

     print("用于SAUCENAO的钥匙已到手！")

-else:

+except:

     print("貌似没拿到SAUCENAO的钥匙呢...如需帮助，请查看安装手册")

     print("...跳过！")

     time.sleep(1)