[Update]

1 files changed, 22 insertions, 38 deletions

diff --git a/ATRI/plugins/hitokoto.py b/ATRI/plugins/hitokoto.py
index e72a37e..2da9eef 100644
--- a/ATRI/plugins/hitokoto.py
+++ b/ATRI/plugins/hitokoto.py
@@ -1,11 +1,11 @@
 import json
 from datetime import datetime
 from random import choice
-from pathlib import Path
 from nonebot import on_command, on_natural_language, CommandSession
 from nonebot import NLPSession, NLPResult
 
 from ATRI.modules import response # type: ignore
+from ATRI.modules.funcControl import checkNoob # type: ignore
 
 
 def now_time():
@@ -23,44 +23,28 @@ url = 'https://api.imjad.cn/hitokoto/?cat=a&charset=utf-8&length=50&encode=json&
 async def hitokoto(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:
-                await session.send(
-                    choice(
-                        [
-                            'zzzz......',
-                            'zzzzzzzz......',
-                            'zzz...好涩哦..zzz....',
-                            '别...不要..zzz..那..zzz..',
-                            '嘻嘻..zzz..呐~..zzzz..'
-                        ]
-                    )
+    if checkNoob(user, group):
+        if 0 <= now_time() < 5.5:
+            await session.send(
+                choice(
+                    [
+                        'zzzz......',
+                        'zzzzzzzz......',
+                        'zzz...好涩哦..zzz....',
+                        '别...不要..zzz..那..zzz..',
+                        '嘻嘻..zzz..呐~..zzzz..'
+                    ]
                 )
-            else:
-                rep = response.request_api(url)
-                
-                if not rep:
-                    session.finish('获取失败')
-                
-                dc = json.loads(response.request_api(url))
-
-                await session.send(dc["hitokoto"])
+            )
+        else:
+            rep = response.request_api(url)
+            
+            if not rep:
+                session.finish('获取失败')
+            
+            dc = json.loads(response.request_api(url))
+
+            await session.send(dc["hitokoto"])
 
 @on_natural_language('一言', only_to_me = False)
 async def _(session: NLPSession):