diff options
| -rw-r--r-- | ATRI/plugins/plugin_admin/__init__.py | 26 | ||||
| -rw-r--r-- | ATRI/plugins/plugin_status/__init__.py | 27 | ||||
| -rw-r--r-- | ATRI/plugins/plugin_utils/__init__.py | 2 |
3 files changed, 30 insertions, 25 deletions
diff --git a/ATRI/plugins/plugin_admin/__init__.py b/ATRI/plugins/plugin_admin/__init__.py index 4ba222a..f88ef74 100644 --- a/ATRI/plugins/plugin_admin/__init__.py +++ b/ATRI/plugins/plugin_admin/__init__.py @@ -14,7 +14,7 @@ import re import json import asyncio from pathlib import Path -from random import randint, sample +from random import choice, randint, sample from nonebot.plugin import on_command from nonebot.typing import Bot, Event @@ -83,6 +83,16 @@ async def _(bot: Bot, event: Event, state: dict) -> None: # 舆情监控系统 +# Usage: +# - /pubopin [key] [repo] [times] [ban time(bot)] +# - /pubopin del [key] +# - /pubopin list +# Tips: +# - 参数类型: +# * key: 关键词(将使用正则匹配) +# * repo: 触发后的关键词(可选)，如为图片，键入 img +# * times: 容忍次数(n>0, int) +# * ban time: bot对其失效时间(min, int) publicOpinion = on_command("/pubopin", rule=check_banlist(), permission=SUPERUSER) @@ -96,19 +106,7 @@ async def _(bot: Bot, event: Event, state: dict) -> None: data = json.load(f) if msg[0] == '': - msg0 = "---=====ATRI POM System=====---\n" - msg0 += "Usage:\n" - msg0 += " - /pubopin [key] [repo] [times] [ban time(bot)]\n" - msg0 += " - /pubopin del [key]\n" - msg0 += " - /pubopin list\n" - msg0 += "Tips:\n" - msg0 += " - 参数类型:\n" - msg0 += " * key: 关键词(将使用正则匹配)\n" - msg0 += " * repo: 触发后的关键词(可选)，如为图片，键入 img\n" - msg0 += " * times: 容忍次数(n>0, int)\n" - msg0 += " * ban time: bot对其失效时间(min, int)" - - await publicOpinion.finish(msg0) + await publicOpinion.finish("请查看文档获取帮助（") if msg[0] == 'del': await publicOpinion.finish(Textcheck().del_word(msg[1])) diff --git a/ATRI/plugins/plugin_status/__init__.py b/ATRI/plugins/plugin_status/__init__.py index 0f9098d..b34aeee 100644 --- a/ATRI/plugins/plugin_status/__init__.py +++ b/ATRI/plugins/plugin_status/__init__.py @@ -13,29 +13,28 @@ __author__ = 'kyomotoi' import psutil import sqlite3 from pathlib import Path +from random import choice from nonebot.plugin import on_command from nonebot.typing import Bot, Event +from nonebot.permission import SUPERUSER from ATRI.utils.utils_error import errorRepo from ATRI.utils.utils_rule import check_banlist -status_info = on_command('status', rule=check_banlist()) +# States parameter: +# ├info +# └sqlite +# * DEMO: status info +status_info = on_command('/status', rule=check_banlist()) @status_info.handle() async def _(bot: Bot, event: Event, state: dict) -> None: msg = str(event.message).strip() - if msg: - pass - else: - msg0 = "States parameter:\n" - msg0 += "├info\n" - msg0 += "└sqlite\n" - msg0 += "* DEMO: status info" - - await status_info.finish(msg0) + if not msg: + await status_info.finish("请查看文档获取帮助（") if msg == "info": try: @@ -98,3 +97,11 @@ async def _(bot: Bot, event: Event, state: dict) -> None: msg0 += f"└R18: {data_r18}" await status_info.finish(msg0) + + +ping = on_command('/ping', permission=SUPERUSER) + + +@ping.handle() +async def _(bot: Bot, event: Event, state: dict) -> None: + await ping.finish(choice(["I'm fine.", "啪！"])) diff --git a/ATRI/plugins/plugin_utils/__init__.py b/ATRI/plugins/plugin_utils/__init__.py index 177d523..11f6c8b 100644 --- a/ATRI/plugins/plugin_utils/__init__.py +++ b/ATRI/plugins/plugin_utils/__init__.py @@ -49,7 +49,7 @@ async def _(bot: Bot, event: Event, state: dict) -> None: msg0 = "恭喜，你已经成大人了！\n" msg0 += f"NumberID: {id_card_id}\n" - msg0 += f"Sex: {'男' if id_card_sex == 1 else '女'}\n" + msg0 += f"Gender: {'男' if id_card_sex == 1 else '女'}\n" msg0 += f"Name: {id_card_name} || Address: {id_card_area_name}\n" msg0 += "注: 1、以上信息根据国家公开标准生成，非真实信息。\n" msg0 += " 2、不适用于网易和腾讯。" |