Skip to content

Commit

Permalink
Merge pull request #32 from Cypas/test
Browse files Browse the repository at this point in the history
更新武器别名
  • Loading branch information
Cypas authored Sep 21, 2024
2 parents 6ebf2b9 + ff68db6 commit 7d7943e
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
4 changes: 2 additions & 2 deletions nonebot_plugin_splatoon3_schedule/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ async def _(bot: Bot, event: Event):

# 配装 触发器
matcher_build = on_regex(
"^[\\/.,,。]?配装\s{0,2}([\\u4e00-\\u9fa5a-zA-Z0-9·-]{2,20}(\s(装饰|改装|联名|新型|新艺术|金属箔|精英|精英装饰|姐妹|高磁波|墨黑|薄荷|黑|白|甲|乙))?)?\s?(区域|区|推塔|抢塔|塔楼|塔|蛤蜊|蛤|抢鱼|鱼虎|鱼|涂地|涂涂|涂)?$",
"^[\\/.,,。]?配装\s{0,2}([\\u4e00-\\u9fa5a-zA-Z0-9·-]{2,20}?(\s(装饰|改装|联名|新型|新艺术|金属箔|精英|精英装饰|姐妹|高磁波|墨黑|薄荷|黑|白|甲|乙))?)?\s?(区域|区|推塔|抢塔|塔楼|塔|蛤蜊|蛤|抢鱼|鱼虎|鱼|涂地|涂涂|涂)?$",
priority=8,
block=True,
)
Expand Down Expand Up @@ -240,7 +240,7 @@ async def _(bot: Bot, event: Event, re_tuple: Tuple = RegexGroup()):
# 查询对应武器
build_info = db_image.get_build_info(weapon_name, is_deco)
if not build_info:
msg = "该关键词未查询到对应武器,请试试使用官方中文武器名称或其他常用名称后再试"
msg = f"该关键词 {weapon_name} 未查询到对应武器,请试试使用官方中文武器名称或其他常用名称后再试,如:\n/配装 小绿\n指定模式查询:\n/配装 贴牌碳刷 塔楼"
logger.warning(f"该关键词未匹配到武器 {weapon_name}")
await send_msg(bot, event, msg)
return
Expand Down
4 changes: 2 additions & 2 deletions nonebot_plugin_splatoon3_schedule/image/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ async def get_build_image(*args):

url = f"https://sendou.ink/builds/{sendou_name}?limit=6"
if mode:
url += '&f=[{"type":"mode","mode":"' + mode + '"},{"type":"date","date":"2024-07-17"}]'
url += '&f=[{"type":"mode","mode":"' + mode + '"},{"type":"date","date":"2024-09-12"}]'
else:
url += '&f=[{"type":"date","date":"2024-07-17"}]'
url += '&f=[{"type":"date","date":"2024-09-12"}]'

logger.info(f"sendou.ink url:{url}")
try:
Expand Down
Binary file modified nonebot_plugin_splatoon3_schedule/resource/db/image.db
Binary file not shown.
5 changes: 3 additions & 2 deletions nonebot_plugin_splatoon3_schedule/utils/translation.py
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ def weapon_semantic_word_conversion(word: str):
"无印": "",
"炮": "泡",
"息": "熄",
"篮": "蓝",
" ": "",
".": "",
"。": "",
Expand Down Expand Up @@ -350,10 +351,10 @@ def weapon_semantic_word_conversion(word: str):
"Bamboozler 14 Mk II": "14式竹筒枪·乙",
"Charcoal Decavitator": "巨齿刮水刀 墨黑",
"Custom Douser Dualies FF": "灭熄FF 改装",
"Custom Hydra Splatling": "审查者·新艺术",
"Custom Hydra Splatling": "消防栓旋转枪 改装",
"Custom Range Blaster": "远距爆破枪 改装",
"Custom Wellstring V": "邦普V 改装",
"Heavy Edit Splatling Nouveau": "消防栓旋转枪 改装",
"Heavy Edit Splatling Nouveau": "审查者·新艺术",
"Mint Decavitator": "巨齿刮水刀 薄荷",
"Recycled Brella 24 Mk II": "24式可替换伞·乙",
"Wellstring V": "邦普V",
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "nonebot-plugin-splatoon3-schedule"
version = "1.9.1"
version = "1.9.2"
description = "一个基于nonebot2框架的splatoon3游戏日程查询插件"
authors = ["cypas <ayano05@outlook.com>"]
readme = "README.md"
Expand Down

0 comments on commit 7d7943e

Please sign in to comment.