🆙 More fixes 🆙

This commit is contained in:
Remco
2026-01-19 20:43:46 +01:00
parent deed2158ca
commit 7b9849c159
77 changed files with 1084 additions and 13612 deletions
@@ -10,22 +10,32 @@ use Illuminate\Support\Facades\Cache;
class StaffService
{
/**
* @return Collection<int, Permission>
*/
public function fetchStaffPositions(): Collection
{
$cacheEnabled = setting('enable_caching') === '1';
if ($cacheEnabled && Cache::has('staff_positions')) {
/** @var Collection<int, Permission> */
return Cache::get('staff_positions');
}
/** @var \App\Models\User|null $user */
$user = Auth::user();
$userRank = $user ? $user->rank : 0;
/** @var Collection<int, Permission> $employees */
$employees = Permission::query()
->select('id', 'rank_name', 'badge', 'staff_color', 'job_description')
->when(Auth::user()->rank < (int) setting('min_rank_to_see_hidden_staff'), fn ($query) => $query->where('hidden_rank', false))
->when($userRank < (int) setting('min_rank_to_see_hidden_staff'), fn ($query) => $query->where('hidden_rank', false))
->where('id', '>=', setting('min_staff_rank'))
->orderByDesc('id')
->with(['users' => function ($query): void {
->with(['users' => function ($query) use ($userRank): void {
/** @var \Illuminate\Database\Eloquent\Builder $query */
$query->select('id', 'username', 'rank', 'motto', 'look', 'hidden_staff', 'online')
->when(Auth::user()->rank < (int) setting('min_rank_to_see_hidden_staff'), fn ($query) => $query->where('hidden_staff', false));
->when($userRank < (int) setting('min_rank_to_see_hidden_staff'), fn ($query) => $query->where('hidden_staff', false));
}])
->get();
@@ -37,14 +47,19 @@ class StaffService
return $employees;
}
/**
* @return array<int, int>
*/
public function fetchEmployeeIds(): array
{
$cacheEnabled = setting('enable_caching') === '1';
if ($cacheEnabled && Cache::has('staff_ids')) {
/** @var array<int, int> */
return Cache::get('staff_ids');
}
/** @var array<int, int> $staffIds */
$staffIds = User::select('id')
->where('rank', '>=', setting('min_staff_rank'))
->get()