From 98427345cf7bf268520e28908fb1ec0bb7d9bad0 Mon Sep 17 00:00:00 2001
From: kkjz <253839323@sohu.com>
Date: Sun, 20 Apr 2025 12:04:02 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E4=BF=AE=E5=A4=8Daiocqhttp=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E4=BD=BF=E7=94=A8=E6=8C=87=E4=BB=A4=E7=BB=84=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E6=9E=9C=E4=BD=BF=E7=94=A8=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=AD=E6=90=BA=E5=B8=A6=E7=BD=91=E5=9D=80=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB=E6=8C=87=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiocqhttp/aiocqhttp_platform_adapter.py   | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
index 198946b1a..b06f537d4 100644
--- a/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
+++ b/astrbot/core/platform/sources/aiocqhttp/aiocqhttp_platform_adapter.py
@@ -3,6 +3,7 @@ import time
 import asyncio
 import logging
 import uuid
+import re
 from typing import Awaitable, Any
 from aiocqhttp import CQHttp, Event
 from astrbot.api.platform import (
@@ -159,6 +160,14 @@ class AiocqhttpAdapter(Platform):
 
         return abm
 
+    def _is_url_or_ip(self,text: str) -> bool:
+        """
+        判断一个字符串是否为网址（http/https 开头）或 IP 地址。
+        """
+        url_pattern = r"^(?:http|https)://.+$"
+        ip_pattern = r"^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
+        return bool(re.match(url_pattern, text) or re.match(ip_pattern, text))
+
     async def _convert_handle_message_event(
         self, event: Event, get_reply=True
     ) -> AstrBotMessage:
@@ -202,13 +211,30 @@ class AiocqhttpAdapter(Platform):
             return
 
         # 按消息段类型类型适配
-        for m in event.message:
+        for idx, m in enumerate(event.message):
             t = m["type"]
             a = None
             if t == "text":
-                message_str += m["data"]["text"].strip()
-                a = ComponentTypes[t](**m["data"])  # noqa: F405
-                abm.message.append(a)
+                should_append_new = True # 是否需要正常处理的标签
+                # 合并相邻文本段的情况
+                if idx > 0 and event.message[idx - 1]["type"] == "text":
+                    prev_text = event.message[idx - 1]["data"]["text"]
+                    curr_text = m["data"]["text"].strip()
+
+                    # 处理网址或IP地址的特殊情况，处理两端文本中间为url时的情况
+                    if (prev_text.endswith(" ") and self._is_url_or_ip(curr_text)) or \
+                       (idx > 1 and m["data"]["text"].startswith(" ") and self._is_url_or_ip(prev_text.strip())):
+                        # 合并到前一个文本段
+                        message_str += " " + curr_text
+                        event.message[idx - 1]["data"]["text"] = message_str
+                        a = ComponentTypes[t](**event.message[idx - 1]["data"])
+                        abm.message[-1] = a
+                        should_append_new = False
+                # 如果不需要合并，添加为新的消息段
+                if should_append_new:
+                    message_str += m["data"]["text"].strip()
+                    a = ComponentTypes[t](**m["data"])
+                    abm.message.append(a)
 
             elif t == "file":
                 if m["data"].get("url") and m["data"].get("url").startswith("http"):