优化聊天系统

Author: linyiyuan

app/Controller/Laboratory/FriendController.php

@@ -8,6 +8,7 @@
 use App\Model\Auth\User;
 use App\Model\Laboratory\FriendChatHistory;
 use App\Model\Laboratory\FriendRelation;
+use App\Service\Laboratory\MessageService;
 use Hyperf\HttpServer\Annotation\Controller;
 use Hyperf\HttpServer\Annotation\Middleware;
 use Hyperf\HttpServer\Annotation\Middlewares;
@@ -70,7 +71,7 @@ public function historyMessage()
             $friendRemark = FriendRelation::query()->where('uid', $value['to_uid'])->where('friend_id', $value['from_uid'])->value('friend_remark');
             if (!empty($friendRemark) && $value['from_uid'] != $userInfo['id']) $displayName = $friendRemark;
 
-            $list[] = [
+            $temp = [
                 'id' => $value['message_id'],
                 'status' => $value['status'],
                 'type' => $value['type'],
@@ -81,7 +82,15 @@ public function historyMessage()
                 'content' => $value['content'],
                 'avatar' => $user['avatar'],
                 'displayName' => $displayName,
+                'fromUser' => [
+                    'id' => $user['id'],
+                    'avatar' => $user['avatar'] ?? '',
+                    'displayName' => $displayName,
+                ],
             ];
+            if ($temp['type'] == FriendChatHistory::FRIEND_CHAT_MESSAGE_TYPE_FORWARD)
+                $temp['content'] = MessageService::getInstance()->formatForwardMessage($temp['content'], $temp['fromUser']);
+            $list[] = $temp;
         }
         return $this->success([
             'list' => $list,

app/Controller/Laboratory/Ws/FriendController.php

@@ -87,7 +87,6 @@ public function pullMessage()
             ->where('to_uid', $contactData['user_id'])
             ->where('from_uid', $contactData['contact_id'])
             ->update(['reception_state' => FriendChatHistory::RECEPTION_STATE_YES]);
-
         $list = [];
         foreach ($messageList as $key => $value) {
             //获取用户联系人