diff options
-rw-r--r-- | ATRI/plugins/applet/__init__.py | 2 | ||||
-rw-r--r-- | ATRI/plugins/bilibili_dynamic/__init__.py | 6 | ||||
-rw-r--r-- | ATRI/plugins/help/data_source.py | 1 | ||||
-rw-r--r-- | ATRI/plugins/kimo/__init__.py | 2 | ||||
-rw-r--r-- | ATRI/plugins/status/data_source.py | 6 | ||||
-rw-r--r-- | ATRI/plugins/twitter/__init__.py | 6 | ||||
-rw-r--r-- | ATRI/plugins/wife/__init__.py | 1 | ||||
-rw-r--r-- | test/test_plugin_help.py | 1 |
8 files changed, 10 insertions, 15 deletions
diff --git a/ATRI/plugins/applet/__init__.py b/ATRI/plugins/applet/__init__.py index 8d89514..9c4d0ce 100644 --- a/ATRI/plugins/applet/__init__.py +++ b/ATRI/plugins/applet/__init__.py @@ -4,7 +4,7 @@ from nonebot.adapters.onebot.v11.helpers import Cooldown from .data_source import Applet -bili_applet = Applet().on_message("b站小程序检测", "B站小程序爪巴", block=False) +bili_applet = Applet().on_message("b站小程序检测", "B站小程序爪巴", priority=5, block=False) @bili_applet.handle([Cooldown(3)]) diff --git a/ATRI/plugins/bilibili_dynamic/__init__.py b/ATRI/plugins/bilibili_dynamic/__init__.py index 8a6a007..9d44831 100644 --- a/ATRI/plugins/bilibili_dynamic/__init__.py +++ b/ATRI/plugins/bilibili_dynamic/__init__.py @@ -66,9 +66,7 @@ async def _bd_del_sub(event: GroupMessageEvent): for i in query_result: subs.append([i.up_nickname, i.uid]) - output = "本群订阅的up列表如下~\n" + tabulate( - subs, headers=["up主", "uid"], tablefmt="plain", showindex=True - ) + output = "本群订阅的up列表如下~\n" + tabulate(subs, headers=["up主", "uid"], tablefmt="plain") await del_sub.send(output) @@ -114,7 +112,7 @@ async def _bd_get_sub_list(event: GroupMessageEvent): subs.append([i.up_nickname, tm]) output = "本群订阅的up列表如下~\n" + tabulate( - subs, headers=["up主", "最后更新时间"], tablefmt="plain", showindex=True + subs, headers=["up主", "最后更新时间"], tablefmt="plain" ) await get_sub_list.finish(output) diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py index 2573bf4..5003b0d 100644 --- a/ATRI/plugins/help/data_source.py +++ b/ATRI/plugins/help/data_source.py @@ -74,7 +74,6 @@ class Helper(Service): services, headers=["服务名称", "开启状态(全局)", "仅支持管理员"], tablefmt="plain", - showindex=True, ) repo = f"咱搭载了以下服务~\n{table}\n@bot 帮助 [服务] -以查看对应服务帮助" return repo diff --git a/ATRI/plugins/kimo/__init__.py b/ATRI/plugins/kimo/__init__.py index a25fcf9..aedf36b 100644 --- a/ATRI/plugins/kimo/__init__.py +++ b/ATRI/plugins/kimo/__init__.py @@ -12,7 +12,7 @@ from .data_source import Kimo _chat_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~", "我开始为你以后的伴侣担心了..."]) -kimo = Kimo().on_message("文爱", "闲聊(文爱", priority=4) +kimo = Kimo().on_message("文爱", "闲聊(文爱", priority=10, block=False) @kimo.handle([Cooldown(3, prompt=_chat_flmt_notice)]) diff --git a/ATRI/plugins/status/data_source.py b/ATRI/plugins/status/data_source.py index 74d2c77..cede6cf 100644 --- a/ATRI/plugins/status/data_source.py +++ b/ATRI/plugins/status/data_source.py @@ -11,8 +11,8 @@ from ATRI.exceptions import GetStatusError _status_msg = """ > Status Overview -[CPU: {p_cpu}% of {b_cpu}] -[Memory: {p_mem}% of {b_mem}] +[CPU: {b_cpu}% of {p_cpu}%] +[Memory: {b_mem} of {p_mem}%] [Disk usage: {p_disk}%] [Net sent: {inteSENT}MB] @@ -79,7 +79,7 @@ class Status(Service): p_cpu=cpu, p_mem=mem, p_disk=disk, - b_cpu=f"{b_cpu}%", + b_cpu=b_cpu, b_mem="%.1f%%" % b_mem, inteSENT=inte_send, inteRECV=inte_recv, diff --git a/ATRI/plugins/twitter/__init__.py b/ATRI/plugins/twitter/__init__.py index 360ba00..ab5d76d 100644 --- a/ATRI/plugins/twitter/__init__.py +++ b/ATRI/plugins/twitter/__init__.py @@ -62,9 +62,7 @@ async def _td_del_sub(event: GroupMessageEvent): for i in query_result: subs.append([i.name, i.tid]) - output = "本群订阅的推主列表如下~\n" + tabulate( - subs, headers=["推主名", "tid"], tablefmt="plain", showindex=True - ) + output = "本群订阅的推主列表如下~\n" + tabulate(subs, headers=["推主名", "tid"], tablefmt="plain") await del_sub.send(output) @@ -111,7 +109,7 @@ async def _td_get_sub_list(event: GroupMessageEvent): subs.append([i.name, tm]) output = "本群订阅的推主列表如下~\n" + tabulate( - subs, headers=["推主", "最后更新时间"], tablefmt="plain", showindex=True + subs, headers=["推主", "最后更新时间"], tablefmt="plain" ) await get_sub_list.finish(output) diff --git a/ATRI/plugins/wife/__init__.py b/ATRI/plugins/wife/__init__.py index e783946..dfa43eb 100644 --- a/ATRI/plugins/wife/__init__.py +++ b/ATRI/plugins/wife/__init__.py @@ -21,6 +21,7 @@ tietie_superuser = Wife().on_message( rule=Rule(), permission=SUPERUSER, block=False, + priority=11, ) diff --git a/test/test_plugin_help.py b/test/test_plugin_help.py index 3d975ac..ee68f58 100644 --- a/test/test_plugin_help.py +++ b/test/test_plugin_help.py @@ -91,7 +91,6 @@ async def test_service_list(app: App): services, headers=["服务名称", "开启状态(全局)", "仅支持管理员"], tablefmt="plain", - showindex=True, ) output = f"咱搭载了以下服务~\n{table}\n@bot 帮助 [服务] -以查看对应服务帮助" |