From 1bb9b2cb3f5b863e157fe818cb30737062ed0042 Mon Sep 17 00:00:00 2001
From: HibiKier <775757368@qq.com>
Date: Mon, 4 Jul 2022 20:21:35 +0800
Subject: [PATCH] fix setu

---
 README.md                                |  1 +
 plugins/send_setu_/send_setu/__init__.py | 61 ++++++++++++++++++++----
 2 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ea7aa8ff..a6871a76 100644
--- a/README.md
+++ b/README.md
@@ -247,6 +247,7 @@ __Docker 最新版本由 [Sakuracio](https://github.com/Sakuracio) 提供__
 
 * 修复商品未设置限购时无法购买
 * 修复B站订阅UP动态 [@pull/886](https://github.com/HibiKier/zhenxun_bot/pull/886)
+* 修复色图命令带tag时配置项`MAX_ONCE_NUM2FORWARD`无法生效
 
 ### 2022/7/3 \[v0.1.6.1]
 
diff --git a/plugins/send_setu_/send_setu/__init__.py b/plugins/send_setu_/send_setu/__init__.py
index 5e23c5fc..1a9cf25d 100755
--- a/plugins/send_setu_/send_setu/__init__.py
+++ b/plugins/send_setu_/send_setu/__init__.py
@@ -254,8 +254,10 @@ async def send_setu_handle(
         if code == 401:
             await setu.finish(urls[0], at_sender=True)
         if code == 200:
+            forward_list = []
             for i in range(len(urls)):
                 try:
+                    msg_id = None
                     setu_img, index = await search_online_setu(urls[i])
                     # 下载成功的话
                     if index != -1:
@@ -264,9 +266,17 @@ async def send_setu_handle(
                             f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
                             f" 发送色图 {index}.png"
                         )
-                        msg_id = await matcher.send(
-                            Message(f"{text_list[i]}\n{setu_img}")
-                        )
+                        if (
+                            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:
                         if setu_list is None:
                             setu_list, code = await get_setu_list(tags=tags, r18=r18)
@@ -275,14 +285,35 @@ async def send_setu_handle(
                         if setu_list:
                             setu_image = random.choice(setu_list)
                             setu_list.remove(setu_image)
-                            msg_id = await matcher.send(
-                                Message(
-                                    gen_message(setu_image)
-                                    + (
-                                        await check_local_exists_or_download(setu_image)
-                                    )[0]
+                            if (
+                                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(
+                                        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(
                                 f"(USER {event.user_id}, GROUP "
                                 f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
@@ -298,6 +329,16 @@ async def send_setu_handle(
                         )
                 except ActionFailed:
                     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
     if code != 200:
         await matcher.finish("网络连接失败...", at_sender=True)