Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-09-29 08:39:59 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
HibiKier
2022-05-21 13:15:53 +08:00
parent 86a8fe7096
commit 188ae38525
25 changed files with 153 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/bilibili_sub/data_source.py
+2 -7
View File
@@ -1,15 +1,10 @@
# from bilibili_api.exceptions.ResponseCodeException import ResponseCodeException
from bilireq.exceptions import ResponseCodeError
from utils.manager import resources_manager
from asyncio.exceptions import TimeoutError
from .model import BilibiliSub
# from bilibili_api.live import LiveRoom
from bilireq.live import get_room_info_by_id
# from bilibili_api import bangumi
from .utils import get_meta
from utils.message_builder import image
# from bilibili_api import user
# from bilibili_api.user import User
from bilireq.user import get_user_info
from bilireq import dynamic
from .utils import get_videos
@@ -60,7 +55,7 @@ async def add_live_sub(live_id: int, sub_user: str) -> str:
live_status=live_status,
):
await _get_up_status(live_id)
uname = (await BilibiliSub.get_sub(uid)).uname
uname = (await BilibiliSub.get_sub(live_id)).uname
return (
"已成功订阅主播：\n"
f"\ttitle：{title}\n"
@@ -248,7 +243,7 @@ async def _get_up_status(id_: int) -> Optional[str]:
"""
_user = await BilibiliSub.get_sub(id_)
"""bilibili_api.user库中User类的get_user_info改为bilireq.user库的get_user_info方法"""
user_info = await get_user_info(id_)
user_info = await get_user_info(_user.uid)
uname = user_info["name"]
"""bilibili_api.user库中User类的get_videos改为bilireq.user库的get_videos方法"""
video_info = await get_videos(id_)
plugins/black_word/data_source.py
+1 -1
View File
@@ -77,7 +77,7 @@ async def show_black_text_image(
(punish_level_str, "等级"),
(create_time_str, "记录日期"),
]:
img = await text2image(s, color="#f9f6f2", _add_height=3.32)
img = await text2image(s, color="#f9f6f2", _add_height=2.1)
w = _tmp_img.getsize(type_)[0] if _tmp_img.getsize(type_)[0] > img.w else img.w
A = BuildImage(w + 11, img.h + 50, color="#f9f6f2", font_size=35, font="CJGaoDeGuo.otf")
await A.atext((10, 10), type_)
plugins/fudu.py
+4 -3
View File
@@ -9,6 +9,7 @@ from nonebot.adapters.onebot.v11 import GroupMessageEvent
from configs.config import Config
from utils.http_utils import AsyncHttpx
from services.log import logger
from configs.config import NICKNAME
__zx_plugin_name__ = "复读"
@@ -74,15 +75,15 @@ class Fudu:
_fudu_list = Fudu()
fudu = on_message(permission=GROUP, priority=9)
fudu = on_message(permission=GROUP, priority=999)
@fudu.handle()
async def _(event: GroupMessageEvent):
if event.is_tome():
return
if get_message_text(event.json()):
if get_message_text(event.json()).find("@可爱的小真寻") != -1:
if msg := get_message_text(event.json()):
if msg.startswith(f"@可爱的{NICKNAME}"):
await fudu.finish("复制粘贴的虚空艾特？", at_sender=True)
img = get_message_img(event.json())
msg = get_message_text(event.json())
plugins/genshin/almanac/__init__.py
+1 -1
View File
@@ -35,7 +35,7 @@ Config.add_plugin_config(
default_value=True,
)
almanac = on_command("原神黄历", priority=5, block=True)
almanac = on_command("原神黄历", priority=15, block=True)
ALC_PATH = IMAGE_PATH / "genshin" / "alc"
plugins/genshin/query_resource_points/query_resource.py
+2 -3
View File
@@ -1,6 +1,5 @@
from typing import Tuple, Optional, List
from configs.path_config import IMAGE_PATH, TEXT_PATH
from PIL.Image import UnidentifiedImageError
from utils.message_builder import image
from services.log import logger
from utils.image_utils import BuildImage
@@ -261,8 +260,8 @@ async def download_image(
gen_icon(path)
else:
logger.info(f"下载原神资源图标：{img_url} 失败，等待下次更新...")
except UnidentifiedImageError:
logger.warning(f"原神图片打开错误..已删除，等待下次更新... file: {path}")
except Exception as e:
logger.warning(f"原神图片错误..已删除，等待下次更新... file: {path} {type(e)}：{e}")
if os.path.exists(path):
os.remove(path)
plugins/genshin/query_user/query_role/draw_image.py
+2
View File
@@ -300,6 +300,8 @@ def get_country_data_image(world_data_dict: Dict) -> BuildImage:
region = BuildImage(790, 267 * (len(world_data_dict) - 1), color="#F9F6F2")
height = 0
for country in ["蒙德", "龙脊雪山", "璃月", "层岩巨渊", "稻妻", "渊下宫"]:
if not world_data_dict.get(country):
continue
x = BuildImage(790, 250, color="#3A4467")
logo = BuildImage(180, 180, background=image_path / "logo" / f"{country}.png")
tmp_bk = BuildImage(770, 230, color="#606779")
plugins/genshin/query_user/resin_remind/init_task.py
+9 -4
View File
@@ -1,3 +1,5 @@
from nonebot.adapters.onebot.v11 import ActionFailed
from utils.utils import get_bot, scheduler
from utils.message_builder import at
from models.group_member_info import GroupInfoUser
@@ -178,10 +180,13 @@ async def _remind(user_id: int, uid: str):
group_list = await GroupInfoUser.get_user_all_group(user_id)
if group_list:
group_id = group_list[0]
await bot.send_group_msg(
group_id=group_id,
message=at(user_id) + msg
)
try:
await bot.send_group_msg(
group_id=group_id,
message=at(user_id) + msg
)
except ActionFailed as e:
logger.error(f"树脂提醒推送发生错误 {type(e)}：{e}")
if not next_time:
if user_manager.check(uid) and Config.get_config("resin_remind", "AUTO_CLOSE_QUERY_FAIL_RESIN_REMIND"):
await Genshin.set_resin_remind(int(uid), False)
plugins/mute.py
+2 -2
View File
@@ -145,7 +145,7 @@ async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Mes
await mute_setting.finish(
f'最大次数：{mute_data[group_id]["count"]} 次\n'
f'规定时间：{mute_data[group_id]["time"]} 秒\n'
f'禁言时长：{mute_data[group_id]["duration"] / 60} 分钟\n'
f'禁言时长：{mute_data[group_id]["duration"]:.2f} 分钟\n'
f"【在规定时间内发送相同消息超过最大次数则禁言\n当禁言时长为0时关闭此功能】"
)
if not is_number(msg):
@@ -157,7 +157,7 @@ async def _(event: GroupMessageEvent, cmd: Tuple[str, ...] = Command(), arg: Mes
mute_data[group_id]["count"] = int(msg)
msg += " 次"
if cmd[0] == "设置禁言时长":
mute_data[group_id]["duration"] = int(msg) * 60
mute_data[group_id]["duration"] = int(msg)
msg += " 分钟"
await mute_setting.send(f'刷屏检测：{cmd[0]}为 {msg}')
logger.info(
plugins/pid_search.py
+40 -33
View File
@@ -52,8 +52,8 @@ headers = {
async def _g(event: MessageEvent, state: T_State, pid: str = Arg("pid")):
if pid in ["取消", "算了"]:
await pid_search.finish("已取消操作...")
# if is_number(pid):
# await pid_search.reject_arg("pid", "笨蛋，重新输入数！字！")
if not is_number(pid):
await pid_search.reject_arg("pid", "笨蛋，重新输入数！字！")
for _ in range(3):
try:
data = (
@@ -68,39 +68,46 @@ async def _g(event: MessageEvent, state: T_State, pid: str = Arg("pid")):
except Exception as e:
await pid_search.finish(f"发生了一些错误..{type(e)}：{e}")
else:
if not data["illust"]["width"] and not data["illust"]["height"]:
data = data["illust"]
if not data["width"] and not data["height"]:
await pid_search.finish(f"没有搜索到 PID：{pid} 的图片", at_sender=True)
pid = data["illust"]["id"]
title = data["illust"]["title"]
author = data["illust"]["user"]["name"]
author_id = data["illust"]["user"]["id"]
img_url = data["illust"]["meta_single_page"]["original_image_url"]
if not await AsyncHttpx.download_file(
img_url,
IMAGE_PATH / "temp" / f"pid_search_{event.user_id}.png",
headers=headers,
):
await pid_search.finish("图片下载失败了....", at_sender=True)
tmp = ""
if isinstance(event, GroupMessageEvent):
tmp = "\n【注】将在30后撤回......"
msg_id = await pid_search.send(
Message(
f"title：{title}\n"
f"pid：{pid}\n"
f"author：{author}\n"
f"author_id：{author_id}\n"
f'{image(f"pid_search_{event.user_id}.png", "temp")}'
f"{tmp}"
pid = data["id"]
title = data["title"]
author = data["user"]["name"]
author_id = data["user"]["id"]
image_list = []
try:
image_list.append(data["meta_single_page"]["original_image_url"])
except KeyError:
for image_url in data["meta_pages"]:
image_list.append(image_url["image_urls"]["original"])
for i, img_url in enumerate(image_list):
if not await AsyncHttpx.download_file(
img_url,
IMAGE_PATH / "temp" / f"pid_search_{event.user_id}_{i}.png",
headers=headers,
):
await pid_search.send("图片下载失败了....", at_sender=True)
tmp = ""
if isinstance(event, GroupMessageEvent):
tmp = "\n【注】将在30后撤回......"
msg_id = await pid_search.send(
Message(
f"title：{title}\n"
f"pid：{pid}\n"
f"author：{author}\n"
f"author_id：{author_id}\n"
f'{image(f"pid_search_{event.user_id}_{i}.png", "temp")}'
f"{tmp}"
)
)
)
logger.info(
f"(USER {event.user_id}, "
f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
f" 查询图片 PID：{pid}"
)
if isinstance(event, GroupMessageEvent):
withdraw_message_manager.append((msg_id, 30))
logger.info(
f"(USER {event.user_id}, "
f"GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
f" 查询图片 PID：{pid}"
)
if isinstance(event, GroupMessageEvent):
withdraw_message_manager.append((msg_id, 30))
break
else:
await pid_search.finish("图片下载失败了....", at_sender=True)
plugins/search_anime/__init__.py
+2
View File
@@ -49,6 +49,8 @@ async def _(bot: Bot, event: MessageEvent, state: T_State, key_word: str = ArgSt
Config.get_config("search_anime", "SEARCH_ANIME_MAX_INFO"),
)
if anime_report:
if isinstance(anime_report, str):
await search_anime.finish(anime_report)
if isinstance(event, GroupMessageEvent):
mes_list = custom_forward_msg(anime_report, bot.self_id)
await bot.send_group_forward_msg(group_id=event.group_id, messages=mes_list)
plugins/search_anime/data_source.py
+4 -4
View File
@@ -3,18 +3,18 @@ import feedparser
from urllib import parse
from services.log import logger
from utils.http_utils import AsyncHttpx
from typing import List
from typing import List, Union
import time
async def from_anime_get_info(key_word: str, max_: int) -> List[str]:
async def from_anime_get_info(key_word: str, max_: int) -> Union[str, List[str]]:
s_time = time.time()
repass = ""
url = "https://share.dmhy.org/topics/rss/rss.xml?keyword=" + parse.quote(key_word)
try:
repass = await get_repass(url, max_)
except Exception as e:
logger.error("Timeout! {}".format(e))
logger.error(f"发生了一些错误 {type(e)}：{e}")
return "发生了一些错误！"
repass.insert(0, f"搜索 {key_word} 结果（耗时 {int(time.time() - s_time)} 秒）：\n")
return repass
plugins/statistics/statistics_hook.py
+1 -1
View File
@@ -96,7 +96,7 @@ async def _(
global _prefix_count_dict
if (
matcher.type == "message"
and matcher.priority not in [1, 9]
and matcher.priority not in [1, 999]
and matcher.plugin_name not in ["update_info", "statistics_handle"]
):
module = matcher.plugin_name
plugins/word_clouds/__init__.py
+12 -16
View File
@@ -17,26 +17,22 @@ __plugin_usage__ = """
usage：
词云
指令：
获取今天的词云
今日词云
获取昨天的词云
昨日词云
获取本周词云
本周词云
获取本月词云
本月词云
获取年度词云
年度词云
今日词云：获取今天的词云
昨日词云：获取昨天的词云
本周词云：获取本周词云
本月词云：获取本月词云
年度词云：获取年度词云
历史词云(支持 ISO8601 格式的日期与时间，如 2022-02-22T22:22:22)
获取某日的词云
历史词云 2022-01-01
获取指定时间段的词云
历史词云
历史词云 2022-01-01~2022-02-22
历史词云 2022-02-22T11:11:11~2022-02-22T22:22:22
示例：历史词云 2022-01-01~2022-02-22
示例：历史词云 2022-02-22T11:11:11~2022-02-22T22:22:22
如果想要获取自己的发言，可在命令前添加 我的
我的今日词云
示例：我的今日词云
""".strip()
__plugin_des__ = "词云"
__plugin_cmd__ = ["今日词云", "昨日词云", "本周词云"]
@@ -80,12 +76,12 @@ def parse_datetime(key: str):
async def _key_parser(
matcher: Matcher,
state: T_State,
input: Union[datetime, Message] = Arg(key),
input_: Union[datetime, Message] = Arg(key),
):
if isinstance(input, datetime):
if isinstance(input_, datetime):
return
plaintext = input.extract_plain_text()
plaintext = input_.extract_plain_text()
try:
state[key] = get_datetime_fromisoformat_with_timezone(plaintext)
except ValueError: