Merge pull request pterodactyl#2904 from pterodactyl/matthewpi/archiver-tweaks

Archiver tweaks

Author: DaneEveritt

app/Repositories/Wings/DaemonBackupRepository.php

@@ -2,6 +2,7 @@
 
 namespace Pterodactyl\Repositories\Wings;
 
+use Illuminate\Support\Arr;
 use Webmozart\Assert\Assert;
 use Pterodactyl\Models\Backup;
 use Pterodactyl\Models\Server;
@@ -48,7 +49,7 @@ public function backup(Backup $backup): ResponseInterface
                     'json' => [
                         'adapter' => $this->adapter ?? config('backups.default'),
                         'uuid' => $backup->uuid,
-                        'ignored_files' => $backup->ignored_files,
+                        'ignore' => implode('\n', $backup->ignored_files),
                     ],
                 ]
             );

app/Services/Backups/InitiateBackupService.php

@@ -117,9 +117,9 @@ public function handle(Server $server, string $name = null, bool $override = fal
         }
 
         // Check if the server has reached or exceeded it's backup limit
-        if (!$server->backup_limit || $server->backups()->where('is_successful', true)->count() >= $server->backup_limit) {
+        if (! $server->backup_limit || $server->backups()->where('is_successful', true)->count() >= $server->backup_limit) {
             // Do not allow the user to continue if this server is already at its limit and can't override.
-            if (!$override || $server->backup_limit <= 0) {
+            if (! $override || $server->backup_limit <= 0) {
                 throw new TooManyBackupsException($server->backup_limit);
             }