功能:好友列表面板

后端(FriendController::index):
- 返回 sub_time 添加时间
- 新增 pending 列表(对方加了我但我未回加)
  包含用户信息 + added_at(对方添加我的时间)

前端(toolbar.blade.php):
- 工具栏顶部加「好友」按钮(openFriendPanel)
- 好友弹窗面板(#friend-panel):
  ① 搜索栏:输入用户名 Enter/按钮添加好友
  ② 「我关注的好友」列表:头像/用户名/互相徽章/
     添加时间/删除按钮
  ③ 「对方已加我,待我回加」列表:头像/用户名/
     对方添加时间/回加按钮
  ④ 面板顶部提示区(成功/失败消息)
- 所有添加/删除调用与双击用户卡片完全相同的接口
  (/friend/{username}/add、/friend/{username}/remove)
This commit is contained in:
2026-03-01 13:38:30 +08:00
parent 48b31e7cff
commit 4ced484419
2 changed files with 490 additions and 10 deletions

View File

@@ -168,31 +168,68 @@ class FriendController extends Controller
}
/**
* 获取当前用户的好友列表(我添加的 + 对方也添加我的 = 双向好友标记)
* 获取当前用户的完整好友数据,供好友面板使用
*
* 返回两个列表:
* - friends我已添加的好友含互相状态、添加时间
* - pending对方已加我但我还未加对方的含对方添加我的时间
*/
public function index(): JsonResponse
{
$me = Auth::user();
// 我添加的所有人
$myAdded = FriendRequest::where('who', $me->username)->pluck('towho');
// ── 我添加的好友及添加时间 ──
$myRows = FriendRequest::where('who', $me->username)
->get(['towho', 'sub_time'])
->keyBy('towho');
// 把我加了的
$addedMe = FriendRequest::where('towho', $me->username)->pluck('who');
// ── 把我加了的人(用于互相判断 + pending 列表)──
$addedMeRows = FriendRequest::where('towho', $me->username)
->get(['who', 'sub_time'])
->keyBy('who');
$friends = User::whereIn('username', $myAdded)
$myAddedNames = $myRows->keys();
$addedMeNames = $addedMeRows->keys();
// 我添加的好友详情
$friends = User::whereIn('username', $myAddedNames)
->get(['username', 'usersf', 'user_level', 'sex'])
->map(function ($u) use ($addedMe) {
->map(function ($u) use ($myRows, $addedMeNames) {
$row = $myRows->get($u->username);
return [
'username' => $u->username,
'headface' => $u->headface,
'user_level' => $u->user_level,
'sex' => $u->sex,
'mutual' => $addedMe->contains($u->username), // 是否互相添加
'mutual' => $addedMeNames->contains($u->username), // 是否互相添加
'sub_time' => $row?->sub_time?->format('Y-m-d H:i') ?? '',
];
});
})
->values();
return response()->json(['status' => 'success', 'friends' => $friends]);
// 对方加了我但我还未加的pending
$pendingNames = $addedMeNames->diff($myAddedNames);
$pending = User::whereIn('username', $pendingNames)
->get(['username', 'usersf', 'user_level', 'sex'])
->map(function ($u) use ($addedMeRows) {
$row = $addedMeRows->get($u->username);
return [
'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') ?? '',
];
})
->values();
return response()->json([
'status' => 'success',
'friends' => $friends,
'pending' => $pending,
]);
}
/**