mirror of
https://github.com/zhenxun-org/zhenxun_bot.git
synced 2026-09-30 17:20:03 +08:00
update 0.0.6.5
This commit is contained in:
@@ -59,7 +59,6 @@ async def get_chat_result(text: str, img_url: str, user_id: int, nickname: str)
|
||||
nickname += "大~人~"
|
||||
rst = rst.replace("小主人", nickname).replace("小朋友", nickname)
|
||||
ai_message_manager.add_result(user_id, rst)
|
||||
print(ai_message_manager)
|
||||
return rst
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
from configs.config import Config
|
||||
import nonebot
|
||||
|
||||
nonebot.load_plugins("plugins/alapi")
|
||||
|
||||
Config.add_plugin_config(
|
||||
"alapi",
|
||||
@@ -9,3 +8,7 @@ Config.add_plugin_config(
|
||||
None,
|
||||
help_="在https://admin.alapi.cn/user/login登录后获取token"
|
||||
)
|
||||
|
||||
|
||||
nonebot.load_plugins("plugins/alapi")
|
||||
|
||||
|
||||
@@ -110,17 +110,17 @@ async def _():
|
||||
f"当前版本:{_version},最新版本:{latest_version}\n"
|
||||
f"尝试自动更新...",
|
||||
)
|
||||
try:
|
||||
code = await check_update(bot)
|
||||
except Exception as e:
|
||||
logger.error(f"更新真寻未知错误 {type(e)}:{e}")
|
||||
await bot.send_private_msg(
|
||||
user_id=int(list(bot.config.superusers)[0]),
|
||||
message=f"更新真寻未知错误 {type(e)}:{e}\n",
|
||||
)
|
||||
else:
|
||||
if code == 200:
|
||||
await bot.send_private_msg(
|
||||
user_id=int(list(bot.config.superusers)[0]),
|
||||
message=f"更新完毕,请重启真寻....",
|
||||
)
|
||||
# try:
|
||||
# code = await check_update(bot)
|
||||
# except Exception as e:
|
||||
# logger.error(f"更新真寻未知错误 {type(e)}:{e}")
|
||||
# await bot.send_private_msg(
|
||||
# user_id=int(list(bot.config.superusers)[0]),
|
||||
# message=f"更新真寻未知错误 {type(e)}:{e}\n",
|
||||
# )
|
||||
# else:
|
||||
# if code == 200:
|
||||
# await bot.send_private_msg(
|
||||
# user_id=int(list(bot.config.superusers)[0]),
|
||||
# message=f"更新完毕,请重启真寻....",
|
||||
# )
|
||||
|
||||
@@ -51,4 +51,3 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
|
||||
except Exception as e:
|
||||
await coser.send("你cos给我看!")
|
||||
logger.error(f"coser 发送了未知错误 {type(e)}:{e}")
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import os
|
||||
from nonebot.adapters.cqhttp import MessageSegment, Message
|
||||
import nonebot
|
||||
import random
|
||||
from .update_game_info import update_info
|
||||
from .util import generate_img, init_star_rst, BaseData, set_list, get_star, init_up_char
|
||||
@@ -15,7 +14,6 @@ try:
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
driver: nonebot.Driver = nonebot.get_driver()
|
||||
|
||||
announcement = GenshinAnnouncement()
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
import os
|
||||
import nonebot
|
||||
from nonebot.adapters.cqhttp import MessageSegment, Message
|
||||
from .update_game_info import update_info
|
||||
from .announcement import GuardianAnnouncement
|
||||
@@ -18,7 +17,6 @@ try:
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
driver: nonebot.Driver = nonebot.get_driver()
|
||||
|
||||
announcement = GuardianAnnouncement()
|
||||
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
|
||||
import nonebot
|
||||
from .update_game_info import update_info
|
||||
from .announcement import PrettyAnnouncement
|
||||
from .util import init_star_rst, generate_img, max_card, BaseData, \
|
||||
@@ -15,7 +14,6 @@ try:
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
driver: nonebot.Driver = nonebot.get_driver()
|
||||
|
||||
announcement = PrettyAnnouncement()
|
||||
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
from nonebot.adapters.cqhttp import MessageSegment, Message
|
||||
import nonebot
|
||||
import random
|
||||
from .config import PRTS_FIVE_P, PRTS_FOUR_P, PRTS_SIX_P, PRTS_THREE_P, DRAW_PATH, PRTS_FLAG
|
||||
from .update_game_info import update_info
|
||||
@@ -15,7 +14,6 @@ try:
|
||||
except ModuleNotFoundError:
|
||||
import json
|
||||
|
||||
driver: nonebot.Driver = nonebot.get_driver()
|
||||
|
||||
announcement = PrtsAnnouncement()
|
||||
|
||||
|
||||
@@ -65,4 +65,4 @@ async def _():
|
||||
mes = alc_img + "\n ※ 黄历数据来源于 genshin.pub"
|
||||
for gid in gl:
|
||||
if await group_manager.check_group_task_status(gid, "genshin_alc"):
|
||||
await bot.send_group_msg(group_id=int(gid), message=mes)
|
||||
await bot.send_group_msg(group_id=int(gid), message="" + mes)
|
||||
|
||||
@@ -8,6 +8,7 @@ from asyncio.exceptions import TimeoutError
|
||||
from asyncio import Semaphore
|
||||
from utils.image_utils import is_valid
|
||||
from utils.http_utils import AsyncHttpx
|
||||
from httpx import ConnectTimeout
|
||||
from pathlib import Path
|
||||
from .map import Map
|
||||
import asyncio
|
||||
@@ -150,9 +151,11 @@ async def download_resource_data(semaphore: Semaphore):
|
||||
logger.warning(f'获取原神资源失败 msg: {data["message"]}')
|
||||
else:
|
||||
logger.warning(f"获取原神资源失败 code:{response.status_code}")
|
||||
except TimeoutError:
|
||||
except (TimeoutError, ConnectTimeout):
|
||||
logger.warning("获取原神资源数据超时...已再次尝试...")
|
||||
await download_resource_data(semaphore)
|
||||
except Exception as e:
|
||||
logger.error(f"获取原神资源数据未知错误 {type(e)}:{e}")
|
||||
|
||||
|
||||
# 下载原神地图并拼图
|
||||
@@ -164,55 +167,65 @@ async def download_map_init(
|
||||
_map = map_path / "map.png"
|
||||
if _map.exists() and os.path.getsize(_map) > 1024 * 1024 * 30:
|
||||
_map.unlink()
|
||||
response = await AsyncHttpx.get(MAP_URL)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
if data["message"] == "OK":
|
||||
data = json.loads(data["data"]["info"]["detail"])
|
||||
CENTER_POINT = (data["origin"][0], data["origin"][1])
|
||||
if not _map.exists():
|
||||
data = data["slices"]
|
||||
idx = 0
|
||||
for _map_data in data[0]:
|
||||
map_url = _map_data['url']
|
||||
await download_image(
|
||||
map_url,
|
||||
f"{map_path}/{idx}.png",
|
||||
semaphore,
|
||||
force_flag=flag,
|
||||
)
|
||||
idx += 1
|
||||
_w, h = CreateImg(0, 0, background=f"{map_path}/0.png", ratio=MAP_RATIO).size
|
||||
w = _w * len(os.listdir(map_path))
|
||||
map_file = CreateImg(w, h, _w, h, ratio=MAP_RATIO)
|
||||
for i in range(idx):
|
||||
map_file.paste(CreateImg(0, 0, background=f"{map_path}/{i}.png", ratio=MAP_RATIO))
|
||||
map_file.save(f"{map_path}/map.png")
|
||||
try:
|
||||
response = await AsyncHttpx.get(MAP_URL)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
if data["message"] == "OK":
|
||||
data = json.loads(data["data"]["info"]["detail"])
|
||||
CENTER_POINT = (data["origin"][0], data["origin"][1])
|
||||
if not _map.exists():
|
||||
data = data["slices"]
|
||||
idx = 0
|
||||
for _map_data in data[0]:
|
||||
map_url = _map_data['url']
|
||||
await download_image(
|
||||
map_url,
|
||||
f"{map_path}/{idx}.png",
|
||||
semaphore,
|
||||
force_flag=flag,
|
||||
)
|
||||
idx += 1
|
||||
_w, h = CreateImg(0, 0, background=f"{map_path}/0.png", ratio=MAP_RATIO).size
|
||||
w = _w * len(os.listdir(map_path))
|
||||
map_file = CreateImg(w, h, _w, h, ratio=MAP_RATIO)
|
||||
for i in range(idx):
|
||||
map_file.paste(CreateImg(0, 0, background=f"{map_path}/{i}.png", ratio=MAP_RATIO))
|
||||
map_file.save(f"{map_path}/map.png")
|
||||
else:
|
||||
logger.warning(f'获取原神地图失败 msg: {data["message"]}')
|
||||
else:
|
||||
logger.warning(f'获取原神地图失败 msg: {data["message"]}')
|
||||
else:
|
||||
logger.warning(f"获取原神地图失败 code:{response.status}")
|
||||
logger.warning(f"获取原神地图失败 code:{response.status_code}")
|
||||
except (TimeoutError, ConnectTimeout):
|
||||
logger.warning("下载原神地图数据超时....")
|
||||
except Exception as e:
|
||||
logger.error(f"下载原神地图数据超时 {type(e)}:{e}")
|
||||
|
||||
|
||||
# 下载资源类型数据
|
||||
async def download_resource_type():
|
||||
resource_type_file.parent.mkdir(parents=True, exist_ok=True)
|
||||
response = await AsyncHttpx.get(LABEL_URL)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
if data["message"] == "OK":
|
||||
data = data["data"]["tree"]
|
||||
resource_data = {}
|
||||
for x in data:
|
||||
id_ = x["id"]
|
||||
resource_data[id_] = x
|
||||
with open(resource_type_file, "w", encoding="utf8") as f:
|
||||
json.dump(resource_data, f, ensure_ascii=False, indent=4)
|
||||
logger.info(f"更新原神资源类型成功...")
|
||||
try:
|
||||
response = await AsyncHttpx.get(LABEL_URL)
|
||||
if response.status_code == 200:
|
||||
data = response.json()
|
||||
if data["message"] == "OK":
|
||||
data = data["data"]["tree"]
|
||||
resource_data = {}
|
||||
for x in data:
|
||||
id_ = x["id"]
|
||||
resource_data[id_] = x
|
||||
with open(resource_type_file, "w", encoding="utf8") as f:
|
||||
json.dump(resource_data, f, ensure_ascii=False, indent=4)
|
||||
logger.info(f"更新原神资源类型成功...")
|
||||
else:
|
||||
logger.warning(f'获取原神资源类型失败 msg: {data["message"]}')
|
||||
else:
|
||||
logger.warning(f'获取原神资源类型失败 msg: {data["message"]}')
|
||||
else:
|
||||
logger.warning(f"获取原神资源类型失败 code:{response.status_code}")
|
||||
logger.warning(f"获取原神资源类型失败 code:{response.status_code}")
|
||||
except (TimeoutError, ConnectTimeout):
|
||||
logger.warning("下载原神资源类型数据超时....")
|
||||
except Exception as e:
|
||||
logger.error(f"载原神资源类型数据超时 {type(e)}:{e}")
|
||||
|
||||
|
||||
# 初始化资源图标
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
from models.bag_user import BagUser
|
||||
from utils.utils import is_number, get_local_proxy, get_user_avatar
|
||||
from utils.utils import is_number, get_user_avatar
|
||||
from utils.image_utils import CreateImg
|
||||
from utils.user_agent import get_user_agent
|
||||
from configs.path_config import IMAGE_PATH
|
||||
from .model import RedbagUser
|
||||
import random
|
||||
|
||||
@@ -22,7 +22,7 @@ __plugin_des__ = "指定图库图片上传"
|
||||
__plugin_cmd__ = ["上传图片 [图库] [图片]", "连续上传图片 [图库]", "查看公开图库"]
|
||||
__plugin_version__ = 0.1
|
||||
__plugin_author__ = "HibiKier"
|
||||
__plugin_settings__ = {"admin_level": Config.get_config("image_management", "DELETE_IMAGE_LEVEL")}
|
||||
__plugin_settings__ = {"admin_level": Config.get_config("image_management", "UPLOAD_IMAGE_LEVEL")}
|
||||
|
||||
upload_img = on_command("上传图片", rule=to_me(), priority=5, block=True)
|
||||
|
||||
|
||||
Executable → Regular
+48
-48
@@ -1,48 +1,48 @@
|
||||
from nonebot import on_command
|
||||
from nonebot.adapters.cqhttp.permission import GROUP
|
||||
from nonebot.typing import T_State
|
||||
from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
|
||||
from models.group_member_info import GroupInfoUser
|
||||
from datetime import timedelta
|
||||
from models.level_user import LevelUser
|
||||
|
||||
|
||||
__zx_plugin_name__ = "个人信息权限查看"
|
||||
__plugin_usage__ = """
|
||||
usage:
|
||||
个人信息权限查看
|
||||
指令:
|
||||
我的信息
|
||||
我的权限
|
||||
""".strip()
|
||||
__plugin_des__ = "我们还记得你和你的权利"
|
||||
__plugin_cmd__ = ["我的信息", "我的权限"]
|
||||
__plugin_version__ = 0.1
|
||||
__plugin_author__ = "HibiKier"
|
||||
|
||||
|
||||
get_my_group_info = on_command("我的信息", permission=GROUP, priority=1, block=True)
|
||||
my_level = on_command("我的权限", permission=GROUP, priority=5, block=True)
|
||||
|
||||
|
||||
@get_my_group_info.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
result = await get_member_info(event.user_id, event.group_id)
|
||||
await get_my_group_info.finish(result)
|
||||
|
||||
|
||||
async def get_member_info(user_qq: int, group_id: int) -> str:
|
||||
user = await GroupInfoUser.get_member_info(user_qq, group_id)
|
||||
if user is None:
|
||||
return "该群员不在列表中,请更新群成员信息"
|
||||
result = ""
|
||||
result += "昵称:" + user.user_name + "\n"
|
||||
result += "加群时间:" + str(user.user_join_time.date() + timedelta(hours=8))
|
||||
return result
|
||||
|
||||
|
||||
@my_level.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
if (level := await LevelUser.get_user_level(event.user_id, event.group_id)) == -1:
|
||||
await my_level.finish("您目前没有任何权限了,硬要说的话就是0吧~", at_sender=True)
|
||||
await my_level.finish(f"您目前的权限等级:{level}", at_sender=True)
|
||||
from nonebot import on_command
|
||||
from nonebot.adapters.cqhttp.permission import GROUP
|
||||
from nonebot.typing import T_State
|
||||
from nonebot.adapters.cqhttp import Bot, GroupMessageEvent
|
||||
from models.group_member_info import GroupInfoUser
|
||||
from datetime import timedelta
|
||||
from models.level_user import LevelUser
|
||||
|
||||
|
||||
__zx_plugin_name__ = "个人信息权限查看"
|
||||
__plugin_usage__ = """
|
||||
usage:
|
||||
个人信息权限查看
|
||||
指令:
|
||||
我的信息
|
||||
我的权限
|
||||
""".strip()
|
||||
__plugin_des__ = "我们还记得你和你的权利"
|
||||
__plugin_cmd__ = ["我的信息", "我的权限"]
|
||||
__plugin_version__ = 0.1
|
||||
__plugin_author__ = "HibiKier"
|
||||
|
||||
|
||||
get_my_group_info = on_command("我的信息", permission=GROUP, priority=1, block=True)
|
||||
my_level = on_command("我的权限", permission=GROUP, priority=5, block=True)
|
||||
|
||||
|
||||
@get_my_group_info.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
result = await get_member_info(event.user_id, event.group_id)
|
||||
await get_my_group_info.finish(result)
|
||||
|
||||
|
||||
async def get_member_info(user_qq: int, group_id: int) -> str:
|
||||
user = await GroupInfoUser.get_member_info(user_qq, group_id)
|
||||
if user is None:
|
||||
return "该群员不在列表中,请更新群成员信息"
|
||||
result = ""
|
||||
result += "昵称:" + user.user_name + "\n"
|
||||
result += "加群时间:" + str(user.user_join_time.date() + timedelta(hours=8))
|
||||
return result
|
||||
|
||||
|
||||
@my_level.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
if (level := await LevelUser.get_user_level(event.user_id, event.group_id)) == -1:
|
||||
await my_level.finish("您目前没有任何权限了,硬要说的话就是0吧~", at_sender=True)
|
||||
await my_level.finish(f"您目前的权限等级:{level}", at_sender=True)
|
||||
@@ -0,0 +1,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,3 +1 @@
|
||||
from .pixiv_keyword_user import *
|
||||
from .omega_pixiv_illusts import *
|
||||
from .pixiv import *
|
||||
|
||||
|
||||
@@ -139,3 +139,15 @@ class OmegaPixivIllusts(db.Model):
|
||||
data = await cls.select('pid').gino.all()
|
||||
return [x[0] for x in data]
|
||||
|
||||
@classmethod
|
||||
async def test(cls, nsfw_tag: int = 1):
|
||||
if nsfw_tag is not None:
|
||||
query = cls.query.where(cls.nsfw_tag == nsfw_tag)
|
||||
else:
|
||||
query = cls.query
|
||||
query = query.where((cls.width - cls.height) < 50)
|
||||
for x in await query.gino.all():
|
||||
print(x.pid)
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -64,6 +64,11 @@ __plugin_configs__ = {
|
||||
"value": 10,
|
||||
"help": "图片下载超时限制",
|
||||
"default_value": 10
|
||||
},
|
||||
"MAX_PAGE_LIMIT": {
|
||||
"value": 20,
|
||||
"help": "作品最大页数限制,超过的作品会被略过",
|
||||
"default_value": 20
|
||||
}
|
||||
}
|
||||
Config.add_plugin_config(
|
||||
|
||||
@@ -89,8 +89,13 @@ async def parser_data(
|
||||
else:
|
||||
return ["网络不太好?没有该页数?也许过一会就好了..."], 998
|
||||
num = num if num < 30 else 30
|
||||
data = data[:num]
|
||||
_data = []
|
||||
for x in data:
|
||||
if x["page_count"] < Config.get_config("pixiv_rank_search", "MAX_PAGE_LIMIT"):
|
||||
_data.append(x)
|
||||
if len(_data) == num:
|
||||
break
|
||||
for x in _data:
|
||||
if type_ == "search" and r18 == 1:
|
||||
if "R-18" in str(x["tags"]):
|
||||
continue
|
||||
|
||||
@@ -37,8 +37,8 @@ async def update_old_setu_data():
|
||||
for x in data:
|
||||
if file == setu_data_file:
|
||||
idx = index
|
||||
if 'R-18' in data[x]["tags"]:
|
||||
data[x]["tags"].remove('R-18')
|
||||
if "R-18" in data[x]["tags"]:
|
||||
data[x]["tags"].remove("R-18")
|
||||
else:
|
||||
idx = r18_index
|
||||
img_url = (
|
||||
@@ -58,14 +58,16 @@ async def update_old_setu_data():
|
||||
",".join(data[x]["tags"]),
|
||||
)
|
||||
count += 1
|
||||
if 'R-18' in data[x]["tags"]:
|
||||
if "R-18" in data[x]["tags"]:
|
||||
r18_index += 1
|
||||
else:
|
||||
index += 1
|
||||
logger.info(f'添加旧色图数据成功 PID:{data[x]["pid"]} index:{idx}....')
|
||||
except UniqueViolationError:
|
||||
fail_count += 1
|
||||
logger.info(f'添加旧色图数据失败,色图重复 PID:{data[x]["pid"]} index:{idx}....')
|
||||
logger.info(
|
||||
f'添加旧色图数据失败,色图重复 PID:{data[x]["pid"]} index:{idx}....'
|
||||
)
|
||||
file.unlink()
|
||||
setu_url_path = path / "setu_url.json"
|
||||
setu_r18_url_path = path / "setu_r18_url.json"
|
||||
@@ -106,21 +108,25 @@ async def update_setu_img():
|
||||
url_ = image.img_url
|
||||
ws_url = Config.get_config("pixiv", "PIXIV_NGINX_URL")
|
||||
if ws_url:
|
||||
url_ = url_.replace("i.pximg.net", ws_url).replace("i.pixiv.cat", ws_url)
|
||||
url_ = url_.replace("i.pximg.net", ws_url).replace(
|
||||
"i.pixiv.cat", ws_url
|
||||
)
|
||||
try:
|
||||
if not await AsyncHttpx.download_file(url_, rar_path / f'{image.local_id}.jpg'):
|
||||
if not await AsyncHttpx.download_file(
|
||||
url_, rar_path / f"{image.local_id}.jpg"
|
||||
):
|
||||
continue
|
||||
_success += 1
|
||||
try:
|
||||
if (
|
||||
os.path.getsize(
|
||||
rar_path / f'{image.local_id}.jpg',
|
||||
rar_path / f"{image.local_id}.jpg",
|
||||
)
|
||||
> 1024 * 1024 * 1.5
|
||||
):
|
||||
compressed_image(
|
||||
rar_path / f"{image.local_id}.jpg",
|
||||
path / f"{image.local_id}.jpg"
|
||||
path / f"{image.local_id}.jpg",
|
||||
)
|
||||
else:
|
||||
logger.info(
|
||||
@@ -134,30 +140,20 @@ async def update_setu_img():
|
||||
except FileNotFoundError:
|
||||
logger.warning(f"文件 {image.local_id}.jpg 不存在,跳过...")
|
||||
continue
|
||||
img_hash = str(
|
||||
get_img_hash(
|
||||
f"{path}/{image.local_id}.jpg"
|
||||
)
|
||||
)
|
||||
await Setu.update_setu_data(
|
||||
image.pid, img_hash=img_hash
|
||||
)
|
||||
img_hash = str(get_img_hash(f"{path}/{image.local_id}.jpg"))
|
||||
await Setu.update_setu_data(image.pid, img_hash=img_hash)
|
||||
except Exception as e:
|
||||
_success -= 1
|
||||
logger.error(f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}")
|
||||
if type(e) not in error_type:
|
||||
error_type.append(type(e))
|
||||
error_info.append(
|
||||
f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}"
|
||||
)
|
||||
error_info.append(f"更新色图 {image.local_id}.jpg 错误 {type(e)}: {e}")
|
||||
else:
|
||||
logger.info(f'更新色图 {image.local_id}.jpg 已存在')
|
||||
error_info = ['无报错..'] if not error_info else error_info
|
||||
if count or _success or (error_info and "无报错.." not in error_info):
|
||||
logger.info(f"更新色图 {image.local_id}.jpg 已存在")
|
||||
error_info = ["无报错.."] if not error_info else error_info
|
||||
if count or _success or error_info:
|
||||
await get_bot().send_private_msg(
|
||||
user_id=int(list(get_bot().config.superusers)[0]),
|
||||
message=f'{str(datetime.now()).split(".")[0]} 更新 色图 完成,本地存在 {count} 张,实际更新 {_success} 张,以下为更新时未知错误:\n'
|
||||
+ "\n".join(error_info),
|
||||
message=f'{str(datetime.now()).split(".")[0]} 更新 色图 完成,本地存在 {count} 张,实际更新 {_success} 张,'
|
||||
f"以下为更新时未知错误:\n" + "\n".join(error_info),
|
||||
)
|
||||
|
||||
|
||||
|
||||
+2
-2
@@ -43,10 +43,10 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
msg = get_message_text(event.json()).strip().split(" ")
|
||||
num = 1
|
||||
if len(msg) > 1:
|
||||
if is_number(msg[1]):
|
||||
if is_number(msg[1]) and int(msg[1]) > 0:
|
||||
num = int(msg[1])
|
||||
else:
|
||||
await buy.finish("购买的数量要是数字!", at_sender=True)
|
||||
await buy.finish("购买的数量要是数字且大于0!", at_sender=True)
|
||||
# print(msg, num)
|
||||
if is_number(msg[0]):
|
||||
msg = int(msg[0])
|
||||
|
||||
@@ -19,17 +19,23 @@ data_dir = Path(DATA_PATH) / "word_bank"
|
||||
data_dir.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
|
||||
message_handle = on_message(priority=7, block=True, rule=check)
|
||||
message_handle = on_message(priority=5, block=True, rule=check)
|
||||
|
||||
|
||||
@message_handle.handle()
|
||||
async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
path = data_dir / f"{event.group_id}"
|
||||
q = await WordBank.check(event.group_id, get_message_text(event.json()))
|
||||
placeholder_list = [
|
||||
(x.split("<_s>")[0], x.split("<_s>")[1])
|
||||
for x in q.format.split("<format>")[:-1]
|
||||
] if q.format else []
|
||||
q = await WordBank.check(
|
||||
event.group_id, get_message_text(event.json()), event.is_tome()
|
||||
)
|
||||
placeholder_list = (
|
||||
[
|
||||
(x.split("<_s>")[0], x.split("<_s>")[1])
|
||||
for x in q.format.split("<format>")[:-1]
|
||||
]
|
||||
if q.format
|
||||
else []
|
||||
)
|
||||
answer = ""
|
||||
_a = q.answer
|
||||
if not placeholder_list:
|
||||
@@ -37,8 +43,10 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
else:
|
||||
for idx, placeholder in placeholder_list:
|
||||
if placeholder.endswith("jpg"):
|
||||
answer += _a[:_a.find(f"[__placeholder_{idx}]")] + image(path / placeholder)
|
||||
answer += _a[: _a.find(f"[__placeholder_{idx}]")] + image(
|
||||
path / placeholder
|
||||
)
|
||||
else:
|
||||
answer += _a[:_a.find(f"[__placeholder_{idx}]")] + at(placeholder)
|
||||
_a = _a[_a.find(f"[__placeholder_{idx}]") + len(f"[__placeholder_{idx}]"):]
|
||||
answer += _a[: _a.find(f"[__placeholder_{idx}]")] + at(placeholder)
|
||||
_a = _a[_a.find(f"[__placeholder_{idx}]") + len(f"[__placeholder_{idx}]") :]
|
||||
await message_handle.send(answer)
|
||||
|
||||
@@ -3,6 +3,7 @@ from typing import Optional, List, Union, Tuple
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
from configs.path_config import DATA_PATH
|
||||
import re
|
||||
import random
|
||||
|
||||
|
||||
@@ -97,18 +98,39 @@ class WordBank(db.Model):
|
||||
q = await cls.query.where(cls.group_id == group_id).gino.all()
|
||||
q = [x.problem for x in q]
|
||||
q.sort()
|
||||
return list(set(q))
|
||||
_tmp = []
|
||||
for problem in q:
|
||||
if "[_to_me" in problem:
|
||||
r = re.search(r"\[_to_me\|(.*?)](.*)", problem)
|
||||
if r:
|
||||
bot_name = r.group(1)
|
||||
problem = problem.replace(f"[_to_me|{bot_name}]", bot_name)
|
||||
_tmp.append(problem)
|
||||
return list(set(_tmp))
|
||||
|
||||
@classmethod
|
||||
async def check(cls, group_id: int, problem: str) -> Optional["WordBank"]:
|
||||
async def check(cls, group_id: int, problem: str, is_tome: bool = False) -> Optional["WordBank"]:
|
||||
"""
|
||||
检测词条并随机返回
|
||||
:param group_id: 群号
|
||||
:param problem: 问题
|
||||
:param is_tome:是否at真寻
|
||||
"""
|
||||
q = await cls.query.where(
|
||||
(cls.group_id == group_id) & (cls.problem == problem)
|
||||
).gino.all()
|
||||
if is_tome:
|
||||
q = await cls.query.where(
|
||||
(cls.group_id == group_id)
|
||||
).gino.all()
|
||||
q = [x for x in q if "[_to_me" in x.problem]
|
||||
if q:
|
||||
for x in q:
|
||||
r = re.search(r"\[_to_me\|(.*?)](.*)", x.problem)
|
||||
if r and r.group(2) == problem:
|
||||
return x
|
||||
return None
|
||||
else:
|
||||
q = await cls.query.where(
|
||||
(cls.group_id == group_id) & (cls.problem == problem)
|
||||
).gino.all()
|
||||
return random.choice(q) if q else None
|
||||
|
||||
@classmethod
|
||||
|
||||
@@ -7,6 +7,6 @@ from .model import WordBank
|
||||
async def check(bot: Bot, event: Event, state: T_State) -> bool:
|
||||
if isinstance(event, GroupMessageEvent):
|
||||
return bool(
|
||||
await WordBank.check(event.group_id, get_message_text(event.json()))
|
||||
await WordBank.check(event.group_id, get_message_text(event.json()), event.is_tome())
|
||||
)
|
||||
return False
|
||||
|
||||
@@ -67,7 +67,13 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
|
||||
if not answer:
|
||||
await add_word.finish("未检测到词条回答...")
|
||||
idx = 0
|
||||
_builder = WordBankBuilder(event.user_id, event.group_id, problem)
|
||||
for n in bot.config.nickname:
|
||||
if problem.startswith(n):
|
||||
_problem = f"[_to_me|{n}]" + problem[len(n):]
|
||||
break
|
||||
else:
|
||||
_problem = problem
|
||||
_builder = WordBankBuilder(event.user_id, event.group_id, _problem)
|
||||
for at_ in get_message_at(event.json()):
|
||||
r = re.search(rf"\[CQ:at,qq={at_}]", answer)
|
||||
if r:
|
||||
|
||||
Reference in New Issue
Block a user