Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix setu

Browse Source
This commit is contained in:
HibiKier 2022-07-04 20:21:35 +08:00
parent 7ba129b3bf
commit 1bb9b2cb3f
2 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -247,6 +247,7 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
* 修复商品未设置限购时无法购买 * 修复商品未设置限购时无法购买
* 修复B站订阅UP动态 [@pull/886](https://github.com/HibiKier/zhenxun_bot/pull/886) * 修复B站订阅UP动态 [@pull/886](https://github.com/HibiKier/zhenxun_bot/pull/886)
* 修复色图命令带tag时配置项`MAX_ONCE_NUM2FORWARD`无法生效
### 2022/7/3 \[v0.1.6.1] ### 2022/7/3 \[v0.1.6.1]

61
plugins/send_setu_/send_setu/__init__.py
View File

@ -254,8 +254,10 @@ async def send_setu_handle(
if code == 401: if code == 401:
await setu.finish(urls[0], at_sender=True) await setu.finish(urls[0], at_sender=True)
if code == 200: if code == 200:
forward_list = []
for i in range(len(urls)): for i in range(len(urls)):
try: try:
msg_id = None
setu_img, index = await search_online_setu(urls[i]) setu_img, index = await search_online_setu(urls[i])
# 下载成功的话 # 下载成功的话
if index != -1: if index != -1:
@ -264,9 +266,17 @@ async def send_setu_handle(
f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
f" 发送色图 {index}.png" f" 发送色图 {index}.png"
) )
msg_id = await matcher.send( if (
Message(f"{text_list[i]}\n{setu_img}") Config.get_config("send_setu", "MAX_ONCE_NUM2FORWARD")
) and num
>= Config.get_config("send_setu", "MAX_ONCE_NUM2FORWARD")
and isinstance(event, GroupMessageEvent)
):
forward_list.append(Message(f"{text_list[i]}\n{setu_img}"))
else:
msg_id = await matcher.send(
Message(f"{text_list[i]}\n{setu_img}")
)
else: else:
if setu_list is None: if setu_list is None:
setu_list, code = await get_setu_list(tags=tags, r18=r18) setu_list, code = await get_setu_list(tags=tags, r18=r18)
@ -275,14 +285,35 @@ async def send_setu_handle(
if setu_list: if setu_list:
setu_image = random.choice(setu_list) setu_image = random.choice(setu_list)
setu_list.remove(setu_image) setu_list.remove(setu_image)
msg_id = await matcher.send( if (
Message( Config.get_config("send_setu", "MAX_ONCE_NUM2FORWARD")
gen_message(setu_image) and num
+ ( >= Config.get_config(
await check_local_exists_or_download(setu_image) "send_setu", "MAX_ONCE_NUM2FORWARD"
)[0] )
and isinstance(event, GroupMessageEvent)
):
forward_list.append(
Message(
gen_message(setu_image)
+ (
await check_local_exists_or_download(
setu_image
)
)[0]
)
)
else:
msg_id = await matcher.send(
Message(
gen_message(setu_image)
+ (
await check_local_exists_or_download(
setu_image
)
)[0]
)
) )
)
logger.info( logger.info(
f"(USER {event.user_id}, GROUP " f"(USER {event.user_id}, GROUP "
f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})" f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
@ -298,6 +329,16 @@ async def send_setu_handle(
) )
except ActionFailed: except ActionFailed:
await matcher.finish("坏了，这张图色过头了，我自己看看就行了！", at_sender=True) await matcher.finish("坏了，这张图色过头了，我自己看看就行了！", at_sender=True)
if forward_list:
msg_id = await bot.send_group_forward_msg(
group_id=event.group_id,
messages=custom_forward_msg(forward_list, bot.self_id),
)
withdraw_message_manager.withdraw_message(
event,
msg_id,
Config.get_config("send_setu", "WITHDRAW_SETU_MESSAGE"),
)
return return
if code != 200: if code != 200:
await matcher.finish("网络连接失败...", at_sender=True) await matcher.finish("网络连接失败...", at_sender=True)