From 09b5e20d28f64c0886ce796ddc2c345c3bf0bbe9 Mon Sep 17 00:00:00 2001 From: liuwei Date: Fri, 13 Jun 2025 15:03:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=BD=AC=E5=8F=91=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/group_virtual/main.py | 21 ++++++++++----------- wechat_ipad/client/message.py | 2 +- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/plugins/group_virtual/main.py b/plugins/group_virtual/main.py index 60f443e..d9fb10e 100644 --- a/plugins/group_virtual/main.py +++ b/plugins/group_virtual/main.py @@ -1,11 +1,11 @@ +import xml.etree.ElementTree as ET from typing import Dict, Any, List, Optional, Tuple from base.plugin_common.message_plugin_interface import MessagePluginInterface from base.plugin_common.plugin_interface import PluginStatus -from utils.robot_cmd.robot_command import GroupBotManager, PermissionStatus -from utils.wechat.contact_manager import ContactManager from db.connection import DBConnectionManager from db.group_virtual_redis import GroupVirtualRedisDB +from utils.wechat.contact_manager import ContactManager from wechat_ipad import WechatAPIClient from wechat_ipad.models.message import WxMessage, MessageType @@ -174,15 +174,14 @@ class GroupVirtualPlugin(MessagePluginInterface): await self.bot.send_text_message(group["id"], forward_content) # 图片消息 暂时不支持。 - # elif msg_type == 3: - # # 先发送前缀 - # for group in chat_group["groups"]: - # if group["id"] != roomid: - # self.message_util.send_text(f"{prefix}[图片]", group["id"]) - # # 转发图片 - # image_path = message.get("file_path", "") - # if image_path and os.path.exists(image_path): - # self.message_util.send_image(image_path, group["id"]) + elif msg_type == MessageType.IMAGE: + # 先发送前缀 + for group in chat_group["groups"]: + if group["id"] != roomid: + await self.bot.send_text_message(group["id"], f"{prefix}[图片]") + # 转发图片 + xml_content = message.get("content", "") + await self.bot.send_cdn_img_msg(group["id"], xml_content) def _get_chat_group(self, chat_group_id: str) -> Optional[Dict[str, Any]]: """获取虚拟聊天组""" diff --git a/wechat_ipad/client/message.py b/wechat_ipad/client/message.py index 4b3b940..8e42eda 100644 --- a/wechat_ipad/client/message.py +++ b/wechat_ipad/client/message.py @@ -661,7 +661,7 @@ class MessageMixin(WechatAPIClientBase): async with aiohttp.ClientSession() as session: json_param = {"Wxid": self.wxid, "ToWxid": wxid, "Content": xml} - response = await session.post(f'http://{self.ip}:{self.port}/SendCDNImgMsg', json=json_param) + response = await session.post(f'http://{self.ip}:{self.port}/Msg/SendCDNImg', json=json_param) json_resp = await response.json() if json_resp.get("Success"):