summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ATRI/plugins/anti_effort/__init__.py6
-rw-r--r--ATRI/plugins/broadcast.py8
-rw-r--r--ATRI/plugins/help/data_source.py16
-rw-r--r--ATRI/plugins/manage/__init__.py4
-rw-r--r--ATRI/plugins/repo.py9
-rw-r--r--ATRI/plugins/rss/rss_mikanan/__init__.py4
-rw-r--r--ATRI/plugins/rss/rss_rsshub/__init__.py4
-rw-r--r--ATRI/plugins/setu/__init__.py14
-rw-r--r--ATRI/plugins/util/data_source.py6
9 files changed, 36 insertions, 35 deletions
diff --git a/ATRI/plugins/anti_effort/__init__.py b/ATRI/plugins/anti_effort/__init__.py
index 4e3a7ec..aa38f78 100644
--- a/ATRI/plugins/anti_effort/__init__.py
+++ b/ATRI/plugins/anti_effort/__init__.py
@@ -26,7 +26,7 @@ ae = AntiEffort()
_lmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~", "呜呜...别急"])
-__GET_URL_MSG = (
+_GET_URL_MSG = (
MessageBuilder("请键入wakatime share embed URL:")
.text("- 前往 wakatime.com/share/embed")
.text("- Format 选择 JSON")
@@ -41,7 +41,7 @@ add_user = plugin.on_command("!我也要卷", "加入卷王统计榜")
@add_user.got(
"waka_url",
- __GET_URL_MSG,
+ _GET_URL_MSG,
)
@add_user.got("rank_nickname", "如何在排行榜中称呼你捏")
@add_user.got("to_global", "你希望加入公共排行榜吗？(y/n)", [Cooldown(60, prompt=_lmt_notice)])
@@ -80,7 +80,7 @@ async def _join_global_rank(event: GroupMessageEvent):
await join_global_rank.finish("完成~！")
-@join_global_rank.got("waka_url", __GET_URL_MSG)
+@join_global_rank.got("waka_url", _GET_URL_MSG)
@join_global_rank.got(
"rank_nickname", "如何在排行榜中称呼你捏", [Cooldown(60, prompt=_lmt_notice)]
)
diff --git a/ATRI/plugins/broadcast.py b/ATRI/plugins/broadcast.py
index c391230..ff09ad4 100644
--- a/ATRI/plugins/broadcast.py
+++ b/ATRI/plugins/broadcast.py
@@ -4,10 +4,8 @@ import asyncio
from nonebot.matcher import Matcher
from nonebot.params import CommandArg, ArgPlainText
-from nonebot.adapters.onebot.v11 import Message, MessageEvent
-from nonebot.adapters.onebot.v11 import GroupMessageEvent
+from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent, GroupMessageEvent
-from ATRI.bot import Bot
from ATRI.rule import to_bot
from ATRI.service import Service
from ATRI.utils import FileDealer
@@ -15,7 +13,7 @@ from ATRI.permission import ADMIN, MASTER
from ATRI.message import MessageBuilder
-__BROADCAST_REPO_FORMAT = (
+_BROADCAST_REPO_FORMAT = (
MessageBuilder("广播报告:")
.text("信息: {msg}")
.text("预计推送群:{len_group} 个")
@@ -80,7 +78,7 @@ async def _(bot: Bot, event: MessageEvent, msg: str = ArgPlainText("bc_msg")):
await asyncio.sleep(random.randint(2, 4))
- result = __BROADCAST_REPO_FORMAT.format(
+ result = _BROADCAST_REPO_FORMAT.format(
msg=bc_msg,
len_group=len(group_list),
success_group=len(success_group),
diff --git a/ATRI/plugins/help/data_source.py b/ATRI/plugins/help/data_source.py
index 8c26023..3386a74 100644
--- a/ATRI/plugins/help/data_source.py
+++ b/ATRI/plugins/help/data_source.py
@@ -8,15 +8,15 @@ from ATRI.message import MessageBuilder
from ATRI.service import SERVICES_DIR, ServiceTools
-__SERVICE_INFO_FORMAT = (
+_SERVICE_INFO_FORMAT = (
MessageBuilder("服务名：{service}")
.text("说明：{docs}")
.text("可用命令：\n{cmd_list}")
.text("是否全局启用：{enabled}")
- .text("Tip: @bot 帮助 [服务] [命令] 以查看对应命令详细信息")
+ .text("Tip: @bot 帮助 (服务) (命令) 以查看对应命令详细信息")
.done()
)
-__COMMAND_INFO_FORMAT = (
+_COMMAND_INFO_FORMAT = (
MessageBuilder("命令：{cmd}")
.text("类型：{cmd_type}")
.text("说明：{docs}")
@@ -32,7 +32,7 @@ class Helper:
MessageBuilder("哦呀?~需要帮助?")
.text("关于 查看bot基本信息")
.text("服务列表 -以查看所有可用服务")
- .text("帮助 [服务] -以查看对应服务帮助")
+ .text("帮助 (服务) -以查看对应服务帮助")
.text("Tip: 均需要at触发。@bot 菜单 以打开此页面")
.done()
)
@@ -77,7 +77,7 @@ class Helper:
return (
MessageBuilder("咱搭载了以下服务~")
.text(table)
- .text("@bot 帮助 [服务] -以查看对应服务帮助")
+ .text("@bot 帮助 (服务) -以查看对应服务帮助")
.done()
)
@@ -86,7 +86,7 @@ class Helper:
try:
data = ServiceTools().load_service(service)
except Exception:
- return "请检查是否输入错误呢...@bot 帮助 [服务]"
+ return "请检查是否输入错误呢...@bot 帮助 (服务)"
service_name = data.service
service_docs = data.docs
@@ -95,7 +95,7 @@ class Helper:
_service_cmd_list = list(data.cmd_list)
service_cmd_list = "\n".join(map(str, _service_cmd_list))
- repo = __SERVICE_INFO_FORMAT.format(
+ repo = _SERVICE_INFO_FORMAT.format(
service=service_name,
docs=service_docs,
cmd_list=service_cmd_list,
@@ -118,7 +118,7 @@ class Helper:
docs = cmd_info.get("docs", "ignore")
aliases = cmd_info.get("aliases", "ignore")
- repo = __COMMAND_INFO_FORMAT.format(
+ repo = _COMMAND_INFO_FORMAT.format(
cmd=cmd, cmd_type=cmd_type, docs=docs, aliases=aliases
)
return repo
diff --git a/ATRI/plugins/manage/__init__.py b/ATRI/plugins/manage/__init__.py
index e7e4d4e..0268ec9 100644
--- a/ATRI/plugins/manage/__init__.py
+++ b/ATRI/plugins/manage/__init__.py
@@ -246,7 +246,7 @@ async def _deal_group_unblock_service(
await group_unblock_service.finish(f"完成！～已允许本群使用服务：{aim_service}")
-get_friend_add_list = plugin.on_command("获取好友申请", "获取好友申请列表")
+get_friend_add_list = plugin.on_command("好友申请列表", "获取好友申请列表")
@get_friend_add_list.handle()
@@ -325,7 +325,7 @@ async def _deal_refuse_friend_add(
await refuse_friend_add.finish("已拒绝！")
-get_group_invite_list = plugin.on_command("获取邀请列表", "获取群邀请列表")
+get_group_invite_list = plugin.on_command("应邀入群列表", "获取群邀请列表")
@get_group_invite_list.handle()
diff --git a/ATRI/plugins/repo.py b/ATRI/plugins/repo.py
index 38bbe04..e3d7523 100644
--- a/ATRI/plugins/repo.py
+++ b/ATRI/plugins/repo.py
@@ -2,10 +2,9 @@ from random import choice
from nonebot.matcher import Matcher
from nonebot.params import CommandArg, ArgPlainText
-from nonebot.adapters.onebot.v11 import MessageEvent, Message
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message
from nonebot.adapters.onebot.v11.helpers import Cooldown
-from ATRI.bot import Bot
from ATRI.service import Service
from ATRI.message import MessageBuilder
@@ -23,10 +22,10 @@ _REPO_FORMAT = (
_REPO_FORMAT = MessageBuilder("来自用户{user}反馈:").text("{msg}").done()
-repo = Service("反馈").document("向维护者发送消息")
+plugin = Service("反馈").document("向维护者发送消息")
-reporter = repo.on_command("来杯红茶", "向维护者发送消息", aliases={"反馈", "报告"})
+reporter = plugin.on_command("来杯红茶", "向维护者发送消息", aliases={"反馈", "报告"})
@reporter.handle([Cooldown(120, prompt=_repo_flmt_notice)])
@@ -46,7 +45,7 @@ async def _deal_repo(
repo_0 = _REPO_FORMAT.format(user=user_id, msg=repo_msg)
try:
- await bot.send_to_master(repo_0)
+ await plugin.send_to_master(repo_0)
except Exception:
await reporter.finish("发送失败了呢...")
diff --git a/ATRI/plugins/rss/rss_mikanan/__init__.py b/ATRI/plugins/rss/rss_mikanan/__init__.py
index 3165438..ec8dd60 100644
--- a/ATRI/plugins/rss/rss_mikanan/__init__.py
+++ b/ATRI/plugins/rss/rss_mikanan/__init__.py
@@ -25,13 +25,15 @@ from ATRI.database import RssMikananiSubcription
from .data_source import RssMikananSubscriptor
+sub = RssMikananSubscriptor()
+
+
plugin = (
Service("rss.mikan")
.document("Rss的mikan支持")
.permission(ADMIN)
.main_cmd("/rss.mikan")
)
-sub = RssMikananSubscriptor()
add_sub = plugin.cmd_as_group("add", "为本群添加 Mikan 订阅")
diff --git a/ATRI/plugins/rss/rss_rsshub/__init__.py b/ATRI/plugins/rss/rss_rsshub/__init__.py
index 7d2843b..969fe0a 100644
--- a/ATRI/plugins/rss/rss_rsshub/__init__.py
+++ b/ATRI/plugins/rss/rss_rsshub/__init__.py
@@ -23,13 +23,15 @@ from ATRI.database import RssRsshubSubcription
from .data_source import RssHubSubscriptor
+sub = RssHubSubscriptor()
+
+
plugin = (
Service("rss.rsshub")
.document("Rss的Rsshub支持")
.permission(ADMIN)
.main_cmd("/rss.rsshub")
)
-sub = RssHubSubscriptor()
add_sub = plugin.cmd_as_group("add", "为本群添加 RSSHub 订阅")
diff --git a/ATRI/plugins/setu/__init__.py b/ATRI/plugins/setu/__init__.py
index 21721d5..1dea9b4 100644
--- a/ATRI/plugins/setu/__init__.py
+++ b/ATRI/plugins/setu/__init__.py
@@ -14,10 +14,10 @@ from ATRI.permission import MASTER
from .data_source import Setu
-setu = Service("涩图").document("hso!")
+plugin = Service("涩图").document("hso!")
-random_setu = setu.on_command("来张涩图", "来张随机涩图，冷却2分钟", aliases={"涩图来", "来点涩图", "来份涩图"})
+random_setu = plugin.on_command("来张涩图", "来张随机涩图，冷却2分钟", aliases={"涩图来", "来点涩图", "来份涩图"})
@random_setu.handle([Cooldown(120)])
@@ -51,7 +51,7 @@ async def _(think: str = ArgPlainText("r_rush_after_think")):
await random_setu.finish(is_repo)
-tag_setu = setu.on_regex(r"来[张点丶份](.*?)的[涩色🐍]图", "根据提供的tag查找涩图，冷却2分钟")
+tag_setu = plugin.on_regex(r"来[张点丶份](.*?)的[涩色🐍]图", "根据提供的tag查找涩图，冷却2分钟")
@tag_setu.handle([Cooldown(120, prompt="慢...慢一..点❤")])
@@ -62,7 +62,7 @@ async def _tag_setu(bot: Bot, event: MessageEvent):
pattern = r"来[张点丶份](.*?)的[涩色🐍]图"
tag = re.findall(pattern, msg)[0]
repo, se = await Setu.tag_setu(tag)
- if not setu:
+ if not plugin:
await tag_setu.finish(repo)
await bot.send(event, repo)
@@ -89,7 +89,7 @@ async def _(think: str = ArgPlainText("t_rush_after_think")):
_catcher_max_file_size = 128
-setu_catcher = setu.on_message("涩图嗅探", "涩图嗅探器", block=False)
+setu_catcher = plugin.on_message("涩图嗅探", "涩图嗅探器", block=False)
@setu_catcher.handle()
@@ -131,7 +131,7 @@ async def _setu_catcher(bot: Bot, event: MessageEvent):
await bot.send_private_msg(user_id=superuser, message=s_repo)
-nsfw_checker = setu.on_command("/nsfw", "涩值检测")
+nsfw_checker = plugin.on_command("/nsfw", "涩值检测")
@nsfw_checker.got("nsfw_img", "图呢？")
@@ -159,7 +159,7 @@ async def _deal_check(bot: Bot, event: MessageEvent):
await nsfw_checker.finish(resu)
-catcher_setting = setu.on_command("嗅探设置", "涩图检测图片文件大小设置", permission=MASTER)
+catcher_setting = plugin.on_command("嗅探设置", "涩图检测图片文件大小设置", permission=MASTER)
@catcher_setting.handle()
diff --git a/ATRI/plugins/util/data_source.py b/ATRI/plugins/util/data_source.py
index 5245518..68edc82 100644
--- a/ATRI/plugins/util/data_source.py
+++ b/ATRI/plugins/util/data_source.py
@@ -1,7 +1,7 @@
import re
from math import floor
import jieba.posseg as pseg
-from typing import Union, Optional
+from typing import Union
from random import random, choice, randint
@@ -179,7 +179,7 @@ class Yinglish:
def __init__(self, context: str):
self.context = context
- def _to_ying(x, y, ying) -> str:
+ def _to_ying(self, x: str, y: str, ying: float) -> str:
if random() > ying:
return x
if x in ["，", "。"]:
@@ -202,5 +202,5 @@ class Yinglish:
x = "〇" * len(x)
return str(choice([f"...{x}", f"....{x}", f".....{x}", f"......{x}"]))
- def deal(self, ying: Optional[float] = 0.5) -> str:
+ def deal(self, ying: float = 0.5) -> str:
return "".join([self._to_ying(x, y, ying) for x, y in pseg.cut(self.context)])
Powered by cgit, Theme cgit-dark created by Ted Yin, updated by Mole Shang.