[Fix]

1 files changed, 68 insertions, 85 deletions

diff --git a/ATRI/plugins/other.py b/ATRI/plugins/other.py
index 9b96ed2..dd34dda 100644
--- a/ATRI/plugins/other.py
+++ b/ATRI/plugins/other.py
@@ -1,8 +1,8 @@
-# -*- coding:utf-8 -*-
-import time
 import json
 import random
 import nonebot
+from datetime import datetime
+from random import choice
 from nonebot import on_command, CommandSession
 from nonebot.helpers import render_expression
 
@@ -13,6 +13,14 @@ bot = nonebot.get_bot()
 master = config.MASTER()
 
 
+def now_time():
+    now_ = datetime.now()
+    hour = now_.hour
+    minute = now_.minute
+    now = hour + minute / 60
+    return now
+
+
 HELP_REPLY = (
     'ええと...让我想想...',
     '嗯...',
@@ -21,87 +29,76 @@ HELP_REPLY = (
 )
 
 
-MENU_REPO = '''
-======================
-ATRI 使用说明
-======================
-* 发送[]内的关键词以激活相关指令
-* 命令前带'@'表示需要atBOT
-* 命令前带'FIX'表示暂时失效
-* 管理类使用方法会附在网页版的使用手册
-
-======[基本功能]======
-[以图搜番] 字面意思
-[本子] 搜索本子
-[一言] 字面意思
-[P站搜图] 以Pid码搜索P站的图片
-[画师] 以画师ID搜索P站画师的作品
-[P站排行榜] 获取实时更新的P站排行榜
-[来份涩图] 获取一张涩图
-========[HELP]========
-[帮助] 获取网页版使用手册
-[菜单] 打开本页面
-[关于] 获取项目、作者信息
-[@ 来杯红茶] 向作者反馈
-=======[小功能]=======
-[掷骰子] 1~6的随机数
-[抽签] 抽取今日运势
-'''.strip()
-
-MENU_AND = '''
-* 由于本项目以及本人一些个人原因，出现Bug请及时反馈
-* 本项目开源，可自行搭建，方法附在网页版使用手册中
-* 如有意愿fork本项目，提交修改，作者会非常感动
-* 运行示例、开发、维护需要成本，作者希望能被赞助
-* Star、提交Issus以及Fork并提交修改意见是本项目继续下去的动力
-* 运行时请适当使用，滥用可能会导致账号被封禁
-'''.strip()
-
-
 @on_command('抽签', only_to_me = False)
 async def _(session: CommandSession):
     user = session.event.user_id
-    with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
-        data = json.load(f)
-
-    if str(user) in data.keys():
-        pass
-    else:
+    if 0 <= now_time() < 5.5:
         await session.send(
-            str(
-                random.choice(
-                    [
-                        '大凶',
-                        '大胸',
-                        '小凶',
-                        '小胸',
-                        '凶',
-                        '吉',
-                        '中吉',
-                        '大吉',
-                        '特大吉',
-                        '超特大吉'
-                    ]
-                )
+            choice(
+                [
+                    'zzzz......',
+                    'zzzzzzzz......',
+                    'zzz...好涩哦..zzz....',
+                    '别...不要..zzz..那..zzz..',
+                    '嘻嘻..zzz..呐~..zzzz..'
+                ]
             )
         )
+    else:
+        with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
+            data = json.load(f)
+
+        if str(user) in data.keys():
+            pass
+        else:
+            await session.send(
+                str(
+                    random.choice(
+                        [
+                            '大凶',
+                            '大胸',
+                            '小凶',
+                            '小胸',
+                            '凶',
+                            '吉',
+                            '中吉',
+                            '大吉',
+                            '特大吉',
+                            '超特大吉'
+                        ]
+                    )
+                )
+            )
 
 @on_command('掷骰子', aliases = ['扔骰子', '骰子'], only_to_me = False)
 async def _(session: CommandSession):
     user = session.event.user_id
-    with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
-        data = json.load(f)
-
-    if str(user) in data.keys():
-        pass
-    else:
+    if 0 <= now_time() < 5.5:
         await session.send(
-            str(
-                random.randint(
-                    1,6
-                )
+            choice(
+                [
+                    'zzzz......',
+                    'zzzzzzzz......',
+                    'zzz...好涩哦..zzz....',
+                    '别...不要..zzz..那..zzz..',
+                    '嘻嘻..zzz..呐~..zzzz..'
+                ]
             )
         )
+    else:
+        with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
+            data = json.load(f)
+
+        if str(user) in data.keys():
+            pass
+        else:
+            await session.send(
+                str(
+                    random.randint(
+                        1,6
+                    )
+                )
+            )
 
 @on_command('关于', aliases = ['关于机器人'], only_to_me = False)
 async def _(session: CommandSession):
@@ -131,23 +128,9 @@ async def _(session: CommandSession):
     else:
         await session.send(
             f"""{render_expression(HELP_REPLY)}
-    发送：菜单
-    或看这吧！
-    https://blog.lolihub.icu/#/ATRI/user"""
+请仔细阅读文档哦~~https://blog.lolihub.icu/#/ATRI/user"""
         )
 
-@on_command('menu', aliases = ['菜单'], only_to_me = False)
-async def _(session: CommandSession):
-    user = session.event.user_id
-    with open('ATRI/plugins/noobList/noobList.json', 'r') as f:
-        data = json.load(f)
-
-    if str(user) in data.keys():
-        pass
-    else:
-        await session.send(MENU_REPO)
-        time.sleep(0.5)
-        await session.send(MENU_AND)
 
 @on_command('report', aliases = ['来杯红茶'], only_to_me = True)
 async def _(session: CommandSession):