From e26d75c894e8f9103093f864b610f8f6d6442280 Mon Sep 17 00:00:00 2001
From: weifashi <605403358@qq.com>
Date: Thu, 3 Aug 2023 18:09:11 +0800
Subject: [PATCH] =?UTF-8?q?fiex=EF=BC=9A1.=20=E5=8A=A0=E5=BC=BA=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E6=B6=88=E6=81=AF=E6=8E=A5=E5=8F=A3=E7=9A=84=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=20,=20=202.=E8=A7=A3=E5=86=B3=E5=9C=A8=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E5=9B=BE=E7=89=87=E4=B8=8A=E7=9B=B4=E6=8E=A5=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E5=A4=8D=E5=88=B6=E5=9B=BE=E7=89=87=EF=BC=88=E9=9D=9E?=
 =?UTF-8?q?jpg=E7=9A=84=EF=BC=89=E5=90=8E=EF=BC=8C=E7=B2=98=E8=B4=B4?=
 =?UTF-8?q?=E5=88=B0=E6=B6=88=E6=81=AF=E6=A1=86=EF=BC=8C=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=90=8E=E5=87=BA=E7=8E=B0=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/DialogController.php | 2 +-
 app/Models/WebSocketDialogMsg.php             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/DialogController.php b/app/Http/Controllers/Api/DialogController.php
index 586f91673..9c59ef6a9 100755
--- a/app/Http/Controllers/Api/DialogController.php
+++ b/app/Http/Controllers/Api/DialogController.php
@@ -728,7 +728,7 @@ class DialogController extends AbstractController
         $markdown = in_array($text_type, ['md', 'markdown']);
         // 
         $result = [];
-        $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id];
+        $dialogIds = $dialog_ids ? explode(',', $dialog_ids) : [$dialog_id ?: 0];
         foreach($dialogIds as $dialog_id) {
             //
             WebSocketDialog::checkDialog($dialog_id);
diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php
index 51a90eea8..0ee8dd69e 100644
--- a/app/Models/WebSocketDialogMsg.php
+++ b/app/Models/WebSocketDialogMsg.php
@@ -641,7 +641,7 @@ class WebSocketDialogMsg extends AbstractModel
         }
         // 其他网络图片
         $imageSaveLocal = Base::settingFind("system", "image_save_local");
-        preg_match_all("/<img[^>]*?src=([\"'])(.*?\.(png|jpg|jpeg|webp|gif))\\1[^>]*?>/is", $text, $matchs);
+        preg_match_all("/<img[^>]*?src=([\"'])(.*?(png|jpg|jpeg|webp|gif).*?)\\1[^>]*?>/is", $text, $matchs);
         foreach ($matchs[2] as $key => $str) {
             if ($imageSaveLocal === 'close') {
                 $imageSize = getimagesize($str);