1 files changed, 66 insertions, 147 deletions
diff --git a/ATRI/plugins/Chat1.py b/ATRI/plugins/Chat1.py
index 637ff93..47c8fdf 100644
--- a/ATRI/plugins/Chat1.py
+++ b/ATRI/plugins/Chat1.py
@@ -1,13 +1,12 @@
 import os
-import json
 import nonebot
 from pathlib import Path
 from random import choice, randint
 from datetime import datetime
 from nonebot import on_command, CommandSession
-from nonebot import session
 
 import config # type: ignore
+from ATRI.modules.funcControl import checkNoob # type: ignore
 
 
 bot = nonebot.get_bot()
@@ -26,180 +25,100 @@ def now_time():
 async def _(session: CommandSession):
     user = session.event.user_id
     group = session.event.group_id
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobGroup.json', 'r') as f:
-            data = json.load(f)
-    except:
-        data = {}
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobList.json', 'r') as f:
-            data1 = json.load(f)
-    except:
-        data1 = {}
-
-    if str(group) in data.keys():
-        pass
-    else:
-        if str(user) in data1.keys():
+    if checkNoob(user, group):
+        if 0 <= now_time() < 5.5:
             pass
         else:
-            if 0 <= now_time() < 5.5:
-                pass
-            else:
-                if randint(1,2) == 1:
-                    img = choice(
-                        [
-                            '1.jpg', '8.jpg', '14.jpg', '21.jpg'
-                        ]
-                    )
-                    img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
-                    await session.send(f'[CQ:image,file=file:///{img}]')
+            if randint(1,2) == 1:
+                img = choice(
+                    [
+                        '1.jpg', '8.jpg', '14.jpg', '21.jpg'
+                    ]
+                )
+                img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
+                await session.send(f'[CQ:image,file=file:///{img}]')
 
 @on_command('wenhao', patterns = [r"'?'|？|¿"], only_to_me = False)
 async def _(session: CommandSession):
     user = session.event.user_id
     group = session.event.group_id
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobGroup.json', 'r') as f:
-            data = json.load(f)
-    except:
-        data = {}
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobList.json', 'r') as f:
-            data1 = json.load(f)
-    except:
-        data1 = {}
-
-    if str(group) in data.keys():
-        pass
-    else:
-        if str(user) in data1.keys():
+    if checkNoob(user, group):
+        if 0 <= now_time() < 5.5:
             pass
         else:
-            if 0 <= now_time() < 5.5:
-                pass
-            else:
-                if randint(1,3) == 1:
-                    res = randint(1,5)
-                    if 1 <= res < 2:
-                        await session.send(
-                            choice(
-                                [
-                                    '?', '？', '嗯？', '(。´・ω・)ん?', 'ん？'
-                                ]
-                            )
-                        )
-                    
-                    elif 2 <= res <= 5:
-                        img = choice(
+            if randint(1,3) == 1:
+                res = randint(1,5)
+                if 1 <= res < 2:
+                    await session.send(
+                        choice(
                             [
-                                'WH.jpg', 'WH1.jpg', 'WH2.jpg', 'WH3.jpg', 'WH4.jpg'
+                                '?', '？', '嗯？', '(。´・ω・)ん?', 'ん？'
                             ]
                         )
-                        img = Path('.') / 'ATRI' / 'data' / 'emoji' / f'{img}'
-                        img = os.path.abspath(img)
-                        await session.send(f'[CQ:image,file=file:///{img}]')
-
-@on_command('yesorno', patterns = [r"[好是]吗|[行能]不[行能]|彳亍不彳亍|可不可以"], only_to_me = False)
-async def _(session: CommandSession):
-    user = session.event.user_id
-    group = session.event.group_id
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobGroup.json', 'r') as f:
-            data = json.load(f)
-    except:
-        data = {}
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobList.json', 'r') as f:
-            data1 = json.load(f)
-    except:
-        data1 = {}
-
-    if str(group) in data.keys():
-        pass
-    else:
-        if str(user) in data1.keys():
-            pass
-        else:
-            if 0 <= now_time() < 5.5:
-                pass
-            else:
-                res = randint(1,2)
-                if res == 1:
-                    img = choice(
-                        [
-                            '2.png', '39.png'
-                        ]
                     )
-                    img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
-                    await session.send(f'[CQ:image,file=file:///{img}]')
-
-                elif res == 2:
+                
+                elif 2 <= res <= 5:
                     img = choice(
                         [
-                            'YIQI_YES.png', 'YIQI_NO.jpg', 'KD.jpg', 'FD.jpg'
+                            'WH.jpg', 'WH1.jpg', 'WH2.jpg', 'WH3.jpg', 'WH4.jpg'
                         ]
                     )
-                    img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / f'{img}')
+                    img = Path('.') / 'ATRI' / 'data' / 'emoji' / f'{img}'
+                    img = os.path.abspath(img)
                     await session.send(f'[CQ:image,file=file:///{img}]')
 
-@on_command('ysdd', aliases = [r"原声大碟"])
+@on_command('yesorno', patterns = [r"[好是]吗|[行能]不[行能]|彳亍不彳亍|可不可以"], only_to_me = False)
 async def _(session: CommandSession):
     user = session.event.user_id
     group = session.event.group_id
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobGroup.json', 'r') as f:
-            data = json.load(f)
-    except:
-        data = {}
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobList.json', 'r') as f:
-            data1 = json.load(f)
-    except:
-        data1 = {}
-
-    if str(group) in data.keys():
-        pass
-    else:
-        if str(user) in data1.keys():
+    if checkNoob(user, group):
+        if 0 <= now_time() < 5.5:
             pass
         else:
-            voice = Path('.') / 'ATRI' / 'data' / 'voice' / 'ysdd.amr'
-            voice = os.path.abspath(voice)
-            await session.send(f'[CQ:record,file=file:///{voice}]')
+            res = randint(1,2)
+            if res == 1:
+                img = choice(
+                    [
+                        '2.png', '39.png'
+                    ]
+                )
+                img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
+                await session.send(f'[CQ:image,file=file:///{img}]')
+
+            elif res == 2:
+                img = choice(
+                    [
+                        'YIQI_YES.png', 'YIQI_NO.jpg', 'KD.jpg', 'FD.jpg'
+                    ]
+                )
+                img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / f'{img}')
+                await session.send(f'[CQ:image,file=file:///{img}]')
+
+@on_command('ysdd', aliases = [r"原声大碟"])
+async def _(session: CommandSession):
+    user = session.event.user_id
+    group = session.event.group_id
+    if checkNoob(user, group):
+        voice = Path('.') / 'ATRI' / 'data' / 'voice' / 'ysdd.amr'
+        voice = os.path.abspath(voice)
+        await session.send(f'[CQ:record,file=file:///{voice}]')
 
 @bot.on_message('group')
 async def _(context):
     user = context["user_id"]
     group = context["group_id"]
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobGroup.json', 'r') as f:
-            data = json.load(f)
-    except:
-        data = {}
-    try:
-        with open(Path('.') / 'ATRI' / 'plugins' / 'noobList' / 'noobList.json', 'r') as f:
-            data1 = json.load(f)
-    except:
-        data1 = {}
-
-    if str(group) in data.keys():
-        pass
-    else:
-        if str(user) in data1.keys():
+    if checkNoob(user, group):
+        if 0 <= now_time() < 5.5:
             pass
         else:
-            if 0 <= now_time() < 5.5:
-                pass
+            if randint(1,20) == 4:
+                img = choice(
+                    [
+                        '11.jpg', '12.jpg', '23.jpg'
+                    ]
+                )
+                img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
+                await bot.send_msg(message = f'[CQ:image,file=file:///{img}]', auto_escape = False) # type: ignore
+            
             else:
-                if randint(1,20) == 4:
-                    img = choice(
-                        [
-                            '11.jpg', '12.jpg', '23.jpg'
-                        ]
-                    )
-                    img = os.path.abspath(Path('.') / 'ATRI' / 'data' / 'emoji' / 'senren' / f'{img}')
-                    await bot.send_msg(message = f'[CQ:image,file=file:///{img}]', auto_escape = False) # type: ignore
-                
-                else:
-                    pass
-\ No newline at end of file
+                pass
+\ No newline at end of file