Merge branch 'develop' into feature/react-admin

app/Http/Controllers/Api/Client/Servers/BackupController.php

@@ -195,7 +195,7 @@ class BackupController extends ClientApiController
             // actions against it via the Panel API.
             $server->update(['status' => Server::STATUS_RESTORING_BACKUP]);
 
-            $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate') === 'true');
+            $this->repository->setServer($server)->restore($backup, $url ?? null, $request->input('truncate'));
         });
 
         return $this->returnNoContent();

app/Http/Controllers/Api/Client/Servers/ResourceUtilizationController.php

@@ -2,7 +2,9 @@
 
 namespace Pterodactyl\Http\Controllers\Api\Client\Servers;
 
+use Carbon\Carbon;
 use Pterodactyl\Models\Server;
+use Illuminate\Cache\Repository;
 use Pterodactyl\Transformers\Api\Client\StatsTransformer;
 use Pterodactyl\Repositories\Wings\DaemonServerRepository;
 use Pterodactyl\Http\Controllers\Api\Client\ClientApiController;
@@ -10,27 +12,35 @@ use Pterodactyl\Http\Requests\Api\Client\Servers\GetServerRequest;
 
 class ResourceUtilizationController extends ClientApiController
 {
+    private Repository $cache;
     private DaemonServerRepository $repository;
 
     /**
      * ResourceUtilizationController constructor.
      */
-    public function __construct(DaemonServerRepository $repository)
+    public function __construct(Repository $cache, DaemonServerRepository $repository)
     {
         parent::__construct();
 
+        $this->cache = $cache;
         $this->repository = $repository;
     }
 
     /**
-     * Return the current resource utilization for a server.
+     * Return the current resource utilization for a server. This value is cached for up to
+     * 20 seconds at a time to ensure that repeated requests to this endpoint do not cause
+     * a flood of unnecessary API calls.
      *
      * @throws \Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException
      * @throws \Illuminate\Contracts\Container\BindingResolutionException
      */
     public function __invoke(GetServerRequest $request, Server $server): array
     {
-        $stats = $this->repository->setServer($server)->getDetails();
+        $stats = $this->cache
+            ->tags(['resources'])
+            ->remember($server->uuid, Carbon::now()->addSeconds(20), function () use ($server) {
+                return $this->repository->setServer($server)->getDetails();
+            });
 
         return $this->fractal->item($stats)
             ->transformWith($this->getTransformer(StatsTransformer::class))

app/Http/Controllers/Api/Client/TwoFactorController.php

@@ -57,7 +57,14 @@ class TwoFactorController extends ClientApiController
     /**
      * Updates a user's account to have two-factor enabled.
      *
+     * @return \Illuminate\Http\JsonResponse
+     *
      * @throws \Throwable
+     * @throws \Illuminate\Validation\ValidationException
+     * @throws \PragmaRX\Google2FA\Exceptions\IncompatibleWithGoogleAuthenticatorException
+     * @throws \PragmaRX\Google2FA\Exceptions\InvalidCharactersException
+     * @throws \PragmaRX\Google2FA\Exceptions\SecretKeyTooShortException
+     * @throws \Pterodactyl\Exceptions\Service\User\TwoFactorAuthenticationTokenInvalid
      */
     public function store(Request $request): JsonResponse
     {