Skip to content

fix: stop people in timeout from going live #1146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nunomaduro merged 2 commits into from
Oct 26, 2026
Merged

fix: stop people in timeout from going live #1146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26a031
fix: stop people in timeout from going live
Oct 25, 2026
60f5438
Merge upstream/production into fix/live-in-timeout
Akiyo974 Oct 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion routes/web.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,9 @@
Route::put('settings/remotes', [UserRemotesController::class, 'update'])->name('user-remotes.update');

// User Live...
Route::put('settings/live', [UserLiveController::class, 'update'])->name('user-live.update');
Route::put('settings/live', [UserLiveController::class, 'update'])
->middleware(PreventPostingInTimeout::class)
->name('user-live.update');
Route::delete('settings/live', [UserLiveController::class, 'destroy'])->name('user-live.destroy');

// Appearance...
Expand Down
20 changes: 20 additions & 0 deletions tests/Feature/Controllers/UserTimeoutControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,26 @@
->assertJsonPath('timeout.reason', 'Spam or self-promotion');
});

it('stops a user in timeout from going live, but lets them end a stream', function (): void {
$user = User::factory()->create([
'live_platform' => 'youtube',
'live_url' => 'https://www.youtube.com/watch?v=dQw4w9WgXcQ',
'live_ends_at' => now()->addHour(),
]);
UserTimeout::factory()->for($user)->create();

$this->actingAs($user)
->putJson(route('user-live.update'), ['url' => 'https://www.twitch.tv/buymycourse', 'hours' => 12])
->assertForbidden()
->assertJsonPath('timeout.reason', 'Spam or self-promotion');

expect($user->refresh()->live_url)->toBe('https://www.youtube.com/watch?v=dQw4w9WgXcQ');

$this->delete(route('user-live.destroy'))->assertRedirect();

expect($user->refresh()->live_url)->toBeNull();
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.

it('stops a user in timeout from starting, renaming, or growing orgs, and from messaging or pinning in them', function (): void {
$user = User::factory()->create();
[$member, $newcomer] = followersOf($user, 2);
Expand Down