Skip to content

fix(1395): unbanning lifts the 48h minimum-vacation restriction #1411

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

Open
piciolo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(1395): unbanning lifts the 48h minimum-vacation restriction #1411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/Http/Controllers/Admin/ServerAdministrationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,15 @@ public function unban(Request $request): RedirectResponse
'canceled' => true,
'canceled_at' => now(),
]);

// Lift the 48h minimum-vacation restriction that was imposed by the ban
// so the player can leave vacation mode immediately after being unbanned.
// The vacation_mode flag itself is left ON — the player chooses when to
// disable it; we only release the time-lock that the ban introduced.
if ($user->vacation_mode && $user->vacation_mode_until !== null && now()->lessThan($user->vacation_mode_until)) {
$user->vacation_mode_until = now();
$user->save();
}
}

return redirect()->route('admin.server-administration.index')
Expand Down
Loading