From c8e518b4e62bf2a25e83d1250e679b9b67d22265 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 15 Jul 2022 14:59:10 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E8=BD=AC=E5=8F=91=E6=96=87=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/WebSocketDialogMsg.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Models/WebSocketDialogMsg.php b/app/Models/WebSocketDialogMsg.php index 127d81152..132d65f50 100644 --- a/app/Models/WebSocketDialogMsg.php +++ b/app/Models/WebSocketDialogMsg.php @@ -373,6 +373,7 @@ class WebSocketDialogMsg extends AbstractModel public function forwardMsg($dialogids, $userids, $sender) { return AbstractModel::transaction(function() use ($dialogids, $sender, $userids) { + $originalMsg = Base::json2array($this->getRawOriginal('msg')); $msgs = []; $already = []; if ($dialogids) { @@ -380,7 +381,7 @@ class WebSocketDialogMsg extends AbstractModel $dialogids = [$dialogids]; } foreach ($dialogids as $dialogid) { - $res = self::sendMsg(null, $dialogid, $this->type, $this->getOriginal('msg'), $sender); + $res = self::sendMsg(null, $dialogid, $this->type, $originalMsg, $sender); if (Base::isSuccess($res)) { $msgs[] = $res['data']; $already[] = $dialogid; @@ -397,7 +398,7 @@ class WebSocketDialogMsg extends AbstractModel } $dialog = WebSocketDialog::checkUserDialog($sender, $userid); if ($dialog && !in_array($dialog->id, $already)) { - $res = self::sendMsg(null, $dialog->id, $this->type, $this->getOriginal('msg'), $sender); + $res = self::sendMsg(null, $dialog->id, $this->type, $originalMsg, $sender); if (Base::isSuccess($res)) { $msgs[] = $res['data']; }