From de591789f5ab68458d060d6ea96bf8dcbbe4df8c Mon Sep 17 00:00:00 2001
From: Kyomotoi <1172294279@qq.com>
Date: Wed, 12 Aug 2020 22:38:05 +0800
Subject: [Fix] f**k some ntr

---
 ATRI/plugins/chat.py | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'ATRI/plugins/chat.py')

diff --git a/ATRI/plugins/chat.py b/ATRI/plugins/chat.py
index 87bd17c..1975610 100644
--- a/ATRI/plugins/chat.py
+++ b/ATRI/plugins/chat.py
@@ -109,7 +109,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if 5.5 <= now_time() < 9:
@@ -171,7 +171,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if 11 <= now_time() <= 15:
@@ -192,7 +192,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if 5.5 <= now_time() < 11:
@@ -261,7 +261,7 @@ async def az(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         res = randint(1,3)
@@ -282,7 +282,7 @@ async def az(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         res = randint(1,3)
@@ -314,7 +314,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         res = randint(1,3)
@@ -345,7 +345,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,3) == 1:
@@ -366,7 +366,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,2) == 1:
@@ -401,7 +401,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,2) == 1:
@@ -425,7 +425,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,3) == 1:
@@ -443,7 +443,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,2) == 1:
@@ -462,7 +462,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         if randint(1,2) == 1:
@@ -475,7 +475,7 @@ async def _(session: CommandSession):
     with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
         data = json.load(f)
 
-    if data[f"{user}"] == str(user):
+    if str(user) in data.keys():
         pass
     else:
         msg = str(session.event.message)
@@ -487,6 +487,7 @@ async def _(session: CommandSession):
             noobList.append(user)
             if countX(noobList, user) == 10:
                 if user == master:
+                    await session.send('是主人的话...那算了...呜呜')
                     pass
                 else:
                     await session.send('哼！接下来10分钟别想让我理你！')
-- 
cgit v1.2.3