lkddi/chatroom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

统一座驾播报用户信息

Browse Source
This commit is contained in:
pllx
2026-04-30 11:08:39 +08:00
parent 7ba7b34ca7
commit fc7930046d
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/RideService.php
+3 -2
View File
@@ -236,14 +236,15 @@ class RideService
'{ride}' => $item->name, '{ride}' => $item->name,
]); ]);
$identitySummary = $this->chatUserPresenceService->buildIdentitySummary($user); $identitySummary = $this->chatUserPresenceService->buildIdentitySummary($user);
$effectUserInfo = "用户 {$user->username} · {$identitySummary['inline']}";
return [ return [
'ride_key' => $rideKey, 'ride_key' => $rideKey,
'ride_name' => $item->name, 'ride_name' => $item->name,
'ride_icon' => (string) ($item->icon ?? '🚘'), 'ride_icon' => (string) ($item->icon ?? '🚘'),
'effect_title' => "{$user->username} 乘坐【{$item->name}】闪亮登场", 'effect_title' => "{$user->username} 乘坐【{$item->name}】闪亮登场",
'effect_user_info' => $identitySummary['inline'], 'effect_user_info' => $effectUserInfo,
'identity_text' => ChatContentSanitizer::htmlText($identitySummary['inline']), 'identity_text' => ChatContentSanitizer::htmlText($effectUserInfo),
'welcome_text' => ChatContentSanitizer::htmlText($rendered), 'welcome_text' => ChatContentSanitizer::htmlText($rendered),
]; ];
} }
tests/Feature/ChatControllerTest.php
+6 -5
View File
@@ -1133,12 +1133,13 @@ class ChatControllerTest extends TestCase
$this->assertSame('座驾播报', $rideMessage['from_user']); $this->assertSame('座驾播报', $rideMessage['from_user']);
$this->assertSame('j35', $rideMessage['ride_key']); $this->assertSame('j35', $rideMessage['ride_key']);
$this->assertSame("{$user->username} 乘坐【歼-35测试座驾】闪亮登场", $rideMessage['effect_title']); $this->assertSame("{$user->username} 乘坐【歼-35测试座驾】闪亮登场", $rideMessage['effect_title']);
$this->assertSame('部门 无部门 · 职务 无职务 · 会员 普通会员', $rideMessage['effect_user_info']); $this->assertSame("用户 {$user->username} · 部门 无部门 · 职务 无职务 · 会员 普通会员", $rideMessage['effect_user_info']);
$this->assertStringContainsString($user->username, $rideMessage['content']); $this->assertStringContainsString($user->username, $rideMessage['content']);
$this->assertStringContainsString("用户 {$user->username} · 部门 无部门 · 职务 无职务 · 会员 普通会员", $rideMessage['content']);
$this->assertSame('j35', $response->viewData('initialRideEffect')); $this->assertSame('j35', $response->viewData('initialRideEffect'));
$this->assertSame([ $this->assertSame([
'effect_title' => "{$user->username} 乘坐【歼-35测试座驾】闪亮登场", 'effect_title' => "{$user->username} 乘坐【歼-35测试座驾】闪亮登场",
'effect_user_info' => '部门 无部门 · 职务 无职务 · 会员 普通会员', 'effect_user_info' => "用户 {$user->username} · 部门 无部门 · 职务 无职务 · 会员 普通会员",
'ride_name' => '歼-35测试座驾', 'ride_name' => '歼-35测试座驾',
'operator' => $user->username, 'operator' => $user->username,
], $response->viewData('initialRideEffectOptions')); ], $response->viewData('initialRideEffectOptions'));
@@ -1211,11 +1212,11 @@ class ChatControllerTest extends TestCase
$this->assertNotNull($rideMessage); $this->assertNotNull($rideMessage);
$this->assertNull($vipPresenceMessage); $this->assertNull($vipPresenceMessage);
$this->assertStringContainsString('部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员', $rideMessage['content']); $this->assertStringContainsString("用户 {$user->username} · 部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员", $rideMessage['content']);
$this->assertSame('部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员', $rideMessage['effect_user_info']); $this->assertSame("用户 {$user->username} · 部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员", $rideMessage['effect_user_info']);
$this->assertStringContainsString($user->username, $rideMessage['content']); $this->assertStringContainsString($user->username, $rideMessage['content']);
$this->assertSame('99a', $response->viewData('initialRideEffect')); $this->assertSame('99a', $response->viewData('initialRideEffect'));
$this->assertSame('部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员', $response->viewData('initialRideEffectOptions')['effect_user_info']); $this->assertSame("用户 {$user->username} · 部门 战备部 · 职务 🛡️ 试飞官 · 会员 👑 至尊会员", $response->viewData('initialRideEffectOptions')['effect_user_info']);
$this->assertNull($response->viewData('initialPresenceTheme')); $this->assertNull($response->viewData('initialPresenceTheme'));
} }