Ensure self join message is rendered

This commit is contained in:
2026-04-11 15:58:38 +08:00
parent ca1c7e66c5
commit cc1dd017ce
2 changed files with 23 additions and 7 deletions
+12 -7
View File
@@ -116,6 +116,7 @@ class ChatController extends Controller
// 3. 广播和初始化欢迎(仅限初次进入) // 3. 广播和初始化欢迎(仅限初次进入)
$newbieEffect = null; $newbieEffect = null;
$initialPresenceTheme = null; $initialPresenceTheme = null;
$initialWelcomeMessage = null;
if (! $isAlreadyInRoom) { if (! $isAlreadyInRoom) {
// 广播 UserJoined 事件,通知房间内的其他人 // 广播 UserJoined 事件,通知房间内的其他人
@@ -174,14 +175,17 @@ class ChatController extends Controller
]; ];
// 当会员等级带有专属主题时,把横幅与特效字段并入系统消息,供前端展示豪华进场效果。 // 当会员等级带有专属主题时,把横幅与特效字段并入系统消息,供前端展示豪华进场效果。
if (! empty($vipPresencePayload)) { if (! empty($vipPresencePayload)) {
$generalWelcomeMsg = array_merge($generalWelcomeMsg, $vipPresencePayload); $generalWelcomeMsg = array_merge($generalWelcomeMsg, $vipPresencePayload);
$initialPresenceTheme = $vipPresencePayload; $initialPresenceTheme = $vipPresencePayload;
} }
$this->chatState->pushMessage($id, $generalWelcomeMsg); // 把当前这次进房生成的欢迎消息带回前端,确保用户自己也一定能看到。
// 修复:之前使用了 ->toOthers() 导致自己看不到自己的进场提示 $initialWelcomeMessage = $generalWelcomeMsg;
broadcast(new MessageSent($id, $generalWelcomeMsg));
$this->chatState->pushMessage($id, $generalWelcomeMsg);
// 修复:之前使用了 ->toOthers() 导致自己看不到自己的进场提示
broadcast(new MessageSent($id, $generalWelcomeMsg));
// 会员专属特效需要单独广播给其他在线成员,自己则在页面初始化后本地补播。 // 会员专属特效需要单独广播给其他在线成员,自己则在页面初始化后本地补播。
if (! empty($vipPresencePayload['presence_effect'])) { if (! empty($vipPresencePayload['presence_effect'])) {
@@ -273,6 +277,7 @@ class ChatController extends Controller
'weekEffect' => $this->shopService->getActiveWeekEffect($user), 'weekEffect' => $this->shopService->getActiveWeekEffect($user),
'newbieEffect' => $newbieEffect, 'newbieEffect' => $newbieEffect,
'initialPresenceTheme' => $initialPresenceTheme, 'initialPresenceTheme' => $initialPresenceTheme,
'initialWelcomeMessage' => $initialWelcomeMessage,
'historyMessages' => $historyMessages, 'historyMessages' => $historyMessages,
'pendingProposal' => $pendingProposalData, 'pendingProposal' => $pendingProposalData,
'pendingDivorce' => $pendingDivorceData, 'pendingDivorce' => $pendingDivorceData,
+11
View File
@@ -232,6 +232,17 @@
}); });
</script> </script>
@endif @endif
@if (!empty($initialWelcomeMessage))
<script>
document.addEventListener('DOMContentLoaded', () => {
setTimeout(() => {
if (typeof window.appendMessage === 'function') {
window.appendMessage(@json($initialWelcomeMessage));
}
}, 220);
});
</script>
@endif
@if (!empty($newbieEffect) || !empty($weekEffect) || !empty($initialPresenceTheme['presence_effect'])) @if (!empty($newbieEffect) || !empty($weekEffect) || !empty($initialPresenceTheme['presence_effect']))
<script> <script>
/** /**