功能:好友面板昵称后显示在线离线状态
后端: - ChatStateService 新增 getAllOnlineUsernames(),跨房间聚合在线用户名 - FriendController::index() 为每位好友/待回加用户附加 is_online 字段 - 在线好友自动排在列表前面 前端: - 昵称后显示 🟢 在线 / ⚫ 离线 徽标 - .fp-status-online 绿底绿字,.fp-status-offline 灰底灰字
This commit is contained in:
@@ -191,42 +191,49 @@ class FriendController extends Controller
|
||||
$myAddedNames = $myRows->keys();
|
||||
$addedMeNames = $addedMeRows->keys();
|
||||
|
||||
// ── 查询全局在线用户(所有房间合并)──
|
||||
$onlineUsernames = collect($this->chatState->getAllOnlineUsernames());
|
||||
|
||||
// 我添加的好友详情
|
||||
$friends = User::whereIn('username', $myAddedNames)
|
||||
->get(['username', 'usersf', 'user_level', 'sex'])
|
||||
->map(function ($u) use ($myRows, $addedMeNames) {
|
||||
->map(function ($u) use ($myRows, $addedMeNames, $onlineUsernames) {
|
||||
$row = $myRows->get($u->username);
|
||||
|
||||
return [
|
||||
'username' => $u->username,
|
||||
'headface' => $u->headface,
|
||||
'username' => $u->username,
|
||||
'headface' => $u->headface,
|
||||
'user_level' => $u->user_level,
|
||||
'sex' => $u->sex,
|
||||
'mutual' => $addedMeNames->contains($u->username), // 是否互相添加
|
||||
'sub_time' => $row?->sub_time?->format('Y-m-d H:i') ?? '',
|
||||
'sex' => $u->sex,
|
||||
'mutual' => $addedMeNames->contains($u->username), // 是否互相添加
|
||||
'sub_time' => $row?->sub_time?->format('Y-m-d H:i') ?? '',
|
||||
'is_online' => $onlineUsernames->contains($u->username),
|
||||
];
|
||||
})
|
||||
->sortByDesc('is_online') // 在线好友排在前面
|
||||
->values();
|
||||
|
||||
// 对方加了我但我还未加的(pending)
|
||||
$pendingNames = $addedMeNames->diff($myAddedNames);
|
||||
$pending = User::whereIn('username', $pendingNames)
|
||||
->get(['username', 'usersf', 'user_level', 'sex'])
|
||||
->map(function ($u) use ($addedMeRows) {
|
||||
->map(function ($u) use ($addedMeRows, $onlineUsernames) {
|
||||
$row = $addedMeRows->get($u->username);
|
||||
|
||||
return [
|
||||
'username' => $u->username,
|
||||
'headface' => $u->headface,
|
||||
'username' => $u->username,
|
||||
'headface' => $u->headface,
|
||||
'user_level' => $u->user_level,
|
||||
'sex' => $u->sex,
|
||||
'added_at' => $row?->sub_time?->format('Y-m-d H:i') ?? '',
|
||||
'sex' => $u->sex,
|
||||
'added_at' => $row?->sub_time?->format('Y-m-d H:i') ?? '',
|
||||
'is_online' => $onlineUsernames->contains($u->username),
|
||||
];
|
||||
})
|
||||
->sortByDesc('is_online')
|
||||
->values();
|
||||
|
||||
return response()->json([
|
||||
'status' => 'success',
|
||||
'status' => 'success',
|
||||
'friends' => $friends,
|
||||
'pending' => $pending,
|
||||
]);
|
||||
|
||||
Reference in New Issue
Block a user