From 5ef4516e3d535085c2dd4aa7bd4ca1d330c3b1fb Mon Sep 17 00:00:00 2001 From: weifashi <605403358@qq.com> Date: Mon, 13 Nov 2023 18:31:23 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=20=E4=BB=BB=E5=8A=A1=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=9C=89=E6=8D=A2=E8=A1=8C=E6=97=B6=E8=81=8A=E5=A4=A9=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E4=BC=9A=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/WebSocketDialogMsg.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php index 70f4f099b..e369bdf4c 100644 --- a/app/Models/WebSocketDialogMsg.php +++ b/app/Models/WebSocketDialogMsg.php @@ -684,7 +684,7 @@ class WebSocketDialogMsg extends AbstractModel foreach ($matchs[1] as $key => $str) { preg_match("/data-denotation-char=\"(.*?)\"/", $str, $matchChar); preg_match("/data-id=\"(.*?)\"/", $str, $matchId); - preg_match("/data-value=\"(.*?)\"/", $str, $matchValye); + preg_match("/data-value=\"(.*?)\"/s", $str, $matchValye); $keyId = $matchId[1]; if ($matchChar[1] === "~") { if (Base::isNumber($keyId)) { @@ -760,7 +760,7 @@ class WebSocketDialogMsg extends AbstractModel return "\"{$match[5]}\"/"; }, $text); $text = preg_replace("/\[:@:(.*?):(.*?):\]/i", "@$2", $text); - $text = preg_replace("/\[:#:(.*?):(.*?):\]/i", "#$2", $text); + $text = preg_replace("/\[:#:(.*?):(.*?):\]/is", "#$2", $text); $text = preg_replace("/\[:~:(.*?):(.*?):\]/i", "~$2", $text); $text = preg_replace("/\[:QUICK:(.*?):(.*?):\]/i", "$2", $text); return preg_replace("/^(

<\/p>)+|(

<\/p>)+$/i", "", $text);