Cleanup frontend controllers and middleware
This commit is contained in:
parent
d73d580724
commit
e0d03513e4
33 changed files with 400 additions and 594 deletions
|
@ -10,6 +10,8 @@
|
|||
namespace Pterodactyl\Repositories\Eloquent;
|
||||
|
||||
use Pterodactyl\Models\Schedule;
|
||||
use Illuminate\Support\Collection;
|
||||
use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
|
||||
use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
|
||||
|
||||
class ScheduleRepository extends EloquentRepository implements ScheduleRepositoryInterface
|
||||
|
@ -23,19 +25,33 @@ class ScheduleRepository extends EloquentRepository implements ScheduleRepositor
|
|||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* Return all of the schedules for a given server.
|
||||
*
|
||||
* @param int $server
|
||||
* @return \Illuminate\Support\Collection
|
||||
*/
|
||||
public function getServerSchedules($server)
|
||||
public function findServerSchedules(int $server): Collection
|
||||
{
|
||||
return $this->getBuilder()->withCount('tasks')->where('server_id', '=', $server)->get($this->getColumns());
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* Return a schedule model with all of the associated tasks as a relationship.
|
||||
*
|
||||
* @param int $schedule
|
||||
* @return \Pterodactyl\Models\Schedule
|
||||
*
|
||||
* @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
|
||||
*/
|
||||
public function getScheduleWithTasks($schedule)
|
||||
public function getScheduleWithTasks(int $schedule): Schedule
|
||||
{
|
||||
return $this->getBuilder()->with('tasks')->find($schedule, $this->getColumns());
|
||||
/** @var \Pterodactyl\Models\Schedule $instance */
|
||||
$instance = $this->getBuilder()->with('tasks')->find($schedule, $this->getColumns());
|
||||
if (! $instance) {
|
||||
throw new RecordNotFoundException;
|
||||
}
|
||||
|
||||
return $instance;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -25,33 +25,39 @@ class SubuserRepository extends EloquentRepository implements SubuserRepositoryI
|
|||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* Return a subuser with the associated server relationship.
|
||||
*
|
||||
* @param \Pterodactyl\Models\Subuser $subuser
|
||||
* @param bool $refresh
|
||||
* @return \Pterodactyl\Models\Subuser
|
||||
*/
|
||||
public function getWithServer($id)
|
||||
public function getWithServer(Subuser $subuser, bool $refresh = false): Subuser
|
||||
{
|
||||
Assert::numeric($id, 'First argument passed to getWithServer must be numeric, received %s.');
|
||||
|
||||
$instance = $this->getBuilder()->with('server', 'user')->find($id, $this->getColumns());
|
||||
if (! $instance) {
|
||||
throw new RecordNotFoundException;
|
||||
if (! $subuser->relationLoaded('server') || $refresh) {
|
||||
$subuser->load('server');
|
||||
}
|
||||
|
||||
return $instance;
|
||||
return $subuser;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
* Return a subuser with the associated permissions relationship.
|
||||
*
|
||||
* @param \Pterodactyl\Models\Subuser $subuser
|
||||
* @param bool $refresh
|
||||
* @return \Pterodactyl\Models\Subuser
|
||||
*/
|
||||
public function getWithPermissions($id)
|
||||
public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser
|
||||
{
|
||||
Assert::numeric($id, 'First argument passed to getWithPermissions must be numeric, received %s.');
|
||||
|
||||
$instance = $this->getBuilder()->with('permissions', 'user')->find($id, $this->getColumns());
|
||||
if (! $instance) {
|
||||
throw new RecordNotFoundException;
|
||||
if (! $subuser->relationLoaded('permissions') || $refresh) {
|
||||
$subuser->load('permissions');
|
||||
}
|
||||
|
||||
return $instance;
|
||||
if (! $subuser->relationLoaded('user') || $refresh) {
|
||||
$subuser->load('user');
|
||||
}
|
||||
|
||||
return $subuser;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Reference in a new issue