Reuse GuzzleClient with timeouts for presigned S3 requests

Some S3-compatible providers (e.g., Hetzner) require presigned requests.
Previously only GetObject and UploadPart were presigned; the remaining
operations (CreateMultipartUpload, ListParts, CompleteMultipartUpload,
AbortMultipartUpload, DeleteObject) used header-based auth. This adds an
executeS3Command() method to S3Filesystem that sends all commands via
presigned URLs with manual XML response parsing, giving universal
compatibility with all S3-compatible providers.

.github/workflows/build.yaml

@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        node-version: [22, 24]
+        node-version: [20, 22]
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.5"
+          php-version: ${{ matrix.php }}
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -30,7 +30,7 @@ jobs:
         run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: "yarn"

.github/workflows/ci.yaml

@@ -26,13 +26,13 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4, 8.5]
     env:
       DB_CONNECTION: sqlite
       DB_DATABASE: testing.sqlite
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get cache directory
         id: composer-cache
@@ -40,7 +40,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -65,13 +65,13 @@ jobs:
         run: php artisan migrate --force --seed
 
       - name: Unit tests
-        run: vendor/bin/pest tests/Unit --parallel --do-not-fail-on-phpunit-warning
+        run: vendor/bin/pest tests/Unit --parallel
         env:
           DB_HOST: UNIT_NO_DB
           SKIP_MIGRATIONS: true
 
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel --do-not-fail-on-phpunit-warning
+        run: vendor/bin/pest tests/Integration --parallel
 
   mysql:
     name: MySQL
@@ -79,8 +79,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mysql:8.4", "mysql:9.6"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mysql:8"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -89,7 +89,7 @@ jobs:
           MYSQL_DATABASE: testing
         ports:
           - 3306
-        options: --tmpfs /var/lib/mysql:rw --health-cmd="mysqladmin ping" --health-interval=2s --health-timeout=5s --health-retries=30
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     env:
       DB_CONNECTION: mysql
       DB_HOST: 127.0.0.1
@@ -97,7 +97,7 @@ jobs:
       DB_USERNAME: root
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get cache directory
         id: composer-cache
@@ -105,7 +105,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -129,8 +129,14 @@ jobs:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
 
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit --parallel
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel --do-not-fail-on-phpunit-warning
+        run: vendor/bin/pest tests/Integration --parallel
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -141,8 +147,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["mariadb:10.11", "mariadb:11.4"]
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -151,7 +157,7 @@ jobs:
           MYSQL_DATABASE: testing
         ports:
           - 3306
-        options: --tmpfs /var/lib/mysql:rw --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=2s --health-timeout=5s --health-retries=30
+        options: --health-cmd="mariadb-admin ping || mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     env:
       DB_CONNECTION: mariadb
       DB_HOST: 127.0.0.1
@@ -159,7 +165,7 @@ jobs:
       DB_USERNAME: root
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get cache directory
         id: composer-cache
@@ -167,7 +173,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -191,8 +197,14 @@ jobs:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
 
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit --parallel
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel --do-not-fail-on-phpunit-warning
+        run: vendor/bin/pest tests/Integration --parallel
         env:
           DB_PORT: ${{ job.services.database.ports[3306] }}
           DB_USERNAME: root
@@ -203,15 +215,8 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.5]
-        database: ["postgres:17", "postgres:18"]
-        include:
-          # postgres:17 stores data in /var/lib/postgresql/data, 18+ requires a
-          # single mount at /var/lib/postgresql and errors on a data submount
-          - database: "postgres:17"
-            tmpfs: /var/lib/postgresql/data
-          - database: "postgres:18"
-            tmpfs: /var/lib/postgresql
+        php: [8.2, 8.3, 8.4, 8.5]
+        database: ["postgres:14"]
     services:
       database:
         image: ${{ matrix.database }}
@@ -223,11 +228,10 @@ jobs:
         ports:
           - 5432:5432
         options: >-
-          --tmpfs ${{ matrix.tmpfs }}:rw
           --health-cmd pg_isready
-          --health-interval 2s
+          --health-interval 10s
           --health-timeout 5s
-          --health-retries 30
+          --health-retries 5
     env:
       DB_CONNECTION: pgsql
       DB_HOST: 127.0.0.1
@@ -236,7 +240,7 @@ jobs:
       DB_PASSWORD: postgres
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get cache directory
         id: composer-cache
@@ -244,7 +248,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -265,5 +269,11 @@ jobs:
       - name: Run Migrations
         run: php artisan migrate --force --seed
 
+      - name: Unit tests
+        run: vendor/bin/pest tests/Unit --parallel
+        env:
+          DB_HOST: UNIT_NO_DB
+          SKIP_MIGRATIONS: true
+
       - name: Integration tests
-        run: vendor/bin/pest tests/Integration --parallel --do-not-fail-on-phpunit-warning
+        run: vendor/bin/pest tests/Integration --parallel

.github/workflows/docker-publish.yml

@@ -31,13 +31,13 @@ jobs:
             platform: linux/arm64
     steps:
       - name: Code checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
       
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
       
       - name: Build the base PHP image
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile.base
@@ -52,7 +52,7 @@ jobs:
         run: docker save -o base-php-${{ matrix.arch }}.tar base-php:${{ matrix.arch }}
       
       - name: Push the docker build to the artifacts
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: base-php-${{ matrix.arch }}.tar
           path: base-php-${{ matrix.arch }}.tar
@@ -76,11 +76,11 @@ jobs:
     if: "!contains(github.ref, 'main') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
     steps:
       - name: Code checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Docker metadata
         id: docker_meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           flavor: |
@@ -91,16 +91,16 @@ jobs:
             type=ref,event=branch
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
       
       # We Need to start it in host mode else it can't acces the local registry on port 5000
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
         with:
           driver-opts: network=host
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -113,12 +113,12 @@ jobs:
           echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
 
         # Download the base PHP image AMD64
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
         with:
           name: base-php-amd64.tar
         
         # Download the base PHP image ARM64
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v4
         with:
           name: base-php-arm64.tar
 
@@ -135,10 +135,10 @@ jobs:
       - name: Update version in config/app.php (tag)
         if: "github.event_name == 'release' && github.event.action == 'published'"
         run: |
-          sed -i "s|'version' => 'canary',|'version' => '${{ steps.build_info.outputs.version_tag }}',|" config/app.php
+          sed -i "s/'version' => 'canary',/'version' => '${{ steps.build_info.outputs.version_tag }}',/" config/app.php
               
       - name: Build and Push (tag)
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         if: "github.event_name == 'release' && github.event.action == 'published'"
         with:
           context: .
@@ -153,7 +153,7 @@ jobs:
           cache-to: type=gha,scope=tagged${{ matrix.os }},mode=max
         
       - name: Build and Push (main)
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         if: "github.event_name == 'push' && contains(github.ref, 'main')"
         with:
           context: .

.github/workflows/download-translations.yml

@@ -1,36 +0,0 @@
-name: Download Crowdin Translations
-
-on:
-  schedule:
-    - cron: '0 0 * * 0' # Every Sunday at midnight
-  workflow_dispatch:
-
-jobs:
-  download-translations:
-    name: Download Translations from Crowdin
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Download Translations from Crowdin
-        uses: crowdin/github-action@v2
-        with:
-          upload_sources: false
-          upload_translations: false
-          download_translations: true
-          export_only_approved: true
-          localization_branch_name: i18n_crowdin_translations
-          create_pull_request: true
-          pull_request_title: 'New Crowdin Translations'
-          pull_request_body: 'New Crowdin translations by [Crowdin GH Action](https://github.com/crowdin/github-action)'
-          pull_request_base_branch_name: 'main'
-          crowdin_branch_name: main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/lint.yaml

@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.5"
+          php-version: "8.4"
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -35,10 +35,10 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.3, 8.4, 8.5]
+        php: [8.2, 8.3, 8.4, 8.5]
     steps:
       - name: Code Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Get cache directory
         id: composer-cache
@@ -46,7 +46,7 @@ jobs:
           echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache
-        uses: actions/cache@v5
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}

.github/workflows/release.yaml

@@ -14,12 +14,12 @@ jobs:
 
     steps:
       - name: Code checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: "8.5"
+          php-version: ${{ matrix.php }}
           extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
           tools: composer:v2
           coverage: none
@@ -28,9 +28,9 @@ jobs:
         run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
 
       - name: Setup Node
-        uses: actions/setup-node@v6
+        uses: actions/setup-node@v4
         with:
-          node-version: 22
+          node-version: 20
           cache: "yarn"
 
       - name: Install JS dependencies

.github/workflows/upload-sources.yml

@@ -1,32 +0,0 @@
-name: Upload Crowdin Sources
-
-on:
-  push:
-    branches: [ main ]
-    paths:
-      - 'lang/en/**'
-      - 'crowdin.yml'
-  workflow_dispatch:
-
-jobs:
-  upload-sources:
-    name: Upload Sources to Crowdin
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-
-      - name: Upload Sources to Crowdin
-        uses: crowdin/github-action@v2
-        with:
-          upload_sources: true
-          upload_translations: false
-          download_translations: false
-          crowdin_branch_name: main
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

Dockerfile

@@ -22,7 +22,7 @@ RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
 # ================================
 # Stage 1-2: Yarn Install
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:22-alpine AS yarn
+FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
 
 WORKDIR /build
 
@@ -68,22 +68,23 @@ RUN apk add --no-cache \
     # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
     zip unzip 7zip bzip2-dev yarn git
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer
 COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
 
 # Create and remove directories
-RUN mkdir -p /pelican-data/storage /var/run/supervisord \
-# Symlinks for env, database, storage
+RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
+    && rm -rf /var/www/html/plugins \
+# Symlinks for env, database, storage, and plugins
     && ln -s  /pelican-data/.env /var/www/html/.env \
     && ln -s  /pelican-data/database/database.sqlite ./database/database.sqlite \
     && ln -s  /pelican-data/storage /var/www/html/public/storage \
     && ln -s  /pelican-data/storage /var/www/html/storage/app/public \
+    && ln -s  /pelican-data/plugins /var/www/html \
 # Allow www-data write permissions where necessary
-    && chown -R www-data: /pelican-data .env ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
     && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
+    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/
+
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf
 COPY docker/Caddyfile /etc/caddy/Caddyfile

Dockerfile.base

@@ -1,7 +1,7 @@
 # ================================
 # Stage 0: Build PHP Base Image
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH php:8.5-fpm-alpine
+FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 

Dockerfile.dev

@@ -1,7 +1,7 @@
 # syntax=docker.io/docker/dockerfile:1.13-labs
 # Pelican Development Dockerfile
 
-FROM --platform=$TARGETOS/$TARGETARCH php:8.5-fpm-alpine AS base
+FROM --platform=$TARGETOS/$TARGETARCH php:8.4-fpm-alpine AS base
 
 ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
 
@@ -26,7 +26,7 @@ RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
 # ================================
 # Stage 1-2: Yarn Install
 # ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:22-alpine AS yarn
+FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
 
 WORKDIR /build
 
@@ -73,22 +73,22 @@ RUN apk add --no-cache \
     # required for installing plugins. Pulled from https://github.com/pelican-dev/panel/pull/2034
     zip unzip 7zip bzip2-dev yarn git
 
-# Copy composer binary for runtime plugin dependency management
-COPY --from=composer /usr/local/bin/composer /usr/local/bin/composer
 COPY --chown=root:www-data --chmod=770 --from=composerbuild /build .
 COPY --chown=root:www-data --chmod=770 --from=yarnbuild /build/public ./public
 
 # Create and remove directories
-RUN mkdir -p /pelican-data/storage /var/run/supervisord \
-# Symlinks for env, database, storage
+RUN mkdir -p /pelican-data/storage /pelican-data/plugins /var/run/supervisord \
+    && rm -rf /var/www/html/plugins \
+# Symlinks for env, database, storage, and plugins
     && ln -s  /pelican-data/.env /var/www/html/.env \
     && ln -s  /pelican-data/database/database.sqlite ./database/database.sqlite \
     && ln -s  /pelican-data/storage /var/www/html/public/storage \
     && ln -s  /pelican-data/storage /var/www/html/storage/app/public \
+    && ln -s  /pelican-data/plugins /var/www/html \
 # Allow www-data write permissions where necessary
-    && chown -R www-data: /pelican-data .env ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
+    && chown -R www-data: /pelican-data .env ./storage ./plugins ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
     && chmod -R 770 /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/ /var/www/html/composer.json /var/www/html/composer.lock
+    && chown -R www-data: /usr/local/etc/php/ /usr/local/etc/php-fpm.d/
 
 # Configure Supervisor
 COPY docker/supervisord.conf /etc/supervisord.conf

app/Console/Commands/Egg/CheckEggUpdatesCommand.php

@@ -8,6 +8,7 @@ use App\Services\Eggs\Sharing\EggExporterService;
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Http;
+use JsonException;
 use Symfony\Component\Yaml\Yaml;
 
 class CheckEggUpdatesCommand extends Command
@@ -21,12 +22,14 @@ class CheckEggUpdatesCommand extends Command
             try {
                 $this->check($egg, $exporterService);
             } catch (Exception $exception) {
-                $this->error("$egg->name: Error ({$exception->getMessage()})");
+                $this->error("{$egg->name}: Error ({$exception->getMessage()})");
             }
         }
     }
 
-    /** @throws Exception */
+    /**
+     * @throws JsonException
+     */
     private function check(Egg $egg, EggExporterService $exporterService): void
     {
         if (is_null($egg->update_url)) {
@@ -35,25 +38,14 @@ class CheckEggUpdatesCommand extends Command
             return;
         }
 
-        $extension = strtolower(pathinfo(parse_url($egg->update_url, PHP_URL_PATH), PATHINFO_EXTENSION));
-
-        if (empty($extension)) {
-            throw new Exception('Unsupported file format.');
-        }
-
-        $isYaml = in_array($extension, ['yaml', 'yml']);
+        $ext = strtolower(pathinfo(parse_url($egg->update_url, PHP_URL_PATH), PATHINFO_EXTENSION));
+        $isYaml = in_array($ext, ['yaml', 'yml']);
 
         $local = $isYaml
             ? Yaml::parse($exporterService->handle($egg->id, EggFormat::YAML))
             : json_decode($exporterService->handle($egg->id, EggFormat::JSON), true);
 
-        $remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url);
-
-        if ($remote->failed()) {
-            throw new Exception("HTTP request returned status code {$remote->status()}");
-        }
-
-        $remote = $remote->body();
+        $remote = Http::timeout(5)->connectTimeout(1)->get($egg->update_url)->throw()->body();
         $remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
 
         unset($local['exported_at'], $remote['exported_at']);

app/Console/Commands/Egg/UpdateEggIndexCommand.php

@@ -13,7 +13,7 @@ class UpdateEggIndexCommand extends Command
     public function handle(): int
     {
         try {
-            $data = Http::timeout(5)->connectTimeout(1)->get(config('panel.cdn.egg_index_url'))->throw()->json();
+            $data = Http::timeout(5)->connectTimeout(1)->get('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json')->throw()->json();
         } catch (Exception $exception) {
             $this->error($exception->getMessage());
 

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -16,7 +16,6 @@ class DatabaseSettingsCommand extends Command
         'sqlite' => 'SQLite (recommended)',
         'mariadb' => 'MariaDB',
         'mysql' => 'MySQL',
-        'pgsql' => 'PostgreSQL',
     ];
 
     protected $description = 'Configure database settings for the Panel.';
@@ -24,10 +23,10 @@ class DatabaseSettingsCommand extends Command
     protected $signature = 'p:environment:database
                             {--driver= : The database driver backend to use.}
                             {--database= : The database to use.}
-                            {--host= : The connection address for the MySQL/ MariaDB/ PostgreSQL server.}
-                            {--port= : The connection port for the MySQL/ MariaDB/ PostgreSQL server.}
-                            {--username= : Username to use when connecting to the MySQL/ MariaDB/ PostgreSQL server.}
-                            {--password= : Password to use for the MySQL/ MariaDB/ PostgreSQL database.}';
+                            {--host= : The connection address for the MySQL/ MariaDB server.}
+                            {--port= : The connection port for the MySQL/ MariaDB server.}
+                            {--username= : Username to use when connecting to the MySQL/ MariaDB server.}
+                            {--password= : Password to use for the MySQL/ MariaDB database.}';
 
     /** @var array<array-key, mixed> */
     protected array $variables = [];
@@ -177,68 +176,6 @@ class DatabaseSettingsCommand extends Command
                     return $this->handle();
                 }
 
-                return 1;
-            }
-        } elseif ($this->variables['DB_CONNECTION'] === 'pgsql') {
-            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
-            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
-                'Database Host',
-                config('database.connections.pgsql.host', '127.0.0.1')
-            );
-
-            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-                'Database Port',
-                config('database.connections.pgsql.port', 5432)
-            );
-
-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Name',
-                config('database.connections.pgsql.database', 'panel')
-            );
-
-            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
-            $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
-                'Database Username',
-                config('database.connections.pgsql.username', 'pelican')
-            );
-
-            $askForPgSQLPassword = true;
-            if (!empty(config('database.connections.pgsql.password')) && $this->input->isInteractive()) {
-                $this->variables['DB_PASSWORD'] = config('database.connections.pgsql.password');
-                $askForPgSQLPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
-            }
-
-            if ($askForPgSQLPassword) {
-                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
-            }
-
-            try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'pgsql',
-                    'host' => $this->variables['DB_HOST'],
-                    'port' => $this->variables['DB_PORT'],
-                    'database' => $this->variables['DB_DATABASE'],
-                    'username' => $this->variables['DB_USERNAME'],
-                    'password' => $this->variables['DB_PASSWORD'],
-                    'charset' => 'utf8',
-                    'prefix' => '',
-                    'prefix_indexes' => true,
-                    'search_path' => 'public',
-                    'sslmode' => 'prefer',
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
-            } catch (PDOException $exception) {
-                $this->output->error(sprintf('Unable to connect to the PostgreSQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
-                $this->output->error(trans('commands.database_settings.DB_error_2'));
-
-                if ($this->confirm(trans('commands.database_settings.go_back'))) {
-                    $this->database->disconnect('_panel_command_test');
-
-                    return $this->handle();
-                }
-
                 return 1;
             }
         } elseif ($this->variables['DB_CONNECTION'] === 'sqlite') {

app/Console/Commands/Plugin/DisablePluginCommand.php

@@ -16,7 +16,7 @@ class DisablePluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/InstallPluginCommand.php

@@ -18,7 +18,7 @@ class InstallPluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/UninstallPluginCommand.php

@@ -18,7 +18,7 @@ class UninstallPluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Console/Commands/Plugin/UpdatePluginCommand.php

@@ -17,7 +17,7 @@ class UpdatePluginCommand extends Command
     {
         $id = $this->argument('id') ?? $this->choice('Plugin', Plugin::pluck('name', 'id')->toArray());
 
-        $plugin = Plugin::find(str($id)->lower()->toString());
+        $plugin = Plugin::find($id);
 
         if (!$plugin) {
             $this->error('Plugin does not exist!');

app/Enums/ContainerStatus.php

@@ -41,8 +41,17 @@ enum ContainerStatus: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(): string
+    public function getColor(bool $hex = false): string
     {
+        if ($hex) {
+            return match ($this) {
+                self::Created, self::Restarting => '#2563EB',
+                self::Starting, self::Paused, self::Removing, self::Stopping => '#D97706',
+                self::Running => '#22C55E',
+                self::Exited, self::Missing, self::Dead, self::Offline => '#EF4444',
+            };
+        }
+
         return match ($this) {
             self::Created => 'primary',
             self::Starting => 'warning',

app/Enums/CustomizationKey.php

@@ -12,7 +12,6 @@ enum CustomizationKey: string
     case DashboardLayout = 'dashboard_layout';
 
     case ButtonStyle = 'button_style';
-    case RedirectToAdmin = 'redirect_to_admin';
 
     public function getDefaultValue(): string|int|bool
     {
@@ -24,7 +23,6 @@ enum CustomizationKey: string
             self::TopNavigation => config('panel.filament.default-navigation', 'sidebar'),
             self::DashboardLayout => 'grid',
             self::ButtonStyle => true,
-            self::RedirectToAdmin => false,
         };
     }
 

app/Enums/ResourceLimit.php

@@ -43,12 +43,12 @@ enum ResourceLimit: string
     public function limit(): Limit
     {
         return match ($this) {
-            self::Websocket => Limit::perMinutes(config('http.rate_limit.websocket_period'), config('http.rate_limit.websocket')),
-            self::BackupRestore => Limit::perMinutes(config('http.rate_limit.backup_restore_period'), config('http.rate_limit.backup_restore')),
-            self::DatabaseCreate => Limit::perMinutes(config('http.rate_limit.database_create_period'), config('http.rate_limit.database_create')),
-            self::SubuserCreate => Limit::perMinutes(config('http.rate_limit.subuser_create_period'), config('http.rate_limit.subuser_create')),
-            self::FilePull => Limit::perMinutes(config('http.rate_limit.file_pull_period'), config('http.rate_limit.file_pull')),
-            default => Limit::perMinutes(config('http.rate_limit.default_period'), config('http.rate_limit.default')),
+            self::Websocket => Limit::perMinute(5),
+            self::BackupRestore => Limit::perMinutes(15, 3),
+            self::DatabaseCreate => Limit::perMinute(2),
+            self::SubuserCreate => Limit::perMinutes(15, 10),
+            self::FilePull => Limit::perMinutes(10, 5),
+            default => Limit::perMinute(2),
         };
     }
 

app/Enums/ServerState.php

@@ -25,8 +25,16 @@ enum ServerState: string implements HasColor, HasIcon, HasLabel
         };
     }
 
-    public function getColor(): string
+    public function getColor(bool $hex = false): string
     {
+        if ($hex) {
+            return match ($this) {
+                self::Installing, self::RestoringBackup => '#2563EB',
+                self::Suspended => '#D97706',
+                self::InstallFailed, self::ReinstallFailed => '#EF4444',
+            };
+        }
+
         return match ($this) {
             self::Installing => 'primary',
             self::InstallFailed => 'danger',

app/Enums/SubuserPermission.php

@@ -50,9 +50,6 @@ enum SubuserPermission: string
 
     case ActivityRead = 'activity.read';
 
-    case MountRead = 'mount.read';
-    case MountUpdate = 'mount.update';
-
     case StartupRead = 'startup.read';
     case StartupUpdate = 'startup.update';
     case StartupDockerImage = 'startup.docker-image';
@@ -60,7 +57,6 @@ enum SubuserPermission: string
     case SettingsRename = 'settings.rename';
     case SettingsDescription = 'settings.description';
     case SettingsReinstall = 'settings.reinstall';
-    case SettingsChangeIcon = 'settings.change-icon';
 
     /** @return string[] */
     public function split(): array
@@ -88,7 +84,6 @@ enum SubuserPermission: string
             'schedule' => TablerIcon::Clock,
             'settings' => TablerIcon::Settings,
             'activity' => TablerIcon::Stack,
-            'mount' => TablerIcon::LayersLinked,
             default => null,
         };
     }

app/Events/Server/BackupCompleted.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Events\Server;
-
-use App\Events\Event;
-use App\Models\Backup;
-use Illuminate\Queue\SerializesModels;
-
-class BackupCompleted extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public Backup $backup) {}
-}

app/Events/User/Deleting.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Events\Event;
-use App\Models\User;
-use Illuminate\Queue\SerializesModels;
-
-class Deleting extends Event
-{
-    use SerializesModels;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(public User $user) {}
-}

app/Events/User/PasswordChanged.php

@@ -1,13 +0,0 @@
-<?php
-
-namespace App\Events\User;
-
-use App\Models\User;
-use Illuminate\Foundation\Events\Dispatchable;
-
-final class PasswordChanged
-{
-    use Dispatchable;
-
-    public function __construct(public readonly User $user) {}
-}

app/Exceptions/ManifestDoesNotExistException.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Exceptions;
+
+use App\Exceptions\Solutions\ManifestDoesNotExistSolution;
+use Exception;
+use Spatie\Ignition\Contracts\ProvidesSolution;
+use Spatie\Ignition\Contracts\Solution;
+
+class ManifestDoesNotExistException extends Exception implements ProvidesSolution
+{
+    public function getSolution(): Solution
+    {
+        return new ManifestDoesNotExistSolution();
+    }
+}

app/Exceptions/PluginIdMismatchException.php

@@ -1,7 +0,0 @@
-<?php
-
-namespace App\Exceptions;
-
-use Exception;
-
-class PluginIdMismatchException extends Exception {}

app/Exceptions/Solutions/ManifestDoesNotExistSolution.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Exceptions\Solutions;
+
+use Spatie\Ignition\Contracts\Solution;
+
+class ManifestDoesNotExistSolution implements Solution
+{
+    public function getSolutionTitle(): string
+    {
+        return "The manifest.json file hasn't been generated yet";
+    }
+
+    public function getSolutionDescription(): string
+    {
+        return 'Run yarn run build:production to build the frontend first.';
+    }
+
+    public function getDocumentationLinks(): array
+    {
+        return [
+            'Docs' => 'https://github.com/pelican/panel/blob/master/package.json',
+        ];
+    }
+}

app/Extensions/Filesystem/S3Filesystem.php

@@ -2,11 +2,18 @@
 
 namespace App\Extensions\Filesystem;
 
+use Aws\CommandInterface;
+use Aws\Result;
 use Aws\S3\S3ClientInterface;
+use GuzzleHttp\Client as GuzzleClient;
 use League\Flysystem\AwsS3V3\AwsS3V3Adapter;
+use RuntimeException;
+use SimpleXMLElement;
 
 class S3Filesystem extends AwsS3V3Adapter
 {
+    private ?GuzzleClient $guzzle = null;
+
     /**
      * @param  array<mixed>  $options
      */
@@ -26,6 +33,18 @@ class S3Filesystem extends AwsS3V3Adapter
         );
     }
 
+    private function getGuzzleClient(): GuzzleClient
+    {
+        if ($this->guzzle === null) {
+            $this->guzzle = new GuzzleClient([
+                'timeout' => 30,
+                'connect_timeout' => 10,
+            ]);
+        }
+
+        return $this->guzzle;
+    }
+
     public function getClient(): S3ClientInterface
     {
         return $this->client;
@@ -35,4 +54,78 @@ class S3Filesystem extends AwsS3V3Adapter
     {
         return $this->bucket;
     }
+
+    /**
+     * Execute an S3 command using a presigned URL for maximum compatibility
+     * with S3-compatible providers.
+     *
+     * @return Result<array<string, mixed>>
+     */
+    public function executeS3Command(CommandInterface $command): Result
+    {
+        $presignedRequest = $this->client->createPresignedRequest($command, '+60 minutes');
+
+        $response = $this->getGuzzleClient()->send($presignedRequest);
+
+        $body = (string) $response->getBody();
+        $commandName = $command->getName();
+
+        // S3's CompleteMultipartUpload can return HTTP 200 with an <Error> body
+        if ($body !== '' && str_contains($body, '<Error>')) {
+            throw new RuntimeException("S3 returned an error for $commandName: $body");
+        }
+
+        return new Result($this->parseS3Response($commandName, $body));
+    }
+
+    /**
+     * Parse the XML response body based on the S3 command type.
+     *
+     * @return array<string, mixed>
+     */
+    private function parseS3Response(string $commandName, string $body): array
+    {
+        if ($body === '') {
+            return [];
+        }
+
+        $xml = @simplexml_load_string($body);
+        if ($xml === false) {
+            throw new RuntimeException("Failed to parse S3 XML response for $commandName: $body");
+        }
+
+        return match ($commandName) {
+            'CreateMultipartUpload' => $this->parseCreateMultipartUpload($xml),
+            'ListParts' => $this->parseListParts($xml),
+            'CompleteMultipartUpload' => [],
+            default => [],
+        };
+    }
+
+    /**
+     * @return array{UploadId: string}
+     */
+    private function parseCreateMultipartUpload(SimpleXMLElement $xml): array
+    {
+        return [
+            'UploadId' => (string) $xml->UploadId,
+        ];
+    }
+
+    /**
+     * @return array{Parts: array<int, array{ETag: string, PartNumber: int}>}
+     */
+    private function parseListParts(SimpleXMLElement $xml): array
+    {
+        $parts = [];
+
+        foreach ($xml->Part as $part) {
+            $parts[] = [
+                'ETag' => (string) $part->ETag,
+                'PartNumber' => (int) $part->PartNumber,
+            ];
+        }
+
+        return ['Parts' => $parts];
+    }
 }

app/Filament/Admin/Pages/Dashboard.php

@@ -25,7 +25,7 @@ class Dashboard extends BaseDashboard
 
     public function getHeading(): string
     {
-        return trans('admin/dashboard.heading', ['app' => config('app.name')]);
+        return trans('admin/dashboard.heading');
     }
 
     public function getSubheading(): string

app/Filament/Admin/Pages/ListLogs.php

@@ -14,14 +14,13 @@ use Boquizo\FilamentLogViewer\Utils\Level;
 use Filament\Actions\Action;
 use Filament\Notifications\Notification;
 use Filament\Tables\Table;
-use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Facades\Http;
 
 class ListLogs extends BaseListLogs
 {
     protected string $view = 'filament.components.list-logs';
 
-    public function getHeading(): string|null|Htmlable
+    public function getHeading(): string|null|\Illuminate\Contracts\Support\Htmlable
     {
         return trans('admin/log.navigation.panel_logs');
     }

app/Filament/Admin/Pages/Settings.php

@@ -13,8 +13,6 @@ use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use App\Traits\Filament\CanCustomizeTabs;
 use BackedEnum;
-use BladeUI\Icons\Exceptions\SvgNotFound;
-use BladeUI\Icons\Factory as IconFactory;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -31,13 +29,11 @@ use Filament\Pages\Concerns\InteractsWithHeaderActions;
 use Filament\Pages\Page;
 use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Component;
-use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Components\Group;
 use Filament\Schemas\Components\Section;
 use Filament\Schemas\Components\StateCasts\BooleanStateCast;
 use Filament\Schemas\Components\Tabs;
 use Filament\Schemas\Components\Tabs\Tab;
-use Filament\Schemas\Components\Text;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Contracts\HasSchemas;
@@ -72,8 +68,6 @@ class Settings extends Page implements HasSchemas
 
     protected CaptchaService $captchaService;
 
-    protected IconFactory $iconFactory;
-
     /** @var array<mixed>|null */
     public ?array $data = [];
 
@@ -82,12 +76,11 @@ class Settings extends Page implements HasSchemas
         $this->form->fill();
     }
 
-    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService, IconFactory $iconFactory): void
+    public function boot(OAuthService $oauthService, AvatarService $avatarService, CaptchaService $captchaService): void
     {
         $this->oauthService = $oauthService;
         $this->avatarService = $avatarService;
         $this->captchaService = $captchaService;
-        $this->iconFactory = $iconFactory;
     }
 
     public static function canAccess(): bool
@@ -572,18 +565,9 @@ class Settings extends Page implements HasSchemas
         foreach ($oauthSchemas as $schema) {
             $key = $schema->getConfigKey();
 
-            $icon = $schema->getIcon();
-            if (is_string($icon)) {
-                try {
-                    $this->iconFactory->svg($icon);
-                } catch (SvgNotFound) {
-                    $icon = null;
-                }
-            }
-
             $formFields[] = Section::make($schema->getName())
                 ->columns(5)
-                ->icon($icon ?? TablerIcon::BrandOauth)
+                ->icon($schema->getIcon() ?? TablerIcon::BrandOauth)
                 ->collapsed(fn () => !$schema->isEnabled())
                 ->collapsible()
                 ->schema([
@@ -685,36 +669,6 @@ class Settings extends Page implements HasSchemas
                 ->collapsible()
                 ->collapsed()
                 ->schema([
-                    Toggle::make('PANEL_SEND_ACCOUNT_CREATED_NOTIFICATION')
-                        ->label(trans('admin/setting.misc.mail_notifications.account_created'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_ACCOUNT_CREATED_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_ACCOUNT_CREATED_NOTIFICATION', config('panel.email.send_account_created_notification'))),
-                    Toggle::make('PANEL_SEND_ADDED_TO_SERVER_NOTIFICATION')
-                        ->label(trans('admin/setting.misc.mail_notifications.added_to_server'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_ADDED_TO_SERVER_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_ADDED_TO_SERVER_NOTIFICATION', config('panel.email.send_added_to_server_notification'))),
-                    Toggle::make('PANEL_SEND_REMOVED_FROM_SERVER_NOTIFICATION')
-                        ->label(trans('admin/setting.misc.mail_notifications.removed_from_server'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_REMOVED_FROM_SERVER_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_REMOVED_FROM_SERVER_NOTIFICATION', config('panel.email.send_removed_from_server_notification'))),
                     Toggle::make('PANEL_SEND_INSTALL_NOTIFICATION')
                         ->label(trans('admin/setting.misc.mail_notifications.server_installed'))
                         ->onIcon(TablerIcon::Check)
@@ -735,16 +689,6 @@ class Settings extends Page implements HasSchemas
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_REINSTALL_NOTIFICATION', (bool) $state))
                         ->default(env('PANEL_SEND_REINSTALL_NOTIFICATION', config('panel.email.send_reinstall_notification'))),
-                    Toggle::make('PANEL_SEND_BACKUP_COMPLETED_NOTIFICATION')
-                        ->label(trans('admin/setting.misc.mail_notifications.backup_completed'))
-                        ->onIcon(TablerIcon::Check)
-                        ->offIcon(TablerIcon::X)
-                        ->onColor('success')
-                        ->offColor('danger')
-                        ->live()
-                        ->formatStateUsing(fn ($state): bool => (bool) $state)
-                        ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_SEND_BACKUP_COMPLETED_NOTIFICATION', (bool) $state))
-                        ->default(env('PANEL_SEND_BACKUP_COMPLETED_NOTIFICATION', config('panel.email.send_backup_completed_notification'))),
                 ]),
             Section::make(trans('admin/setting.misc.connections.title'))
                 ->description(trans('admin/setting.misc.connections.helper'))
@@ -796,172 +740,24 @@ class Settings extends Page implements HasSchemas
                 ]),
             Section::make(trans('admin/setting.misc.api.title'))
                 ->description(trans('admin/setting.misc.api.helper'))
-                ->columns(1)
+                ->columns()
                 ->collapsible()
                 ->collapsed()
                 ->schema([
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.client_title'))
-                        ->schema([
-                            TextInput::make('APP_API_CLIENT_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
-
-                            TextInput::make('APP_API_CLIENT_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_CLIENT_RATELIMIT_PERIOD', config('http.rate_limit.client_period'))),
-                            Text::make(trans('admin/setting.misc.api.client_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.application_title'))
-                        ->schema([
-                            TextInput::make('APP_API_APPLICATION_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
-
-                            TextInput::make('APP_API_APPLICATION_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_APPLICATION_RATELIMIT_PERIOD', config('http.rate_limit.application_period'))),
-                            Text::make(trans('admin/setting.misc.api.application_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.password_reset_title'))
-                        ->schema([
-                            TextInput::make('APP_API_PASSWORD_RESET_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_PASSWORD_RESET_RATELIMIT', config('http.rate_limit.password_reset'))),
-
-                            TextInput::make('APP_API_PASSWORD_RESET_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_PASSWORD_RESET_RATELIMIT_PERIOD', config('http.rate_limit.password_reset_period'))),
-                            Text::make(trans('admin/setting.misc.api.password_reset_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.websocket_title'))
-                        ->schema([
-                            TextInput::make('APP_API_WEBSOCKET_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_WEBSOCKET_RATELIMIT', config('http.rate_limit.websocket'))),
-
-                            TextInput::make('APP_API_WEBSOCKET_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_WEBSOCKET_RATELIMIT_PERIOD', config('http.rate_limit.websocket_period'))),
-                            Text::make(trans('admin/setting.misc.api.websocket_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.backup_restore_title'))
-                        ->schema([
-                            TextInput::make('APP_API_BACKUP_RESTORE_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_BACKUP_RESTORE_RATELIMIT', config('http.rate_limit.backup_restore'))),
-
-                            TextInput::make('APP_API_BACKUP_RESTORE_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_BACKUP_RESTORE_RATELIMIT_PERIOD', config('http.rate_limit.backup_restore_period'))),
-                            Text::make(trans('admin/setting.misc.api.backup_restore_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.database_create_title'))
-                        ->schema([
-                            TextInput::make('APP_API_DATABASE_CREATE_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_DATABASE_CREATE_RATELIMIT', config('http.rate_limit.database_create'))),
-
-                            TextInput::make('APP_API_DATABASE_CREATE_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_DATABASE_CREATE_RATELIMIT_PERIOD', config('http.rate_limit.database_create_period'))),
-                            Text::make(trans('admin/setting.misc.api.database_create_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.subuser_create_title'))
-                        ->schema([
-                            TextInput::make('APP_API_SUBUSER_CREATE_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_SUBUSER_CREATE_RATELIMIT', config('http.rate_limit.subuser_create'))),
-
-                            TextInput::make('APP_API_SUBUSER_CREATE_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_SUBUSER_CREATE_RATELIMIT_PERIOD', config('http.rate_limit.subuser_create_period'))),
-                            Text::make(trans('admin/setting.misc.api.subuser_create_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.file_pull_title'))
-                        ->schema([
-                            TextInput::make('APP_API_FILE_PULL_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_FILE_PULL_RATELIMIT', config('http.rate_limit.file_pull'))),
-
-                            TextInput::make('APP_API_FILE_PULL_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_FILE_PULL_RATELIMIT_PERIOD', config('http.rate_limit.file_pull_period'))),
-                            Text::make(trans('admin/setting.misc.api.file_pull_helper')),
-                        ]),
-                    Fieldset::make()
-                        ->label(trans('admin/setting.misc.api.default_title'))
-                        ->schema([
-                            TextInput::make('APP_API_DEFAULT_RATELIMIT')
-                                ->label(trans('admin/setting.misc.api.requests_per_period'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.requests'))->default(env('APP_API_DEFAULT_RATELIMIT', config('http.rate_limit.default'))),
-
-                            TextInput::make('APP_API_DEFAULT_RATELIMIT_PERIOD')
-                                ->label(trans('admin/setting.misc.api.period_length'))
-                                ->required()
-                                ->numeric()
-                                ->minValue(1)
-                                ->suffix(trans('admin/setting.misc.api.minutes'))->default(env('APP_API_DEFAULT_RATELIMIT_PERIOD', config('http.rate_limit.default_period'))),
-                            Text::make(trans('admin/setting.misc.api.default_helper')),
-                        ]),
+                    TextInput::make('APP_API_CLIENT_RATELIMIT')
+                        ->label(trans('admin/setting.misc.api.client_rate'))
+                        ->required()
+                        ->numeric()
+                        ->minValue(1)
+                        ->suffix(trans('admin/setting.misc.api.rpm'))
+                        ->default(env('APP_API_CLIENT_RATELIMIT', config('http.rate_limit.client'))),
+                    TextInput::make('APP_API_APPLICATION_RATELIMIT')
+                        ->label(trans('admin/setting.misc.api.app_rate'))
+                        ->required()
+                        ->numeric()
+                        ->minValue(1)
+                        ->suffix(trans('admin/setting.misc.api.rpm'))
+                        ->default(env('APP_API_APPLICATION_RATELIMIT', config('http.rate_limit.application'))),
                 ]),
             Section::make(trans('admin/setting.misc.server.title'))
                 ->description(trans('admin/setting.misc.server.helper'))
@@ -980,14 +776,13 @@ class Settings extends Page implements HasSchemas
                         ->formatStateUsing(fn ($state): bool => (bool) $state)
                         ->afterStateUpdated(fn ($state, Set $set) => $set('PANEL_EDITABLE_SERVER_DESCRIPTIONS', (bool) $state))
                         ->default(env('PANEL_EDITABLE_SERVER_DESCRIPTIONS', config('panel.editable_server_descriptions'))),
-                    FileUpload::make('console_font')
+                    FileUpload::make('ConsoleFonts')
                         ->hint(trans('admin/setting.misc.server.console_font_hint'))
                         ->label(trans('admin/setting.misc.server.console_font_upload'))
                         ->directory('fonts')
                         ->disk('public')
                         ->columnSpan(1)
                         ->maxFiles(1)
-                        ->acceptedFileTypes(['font/*'])
                         ->preserveFilenames(),
                 ]),
             Section::make(trans('admin/setting.misc.webhook.title'))
@@ -1015,11 +810,9 @@ class Settings extends Page implements HasSchemas
 
     public function save(): void
     {
-        abort_unless(user()?->can('update settings'), 403);
-
         try {
             $data = $this->form->getState();
-            unset($data['console_font']);
+            unset($data['ConsoleFonts']);
 
             $data = array_map(function ($value) {
                 // Convert bools to a string, so they are correctly written to the .env file
@@ -1066,5 +859,6 @@ class Settings extends Page implements HasSchemas
                 ->authorize(fn () => user()?->can('update settings'))
                 ->keyBindings(['mod+s']),
         ];
+
     }
 }

app/Filament/Admin/Resources/DatabaseHosts/DatabaseHostResource.php

@@ -101,7 +101,7 @@ class DatabaseHostResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::Database)

app/Filament/Admin/Resources/DatabaseHosts/Pages/CreateDatabaseHost.php

@@ -8,7 +8,6 @@ use App\Services\Databases\Hosts\HostCreationService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use Exception;
-use Filament\Actions\Action;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
@@ -46,17 +45,6 @@ class CreateDatabaseHost extends CreateRecord
         $this->service = $service;
     }
 
-    protected function getCreateFormAction(): Action
-    {
-        $hasFormWrapper = $this->hasFormWrapper();
-
-        return Action::make('exclude_create')
-            ->label(trans('filament-panels::resources/pages/create-record.form.actions.create.label'))
-            ->submit($hasFormWrapper ? $this->getSubmitFormLivewireMethodName() : null)
-            ->action($hasFormWrapper ? null : $this->getSubmitFormLivewireMethodName())
-            ->keyBindings(['mod+s']);
-    }
-
     /** @return Step[]
      * @throws Exception
      */

app/Filament/Admin/Resources/Eggs/Pages/CreateEgg.php

@@ -103,7 +103,6 @@ class CreateEgg extends CreateRecord
                         ->live()
                         ->columnSpanFull()
                         ->required()
-                        ->reorderable()
                         ->addActionLabel(trans('admin/egg.add_startup'))
                         ->keyLabel(trans('admin/egg.startup_name'))
                         ->keyPlaceholder('Default')
@@ -136,7 +135,6 @@ class CreateEgg extends CreateRecord
                         ->live()
                         ->columnSpanFull()
                         ->required()
-                        ->reorderable()
                         ->addActionLabel(trans('admin/egg.add_image'))
                         ->keyLabel(trans('admin/egg.docker_name'))
                         ->keyPlaceholder('Java 21')
@@ -177,7 +175,7 @@ class CreateEgg extends CreateRecord
                         ->addActionLabel(trans('admin/egg.add_new_variable'))
                         ->grid()
                         ->relationship('variables')
-                        ->orderColumn()
+                        ->reorderable()->orderColumn()
                         ->collapsible()->collapsed()
                         ->columnSpan(2)
                         ->defaultItems(0)

app/Filament/Admin/Resources/Eggs/Pages/EditEgg.php

@@ -5,10 +5,8 @@ namespace App\Filament\Admin\Resources\Eggs\Pages;
 use App\Enums\EditorLanguages;
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Eggs\EggResource;
-use App\Filament\Components\Actions\DeleteIcon;
 use App\Filament\Components\Actions\ExportEggAction;
 use App\Filament\Components\Actions\ImportEggAction;
-use App\Filament\Components\Actions\UploadIcon;
 use App\Filament\Components\Forms\Fields\CopyFrom;
 use App\Filament\Components\Forms\Fields\MonacoEditor;
 use App\Models\Egg;
@@ -16,10 +14,12 @@ use App\Models\EggVariable;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
 use App\Traits\Filament\CanCustomizeTabs;
+use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\DeleteAction;
 use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
@@ -28,8 +28,11 @@ use Filament\Forms\Components\TagsInput;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Schemas\Components\Fieldset;
+use Filament\Schemas\Components\Flex;
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\Tabs;
@@ -37,7 +40,10 @@ use Filament\Schemas\Components\Tabs\Tab;
 use Filament\Schemas\Components\Utilities\Get;
 use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
+use Filament\Support\Enums\IconSize;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\Rules\Unique;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class EditEgg extends EditRecord
 {
@@ -68,17 +74,163 @@ class EditEgg extends EditRecord
                 ->icon(TablerIcon::Egg)
                 ->schema([
                     Grid::make(2)
-                        ->columnStart(1)
+                        ->columnSpan(1)
                         ->schema([
-                            Image::make('', 'icon')
-                                ->hidden(fn ($record) => !$record->icon)
-                                ->url(fn ($record) => $record->icon)
+                            Image::make('', '')
+                                ->hidden(fn ($record) => !$record->image)
+                                ->url(fn ($record) => $record->image)
+                                ->alt('')
+                                ->alignJustify()
                                 ->imageSize(150)
-                                ->columnSpanFull()
-                                ->alignJustify(),
-                            UploadIcon::make(),
-                            DeleteIcon::make()
-                                ->iconStoragePath(Egg::getIconStoragePath()),
+                                ->columnSpanFull(),
+                            Flex::make([
+                                Action::make('uploadImage')
+                                    ->hiddenLabel()
+                                    ->tooltip(trans('admin/egg.import.import_image'))
+                                    ->iconSize(IconSize::Large)
+                                    ->icon(TablerIcon::PhotoUp)
+                                    ->modal()
+                                    ->modalHeading('')
+                                    ->modalSubmitActionLabel(trans('admin/egg.import.import_image'))
+                                    ->schema([
+                                        Tabs::make()
+                                            ->contained(false)
+                                            ->tabs([
+                                                Tab::make(trans('admin/egg.import.url'))
+                                                    ->schema([
+                                                        Hidden::make('imageUrl'),
+                                                        Hidden::make('imageExtension'),
+                                                        TextInput::make('image_url')
+                                                            ->label(trans('admin/egg.import.image_url'))
+                                                            ->reactive()
+                                                            ->autocomplete(false)
+                                                            ->debounce(500)
+                                                            ->afterStateUpdated(function ($state, Set $set) {
+                                                                if (!$state) {
+                                                                    $set('image_url_error', null);
+                                                                    $set('imageUrl', null);
+                                                                    $set('imageExtension', null);
+
+                                                                    return;
+                                                                }
+
+                                                                try {
+                                                                    if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                        throw new Exception(trans('admin/egg.import.invalid_url'));
+                                                                    }
+
+                                                                    $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                    if (!array_key_exists($extension, Egg::IMAGE_FORMATS)) {
+                                                                        throw new Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Egg::IMAGE_FORMATS))]));
+                                                                    }
+
+                                                                    $host = parse_url($state, PHP_URL_HOST);
+                                                                    $ip = gethostbyname($host);
+
+                                                                    if (
+                                                                        filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                    ) {
+                                                                        throw new Exception(trans('admin/egg.import.no_local_ip'));
+                                                                    }
+
+                                                                    $set('imageUrl', $state);
+                                                                    $set('imageExtension', $extension);
+                                                                    $set('image_url_error', null);
+
+                                                                } catch (Exception $e) {
+                                                                    $set('image_url_error', $e->getMessage());
+                                                                    $set('imageUrl', null);
+                                                                    $set('imageExtension', null);
+                                                                }
+                                                            }),
+                                                        TextEntry::make('image_url_error')
+                                                            ->hiddenLabel()
+                                                            ->visible(fn ($get) => $get('image_url_error') !== null)
+                                                            ->afterStateHydrated(fn ($set, $get) => $get('image_url_error')),
+                                                        Image::make(fn (Get $get) => $get('image_url'), '')
+                                                            ->imageSize(150)
+                                                            ->visible(fn ($get) => $get('image_url') && !$get('image_url_error'))
+                                                            ->alignCenter(),
+                                                    ]),
+                                                Tab::make(trans('admin/egg.import.file'))
+                                                    ->schema([
+                                                        FileUpload::make('image')
+                                                            ->hiddenLabel()
+                                                            ->previewable()
+                                                            ->openable(false)
+                                                            ->downloadable(false)
+                                                            ->maxSize(256)
+                                                            ->maxFiles(1)
+                                                            ->columnSpanFull()
+                                                            ->alignCenter()
+                                                            ->imageEditor()
+                                                            ->image()
+                                                            ->disk('public')
+                                                            ->directory(Egg::ICON_STORAGE_PATH)
+                                                            ->acceptedFileTypes([
+                                                                'image/png',
+                                                                'image/jpeg',
+                                                                'image/webp',
+                                                                'image/svg+xml',
+                                                            ])
+                                                            ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                                return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                            }),
+                                                    ]),
+                                            ]),
+                                    ])
+                                    ->action(function (array $data, $record): void {
+                                        if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                            $this->saveImageFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.image_updated'))
+                                                ->success()
+                                                ->send();
+
+                                            return;
+                                        }
+
+                                        if (!empty($data['image'])) {
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.image_updated'))
+                                                ->success()
+                                                ->send();
+
+                                            return;
+                                        }
+
+                                        if (empty($data['imageUrl']) && empty($data['image'])) {
+                                            Notification::make()
+                                                ->title(trans('admin/egg.import.no_image'))
+                                                ->warning()
+                                                ->send();
+                                        }
+                                    }),
+                                Action::make('delete_image')
+                                    ->visible(fn ($record) => $record->image)
+                                    ->hiddenLabel()
+                                    ->tooltip(trans('admin/egg.import.delete_image'))
+                                    ->icon(TablerIcon::Trash)
+                                    ->iconSize(IconSize::Large)
+                                    ->color('danger')
+                                    ->action(function ($record) {
+                                        foreach (array_keys(Egg::IMAGE_FORMATS) as $ext) {
+                                            $path = Egg::ICON_STORAGE_PATH . "/$record->uuid.$ext";
+                                            if (Storage::disk('public')->exists($path)) {
+                                                Storage::disk('public')->delete($path);
+                                            }
+                                        }
+
+                                        Notification::make()
+                                            ->title(trans('admin/egg.import.image_deleted'))
+                                            ->success()
+                                            ->send();
+
+                                        $record->refresh();
+                                    }),
+                            ]),
                         ]),
                     TextInput::make('name')
                         ->label(trans('admin/egg.name'))
@@ -118,7 +270,6 @@ class EditEgg extends EditRecord
                         ->live()
                         ->columnSpanFull()
                         ->required()
-                        ->reorderable()
                         ->addActionLabel(trans('admin/egg.add_startup'))
                         ->keyLabel(trans('admin/egg.startup_name'))
                         ->valueLabel(trans('admin/egg.startup_command'))
@@ -146,7 +297,6 @@ class EditEgg extends EditRecord
                         ->live()
                         ->columnSpanFull()
                         ->required()
-                        ->reorderable()
                         ->addActionLabel(trans('admin/egg.add_image'))
                         ->keyLabel(trans('admin/egg.docker_name'))
                         ->valueLabel(trans('admin/egg.docker_uri'))
@@ -168,7 +318,6 @@ class EditEgg extends EditRecord
                         ->helperText(trans('admin/egg.start_config_help')),
                     Textarea::make('config_files')->rows(10)->json()
                         ->label(trans('admin/egg.config_files'))
-                        ->dehydrateStateUsing(fn ($state) => blank($state) ? '{}' : $state)
                         ->helperText(trans('admin/egg.config_files_help')),
                     Textarea::make('config_logs')->rows(10)->json()
                         ->label(trans('admin/egg.log_config'))
@@ -183,8 +332,9 @@ class EditEgg extends EditRecord
                         ->hiddenLabel()
                         ->grid()
                         ->relationship('variables')
-                        ->orderColumn()
+                        ->reorderable()
                         ->collapsible()->collapsed()
+                        ->orderColumn()
                         ->addActionLabel(trans('admin/egg.add_new_variable'))
                         ->itemLabel(fn (array $state) => $state['name'])
                         ->mutateRelationshipDataBeforeCreateUsing(function (array $data): array {
@@ -318,6 +468,37 @@ class EditEgg extends EditRecord
         $this->fillForm();
     }
 
+    /**
+     * Save an image from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveImageFromUrl(string $imageUrl, string $extension, Egg $egg): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 1048576); // 1024KB
+
+        if (empty($data)) {
+            throw new Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Egg::ICON_STORAGE_PATH . "/$egg->uuid.$normalizedExtension", $data);
+    }
+
     protected function getFormActions(): array
     {
         return [];

app/Filament/Admin/Resources/Eggs/Pages/ListEggs.php

@@ -38,10 +38,6 @@ class ListEggs extends ListRecords
      */
     public function table(Table $table): Table
     {
-        $defaultEggIcon = config('app.logo');
-        $defaultEggIcon = empty($defaultEggIcon) || !is_file(public_path($defaultEggIcon)) ? 'pelican.svg' : $defaultEggIcon;
-        $defaultEggIcon = 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path($defaultEggIcon)));
-
         return $table
             ->searchable(true)
             ->defaultPaginationPageOption(25)
@@ -49,11 +45,13 @@ class ListEggs extends ListRecords
                 TextColumn::make('id')
                     ->label('Id')
                     ->hidden(),
-                ImageColumn::make('icon')
+                ImageColumn::make('image')
                     ->label('')
                     ->alignCenter()
                     ->circular()
-                    ->getStateUsing(fn (Egg $record) => $record->icon ?: $defaultEggIcon),
+                    ->getStateUsing(fn ($record) => $record->image
+                        ? $record->image
+                        : 'data:image/svg+xml;base64,' . base64_encode(file_get_contents(public_path('pelican.svg')))),
                 TextColumn::make('name')
                     ->label(trans('admin/egg.name'))
                     ->description(fn ($record): ?string => (strlen($record->description) > 120) ? substr($record->description, 0, 120).'...' : $record->description)
@@ -88,7 +86,7 @@ class ListEggs extends ListRecords
                     ->multiple(),
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete')
+                    DeleteBulkAction::make()
                         ->before(function (Collection &$records) {
                             $eggsWithServers = $records->filter(fn (Egg $egg) => $egg->servers_count > 0);
 
@@ -108,7 +106,7 @@ class ListEggs extends ListRecords
                                 $this->halt();
                             }
                         }),
-                    UpdateEggBulkAction::make('exclude_bulk_update')
+                    UpdateEggBulkAction::make()
                         ->before(function (Collection &$records) {
                             $eggsWithoutUpdateUrl = $records->filter(fn (Egg $egg) => $egg->update_url === null);
 

app/Filament/Admin/Resources/Mounts/MountResource.php

@@ -95,12 +95,6 @@ class MountResource extends Resource
                     ->icon(fn ($state) => $state ? TablerIcon::WritingOff : TablerIcon::Writing)
                     ->color(fn ($state) => $state ? 'success' : 'warning')
                     ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.read_only') : trans('admin/mount.toggles.writable')),
-                TextColumn::make('user_mountable')
-                    ->label(trans('admin/mount.table.user_mountable'))
-                    ->badge()
-                    ->icon(fn ($state) => $state ? TablerIcon::User : TablerIcon::UserOff)
-                    ->color(fn ($state) => $state ? 'success' : 'warning')
-                    ->formatStateUsing(fn ($state) => $state ? trans('admin/mount.toggles.user_mountable') : trans('admin/mount.toggles.not_user_mountable')),
             ])
             ->recordActions([
                 ViewAction::make()
@@ -110,7 +104,7 @@ class MountResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::LayersLinked)
@@ -130,8 +124,7 @@ class MountResource extends Resource
                         ->label(trans('admin/mount.name'))
                         ->required()
                         ->helperText(trans('admin/mount.name_help'))
-                        ->maxLength(64)
-                        ->columnSpanFull(),
+                        ->maxLength(64),
                     ToggleButtons::make('read_only')
                         ->label(trans('admin/mount.read_only'))
                         ->helperText(trans('admin/mount.read_only_help'))
@@ -150,24 +143,6 @@ class MountResource extends Resource
                         ])
                         ->inline()
                         ->default(false),
-                    ToggleButtons::make('user_mountable')
-                        ->label(trans('admin/mount.user_mountable'))
-                        ->helperText(trans('admin/mount.user_mountable_help'))
-                        ->stateCast(new BooleanStateCast(false, true))
-                        ->options([
-                            false => trans('admin/mount.toggles.not_user_mountable'),
-                            true => trans('admin/mount.toggles.user_mountable'),
-                        ])
-                        ->icons([
-                            false => TablerIcon::UserOff,
-                            true => TablerIcon::User,
-                        ])
-                        ->colors([
-                            false => 'warning',
-                            true => 'success',
-                        ])
-                        ->inline()
-                        ->default(true),
                     TextInput::make('source')
                         ->label(trans('admin/mount.source'))
                         ->required()

app/Filament/Admin/Resources/Mounts/Pages/CreateMount.php

@@ -42,6 +42,7 @@ class CreateMount extends CreateRecord
     protected function handleRecordCreation(array $data): Model
     {
         $data['uuid'] ??= Str::uuid()->toString();
+        $data['user_mountable'] = 1;
 
         return parent::handleRecordCreation($data);
     }

app/Filament/Admin/Resources/Nodes/Pages/CreateNode.php

@@ -64,8 +64,9 @@ class CreateNode extends CreateRecord
                 ->icon(TablerIcon::Server)
                 ->columnSpanFull()
                 ->columns([
-                    'default' => 1,
-                    'md' => 2,
+                    'default' => 2,
+                    'sm' => 3,
+                    'md' => 3,
                     'lg' => 4,
                 ])
                 ->schema([
@@ -75,83 +76,81 @@ class CreateNode extends CreateRecord
                         ->autofocus()
                         ->live(debounce: 1500)
                         ->rules(Node::getRulesForField('fqdn'))
+                        ->prohibited(fn ($state) => is_ip($state) && request()->isSecure())
                         ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
                         ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
-                        ->helperText(fn () => request()->isSecure() ? trans('admin/node.fqdn_ssl') : null)
-                        ->validationMessages([
-                            'prohibited' => trans('admin/node.dns_error'),
-                        ])
-                        ->prohibited(function ($state, Get $get) {
-                            if (!$state) {
-                                return true;
-                            }
-
-                            if (is_ip($state)) {
-                                return false;
-                            }
-
-                            $ip = $get('ip');
-
-                            return !is_ip($ip);
-                        })
-                        ->hintColor(function ($state, Get $get) {
-                            if (!$state) {
-                                return null;
-                            }
-
+                        ->helperText(function ($state) {
                             if (is_ip($state)) {
                                 if (request()->isSecure()) {
-                                    return 'warning';
+                                    return trans('admin/node.fqdn_help');
                                 }
-                            } else {
-                                $ip = $get('ip');
 
-                                return is_ip($ip) ? 'success' : 'danger';
+                                return '';
                             }
 
-                            return null;
+                            return trans('admin/node.error');
                         })
-                        ->hint(function ($state, Get $get) {
-                            if (!$state) {
-                                return null;
+                        ->hintColor('danger')
+                        ->hint(function ($state) {
+                            if (is_ip($state) && request()->isSecure()) {
+                                return trans('admin/node.ssl_ip');
                             }
 
-                            if (is_ip($state)) {
-                                if (request()->isSecure()) {
-                                    return trans('admin/node.ssl_ip');
-                                }
-                            } else {
-                                $ip = $get('ip');
-
-                                return is_ip($ip) ? trans('admin/node.valid') . ': ' . $ip : trans('admin/node.invalid');
-                            }
-
-                            return null;
+                            return '';
                         })
                         ->afterStateUpdated(function (Set $set, ?string $state) {
+                            $set('dns', null);
                             $set('ip', null);
 
-                            if (!$state) {
-                                return;
-                            }
-
                             [$subdomain] = str($state)->explode('.', 2);
                             if (!is_numeric($subdomain)) {
                                 $set('name', $subdomain);
                             }
 
-                            if (!is_ip($state)) {
-                                $ip = get_ip_from_hostname($state);
-                                if (is_ip($ip)) {
-                                    $set('ip', $ip);
-                                } else {
-                                    $set('ip', null);
-                                }
+                            if (!$state || is_ip($state)) {
+                                $set('dns', null);
+
+                                return;
+                            }
+
+                            $ip = get_ip_from_hostname($state);
+                            if ($ip) {
+                                $set('dns', true);
+
+                                $set('ip', $ip);
+                            } else {
+                                $set('dns', false);
                             }
                         })
                         ->maxLength(255),
-                    Hidden::make('ip')
-                        ->saved(false),
+
+                    TextInput::make('ip')
+                        ->disabled()
+                        ->hidden(),
+
+                    ToggleButtons::make('dns')
+                        ->label(trans('admin/node.dns'))
+                        ->helperText(trans('admin/node.dns_help'))
+                        ->disabled()
+                        ->inline()
+                        ->default(null)
+                        ->hint(fn (Get $get) => $get('ip'))
+                        ->hintColor('success')
+                        ->options([
+                            true => trans('admin/node.valid'),
+                            false => trans('admin/node.invalid'),
+                        ])
+                        ->colors([
+                            true => 'success',
+                            false => 'danger',
+                        ])
+                        ->columnSpan([
+                            'default' => 1,
+                            'sm' => 1,
+                            'md' => 1,
+                            'lg' => 1,
+                        ]),
+
                     TextInput::make('daemon_connect')
                         ->columnSpan(1)
                         ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
@@ -161,16 +160,7 @@ class CreateNode extends CreateRecord
                         ->default(8080)
                         ->required()
                         ->integer(),
-                    TextInput::make('daemon_listen')
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.listen_port'))
-                        ->helperText(trans('admin/node.listen_port_help'))
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(8080)
-                        ->required()
-                        ->integer()
-                        ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
+
                     TextInput::make('name')
                         ->label(trans('admin/node.display_name'))
                         ->columnSpan([
@@ -181,16 +171,27 @@ class CreateNode extends CreateRecord
                         ])
                         ->required()
                         ->maxLength(100),
+
+                    Hidden::make('scheme')
+                        ->default(fn () => request()->isSecure() ? 'https' : 'http'),
+
+                    Hidden::make('behind_proxy')
+                        ->default(false),
+
                     ToggleButtons::make('connection')
                         ->label(trans('admin/node.ssl'))
-                        ->columnSpan(2)
+                        ->columnSpan(1)
                         ->inline()
-                        ->helperText(function () {
+                        ->helperText(function (Get $get) {
                             if (request()->isSecure()) {
-                                return trans('admin/node.panel_on_ssl');
+                                return new HtmlString(trans('admin/node.panel_on_ssl'));
                             }
 
-                            return null;
+                            if (is_ip($get('fqdn'))) {
+                                return trans('admin/node.ssl_help');
+                            }
+
+                            return '';
                         })
                         ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
                         ->options([
@@ -218,10 +219,17 @@ class CreateNode extends CreateRecord
                             $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
                             $set('daemon_listen', 8080);
                         }),
-                    Hidden::make('scheme')
-                        ->default(fn () => request()->isSecure() ? 'https' : 'http'),
-                    Hidden::make('behind_proxy')
-                        ->default(false),
+
+                    TextInput::make('daemon_listen')
+                        ->columnSpan(1)
+                        ->label(trans('admin/node.listen_port'))
+                        ->helperText(trans('admin/node.listen_port_help'))
+                        ->minValue(1)
+                        ->maxValue(65535)
+                        ->default(8080)
+                        ->required()
+                        ->integer()
+                        ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
                 ]),
             Step::make('advanced')
                 ->label(trans('admin/node.tabs.advanced_settings'))

app/Filament/Admin/Resources/Nodes/Pages/EditNode.php

@@ -137,83 +137,74 @@ class EditNode extends EditRecord
                         ->autofocus()
                         ->live(debounce: 1500)
                         ->rules(Node::getRulesForField('fqdn'))
+                        ->prohibited(fn ($state) => is_ip($state) && request()->isSecure())
                         ->label(fn ($state) => is_ip($state) ? trans('admin/node.ip_address') : trans('admin/node.domain'))
                         ->placeholder(fn ($state) => is_ip($state) ? '192.168.1.1' : 'node.example.com')
-                        ->helperText(fn () => request()->isSecure() ? trans('admin/node.fqdn_ssl') : null)
-                        ->validationMessages([
-                            'prohibited' => trans('admin/node.dns_error'),
-                        ])
-                        ->prohibited(function ($state, Get $get) {
-                            if (!$state) {
-                                return true;
-                            }
-
-                            if (is_ip($state)) {
-                                return false;
-                            }
-
-                            $ip = $get('ip');
-
-                            return !is_ip($ip);
-                        })
-                        ->hintColor(function ($state, Get $get) {
-                            if (!$state) {
-                                return null;
-                            }
-
+                        ->helperText(function ($state) {
                             if (is_ip($state)) {
                                 if (request()->isSecure()) {
-                                    return 'warning';
+                                    return trans('admin/node.fqdn_help');
                                 }
-                            } else {
-                                $ip = $get('ip');
 
-                                return is_ip($ip) ? 'success' : 'danger';
+                                return '';
                             }
 
-                            return null;
+                            return trans('admin/node.error');
                         })
-                        ->hint(function ($state, Get $get) {
-                            if (!$state) {
-                                return null;
+                        ->hintColor('danger')
+                        ->hint(function ($state) {
+                            if (is_ip($state) && request()->isSecure()) {
+                                return trans('admin/node.ssl_ip');
                             }
 
-                            if (is_ip($state)) {
-                                if (request()->isSecure()) {
-                                    return trans('admin/node.ssl_ip');
-                                }
-                            } else {
-                                $ip = $get('ip');
-
-                                return is_ip($ip) ? trans('admin/node.valid') . ': ' . $ip : trans('admin/node.invalid');
-                            }
-
-                            return null;
+                            return '';
                         })
                         ->afterStateUpdated(function (Set $set, ?string $state) {
+                            $set('dns', null);
                             $set('ip', null);
 
-                            if (!$state) {
-                                return;
-                            }
-
                             [$subdomain] = str($state)->explode('.', 2);
                             if (!is_numeric($subdomain)) {
                                 $set('name', $subdomain);
                             }
 
-                            if (!is_ip($state)) {
-                                $ip = get_ip_from_hostname($state);
-                                if (is_ip($ip)) {
-                                    $set('ip', $ip);
-                                } else {
-                                    $set('ip', null);
-                                }
+                            if (!$state || is_ip($state)) {
+                                $set('dns', null);
+
+                                return;
+                            }
+
+                            $ip = get_ip_from_hostname($state);
+                            if ($ip) {
+                                $set('dns', true);
+
+                                $set('ip', $ip);
+                            } else {
+                                $set('dns', false);
                             }
                         })
                         ->maxLength(255),
-                    Hidden::make('ip')
-                        ->saved(false),
+                    TextInput::make('ip')
+                        ->disabled()
+                        ->hidden(),
+                    ToggleButtons::make('dns')
+                        ->label(trans('admin/node.dns'))
+                        ->helperText(trans('admin/node.dns_help'))
+                        ->disabled()
+                        ->inline()
+                        ->default(null)
+                        ->hint(fn (Get $get) => $get('ip'))
+                        ->hintColor('success')
+                        ->stateCast(new BooleanStateCast(false, true))
+                        ->options([
+                            1 => trans('admin/node.valid'),
+                            0 => trans('admin/node.invalid'),
+                        ])
+                        ->colors([
+                            1 => 'success',
+                            0 => 'danger',
+                        ])
+                        ->columnSpan(1),
                     TextInput::make('daemon_connect')
                         ->columnSpan(1)
                         ->label(fn (Get $get) => $get('connection') === 'https_proxy' ? trans('admin/node.connect_port') : trans('admin/node.port'))
@@ -223,16 +214,6 @@ class EditNode extends EditRecord
                         ->default(8080)
                         ->required()
                         ->integer(),
-                    TextInput::make('daemon_listen')
-                        ->columnSpan(1)
-                        ->label(trans('admin/node.listen_port'))
-                        ->helperText(trans('admin/node.listen_port_help'))
-                        ->minValue(1)
-                        ->maxValue(65535)
-                        ->default(8080)
-                        ->required()
-                        ->integer()
-                        ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
                     TextInput::make('name')
                         ->label(trans('admin/node.display_name'))
                         ->columnSpan([
@@ -243,16 +224,22 @@ class EditNode extends EditRecord
                         ])
                         ->required()
                         ->maxLength(100),
+                    Hidden::make('scheme'),
+                    Hidden::make('behind_proxy'),
                     ToggleButtons::make('connection')
                         ->label(trans('admin/node.ssl'))
-                        ->columnSpan(2)
+                        ->columnSpan(1)
                         ->inline()
-                        ->helperText(function () {
+                        ->helperText(function (Get $get) {
                             if (request()->isSecure()) {
-                                return trans('admin/node.panel_on_ssl');
+                                return new HtmlString(trans('admin/node.panel_on_ssl'));
                             }
 
-                            return null;
+                            if (is_ip($get('fqdn'))) {
+                                return trans('admin/node.ssl_help');
+                            }
+
+                            return '';
                         })
                         ->disableOptionWhen(fn (string $value) => $value === 'http' && request()->isSecure())
                         ->options([
@@ -280,10 +267,16 @@ class EditNode extends EditRecord
                             $set('daemon_connect', $state === 'https_proxy' ? 443 : 8080);
                             $set('daemon_listen', 8080);
                         }),
-                    Hidden::make('scheme')
-                        ->default(fn () => request()->isSecure() ? 'https' : 'http'),
-                    Hidden::make('behind_proxy')
-                        ->default(false),
+                    TextInput::make('daemon_listen')
+                        ->columnSpan(1)
+                        ->label(trans('admin/node.listen_port'))
+                        ->helperText(trans('admin/node.listen_port_help'))
+                        ->minValue(1)
+                        ->maxValue(65535)
+                        ->default(8080)
+                        ->required()
+                        ->integer()
+                        ->visible(fn (Get $get) => $get('connection') === 'https_proxy'),
                 ]),
             Tab::make('advanced_settings')
                 ->label(trans('admin/node.tabs.advanced_settings'))
@@ -742,7 +735,7 @@ class EditNode extends EditRecord
                                         $set('pulled', false);
                                         $set('uploaded', true);
 
-                                    } catch (Exception $e) {
+                                    } catch (\Exception $e) {
                                         Notification::make()
                                             ->title(trans('admin/node.diagnostics.upload_failed'))
                                             ->body($e->getMessage())

app/Filament/Admin/Resources/Nodes/Pages/ListNodes.php

@@ -4,7 +4,6 @@ namespace App\Filament\Admin\Resources\Nodes\Pages;
 
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Nodes\NodeResource;
-use App\Filament\Components\Tables\Columns\NodeClientHealthColumn;
 use App\Filament\Components\Tables\Columns\NodeHealthColumn;
 use App\Filament\Components\Tables\Filters\TagsFilter;
 use App\Models\Node;
@@ -35,7 +34,6 @@ class ListNodes extends ListRecords
                     ->searchable()
                     ->hidden(),
                 NodeHealthColumn::make('health'),
-                NodeClientHealthColumn::make('reachable'),
                 TextColumn::make('name')
                     ->label(trans('admin/node.table.name'))
                     ->sortable()

app/Filament/Admin/Resources/Nodes/RelationManagers/AllocationsRelationManager.php

@@ -91,10 +91,7 @@ class AllocationsRelationManager extends RelationManager
                     ->icon(TablerIcon::WorldPlus)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/node.ip_address'))
                             ->inlineLabel()
                             ->ip()
@@ -103,25 +100,12 @@ class AllocationsRelationManager extends RelationManager
                             ->live()
                             ->hintAction(
                                 Action::make('hint_refresh')
-                                    ->hiddenLabel()
                                     ->icon(TablerIcon::Refresh)
                                     ->tooltip(trans('admin/node.refresh'))
                                     ->action(function () {
                                         cache()->forget("nodes.{$this->getOwnerRecord()->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->required(),
                         TextInput::make('allocation_alias')
                             ->label(trans('admin/node.table.alias'))

app/Filament/Admin/Resources/Plugins/PluginResource.php

@@ -5,9 +5,6 @@ namespace App\Filament\Admin\Resources\Plugins;
 use App\Enums\PluginStatus;
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
-use App\Jobs\Plugin\InstallPlugin;
-use App\Jobs\Plugin\UninstallPlugin;
-use App\Jobs\Plugin\UpdatePlugin;
 use App\Models\Plugin;
 use App\Services\Helpers\PluginService;
 use BackedEnum;
@@ -122,14 +119,15 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Terminal)
                         ->color('success')
                         ->hidden(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled)
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                InstallPlugin::dispatch(user(), $plugin);
+                                $pluginService->installPlugin($plugin, !$plugin->isTheme() || !$pluginService->hasThemePluginEnabled());
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.install_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.installed'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -145,14 +143,15 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Download)
                         ->color('success')
                         ->visible(fn (Plugin $plugin) => $plugin->status !== PluginStatus::NotInstalled && $plugin->isUpdateAvailable())
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                UpdatePlugin::dispatch(user(), $plugin);
+                                $pluginService->updatePlugin($plugin);
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.update_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.updated'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -203,7 +202,7 @@ class PluginResource extends Resource
                         ->icon(TablerIcon::Trash)
                         ->color('danger')
                         ->requiresConfirmation()
-                        ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled || $plugin->status === PluginStatus::Errored)
+                        ->visible(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled)
                         ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             $pluginService->deletePlugin($plugin);
 
@@ -221,14 +220,15 @@ class PluginResource extends Resource
                         ->color('danger')
                         ->requiresConfirmation()
                         ->hidden(fn (Plugin $plugin) => $plugin->status === PluginStatus::NotInstalled || $plugin->status === PluginStatus::Errored)
-                        ->action(function (Plugin $plugin) {
+                        ->action(function (Plugin $plugin, $livewire, PluginService $pluginService) {
                             try {
-                                UninstallPlugin::dispatch(user(), $plugin);
+                                $pluginService->uninstallPlugin($plugin);
+
+                                redirect(ListPlugins::getUrl(['tab' => $livewire->activeTab]));
 
                                 Notification::make()
                                     ->success()
-                                    ->title(trans('admin/plugin.notifications.uninstall_started'))
-                                    ->body(trans('admin/plugin.notifications.background_info'))
+                                    ->title(trans('admin/plugin.notifications.uninstalled'))
                                     ->send();
                             } catch (Exception $exception) {
                                 Notification::make()
@@ -260,7 +260,7 @@ class PluginResource extends Resource
                             /** @var UploadedFile $file */
                             $file = $data['file'];
 
-                            $pluginName = str($file->getClientOriginalName())->basename()->before('.zip')->toString();
+                            $pluginName = str($file->getClientOriginalName())->before('.zip')->toString();
 
                             if (Plugin::where('id', $pluginName)->exists()) {
                                 throw new Exception(trans('admin/plugin.notifications.import_exists'));

app/Filament/Admin/Resources/Roles/RoleResource.php

@@ -106,7 +106,7 @@ class RoleResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->checkIfRecordIsSelectableUsing(fn (Role $role) => !$role->isRootAdmin() && $role->users_count <= 0);

app/Filament/Admin/Resources/Servers/Pages/CreateServer.php

@@ -251,10 +251,7 @@ class CreateServer extends CreateRecord
 
                             return [
                                 Select::make('allocation_ip')
-                                    ->options(fn (Get $get) => collect(Node::find($getPage('node_id'))?->ipAddresses())
-                                        ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                        ->unique()
-                                        ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                                    ->options(fn () => collect(Node::find($get('node_id'))?->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                                     ->label(trans('admin/server.ip_address'))->inlineLabel()
                                     ->helperText(trans('admin/server.ip_address_helper'))
                                     ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
@@ -269,18 +266,6 @@ class CreateServer extends CreateRecord
                                                 cache()->forget("nodes.{$get('node_id')}.ips");
                                             })
                                     )
-                                    ->suffixAction(
-                                        Action::make('custom_ip')
-                                            ->icon(TablerIcon::Keyboard)
-                                            ->tooltip(trans('admin/node.custom_ip'))
-                                            ->schema([
-                                                TextInput::make('custom_ip')
-                                                    ->label(trans('admin/node.ip_address'))
-                                                    ->ip()
-                                                    ->required(),
-                                            ])
-                                            ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                                    )
                                     ->required(),
                                 TextInput::make('allocation_alias')
                                     ->label(trans('admin/server.alias'))->inlineLabel()

app/Filament/Admin/Resources/Servers/Pages/EditServer.php

@@ -5,9 +5,8 @@ namespace App\Filament\Admin\Resources\Servers\Pages;
 use App\Enums\SuspendAction;
 use App\Enums\TablerIcon;
 use App\Filament\Admin\Resources\Servers\ServerResource;
-use App\Filament\Components\Actions\DeleteIcon;
+use App\Filament\Components\Actions\DeleteServerIcon;
 use App\Filament\Components\Actions\PreviewStartupAction;
-use App\Filament\Components\Actions\UploadIcon;
 use App\Filament\Components\Forms\Fields\MonacoEditor;
 use App\Filament\Components\Forms\Fields\StartupVariable;
 use App\Filament\Components\StateCasts\ServerConditionStateCast;
@@ -32,6 +31,7 @@ use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\KeyValue;
 use Filament\Forms\Components\Repeater;
@@ -41,6 +41,7 @@ use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\ToggleButtons;
+use Filament\Infolists\Components\TextEntry;
 use Filament\Notifications\Notification;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Schemas\Components\Actions;
@@ -59,7 +60,9 @@ use Filament\Support\Enums\Alignment;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\HtmlString;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 use LogicException;
 use Random\RandomException;
 
@@ -108,18 +111,140 @@ class EditServer extends EditRecord
                 ->icon(TablerIcon::InfoCircle)
                 ->schema([
                     Grid::make()
+                        ->columns(2)
                         ->columnStart(1)
                         ->schema([
                             Image::make('', 'icon')
-                                ->hidden(fn ($record) => !$record->icon && !$record->egg->icon)
-                                ->url(fn ($record) => $record->icon ?: $record->egg->icon)
+                                ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                ->url(fn ($record) => $record->icon ?: $record->egg->image)
                                 ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
-                                ->imageSize(150)
-                                ->columnSpanFull()
+                                ->columnSpan(2)
                                 ->alignJustify(),
-                            UploadIcon::make(),
-                            DeleteIcon::make()
-                                ->iconStoragePath(Server::getIconStoragePath()),
+                            Action::make('uploadIcon')
+                                ->icon(TablerIcon::PhotoUp)
+                                ->tooltip(trans('admin/server.import_image'))
+                                ->modal()
+                                ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
+                                ->schema([
+                                    Tabs::make()
+                                        ->contained(false)
+                                        ->tabs([
+                                            Tab::make(trans('admin/egg.import.url'))
+                                                ->schema([
+                                                    Hidden::make('imageUrl'),
+                                                    Hidden::make('imageExtension'),
+                                                    TextInput::make('image_url')
+                                                        ->label(trans('admin/egg.import.image_url'))
+                                                        ->reactive()
+                                                        ->autocomplete(false)
+                                                        ->debounce(500)
+                                                        ->afterStateUpdated(function ($state, Set $set) {
+                                                            if (!$state) {
+                                                                $set('image_url_error', null);
+                                                                $set('imageUrl', null);
+                                                                $set('imageExtension', null);
+
+                                                                return;
+                                                            }
+
+                                                            try {
+                                                                if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                    throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                }
+
+                                                                if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                    throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                }
+
+                                                                $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                if (!array_key_exists($extension, Server::IMAGE_FORMATS)) {
+                                                                    throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Server::IMAGE_FORMATS))]));
+                                                                }
+
+                                                                $host = parse_url($state, PHP_URL_HOST);
+                                                                $ip = gethostbyname($host);
+
+                                                                if (
+                                                                    filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                ) {
+                                                                    throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                }
+
+                                                                $set('imageUrl', $state);
+                                                                $set('imageExtension', $extension);
+                                                                $set('image_url_error', null);
+
+                                                            } catch (\Exception $e) {
+                                                                $set('image_url_error', $e->getMessage());
+                                                                $set('imageUrl', null);
+                                                                $set('imageExtension', null);
+                                                            }
+                                                        }),
+                                                    TextEntry::make('image_url_error')
+                                                        ->hiddenLabel()
+                                                        ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                        ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                    Image::make(fn (Get $get) => $get('image_url'), '')
+                                                        ->imageSize(150)
+                                                        ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                        ->alignCenter(),
+                                                ]),
+                                            Tab::make(trans('admin/egg.import.file'))
+                                                ->schema([
+                                                    FileUpload::make('image')
+                                                        ->hiddenLabel()
+                                                        ->previewable()
+                                                        ->openable(false)
+                                                        ->downloadable(false)
+                                                        ->maxSize(256)
+                                                        ->maxFiles(1)
+                                                        ->columnSpanFull()
+                                                        ->alignCenter()
+                                                        ->imageEditor()
+                                                        ->image()
+                                                        ->disk('public')
+                                                        ->directory(Server::ICON_STORAGE_PATH)
+                                                        ->acceptedFileTypes([
+                                                            'image/png',
+                                                            'image/jpeg',
+                                                            'image/webp',
+                                                            'image/svg+xml',
+                                                        ])
+                                                        ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                            return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                        }),
+                                                ]),
+                                        ]),
+                                ])
+                                ->action(function (array $data, $record): void {
+                                    if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                        $this->saveIconFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+                                        Notification::make()
+                                            ->title(trans('server/setting.server_info.icon.updated'))
+                                            ->success()
+                                            ->send();
+
+                                        return;
+                                    }
+
+                                    if (!empty($data['image'])) {
+                                        Notification::make()
+                                            ->title(trans('server/setting.server_info.icon.updated'))
+                                            ->success()
+                                            ->send();
+
+                                        return;
+                                    }
+
+                                    if (empty($data['imageUrl']) && empty($data['image'])) {
+                                        Notification::make()
+                                            ->title(trans('admin/egg.import.no_image'))
+                                            ->warning()
+                                            ->send();
+                                    }
+                                }),
+                            DeleteServerIcon::make(),
                         ]),
                     Grid::make()
                         ->columns(3)
@@ -195,7 +320,7 @@ class EditServer extends EditRecord
                                                     try {
                                                         $logs = $serverRepository->setServer($server)->getInstallLogs();
 
-                                                        return convert_to_utf8($logs);
+                                                        return mb_convert_encoding($logs, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']);
                                                     } catch (ConnectionException) {
                                                         Notification::make()
                                                             ->title(trans('admin/server.notifications.error_connecting', ['node' => $server->node->name]))
@@ -810,7 +935,7 @@ class EditServer extends EditRecord
                                                         ->send();
                                                 }
                                             }),
-                                        Action::make('exclude_toggle_unsuspend')
+                                        Action::make('toggleUnsuspend')
                                             ->label(trans('admin/server.unsuspend'))
                                             ->color('success')
                                             ->hidden(fn (Server $server) => !$server->isSuspended())
@@ -1001,7 +1126,7 @@ class EditServer extends EditRecord
                 ->hidden(fn () => $canForceDelete)
                 ->authorize(fn (Server $server) => user()?->can('delete server', $server))
                 ->icon(TablerIcon::Trash),
-            Action::make('exclude_force_delete')
+            Action::make('ForceDelete')
                 ->color('danger')
                 ->label(trans('filament-actions::force-delete.single.label'))
                 ->modalHeading(trans('filament-actions::force-delete.single.modal.heading', ['label' => $this->getRecordTitle()]))
@@ -1076,4 +1201,35 @@ class EditServer extends EditRecord
     {
         return null;
     }
+
+    /**
+     * Save an icon from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveIconFromUrl(string $imageUrl, string $extension, Server $server): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 262144); //256KB
+
+        if (empty($data)) {
+            throw new \Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Server::ICON_STORAGE_PATH . "/$server->uuid.$normalizedExtension", $data);
+    }
 }

app/Filament/Admin/Resources/Servers/RelationManagers/AllocationsRelationManager.php

@@ -113,10 +113,7 @@ class AllocationsRelationManager extends RelationManager
                     ->createAnother(false)
                     ->schema(fn () => [
                         Select::make('allocation_ip')
-                            ->options(fn (Get $get) => collect($this->getOwnerRecord()->node->ipAddresses())
-                                ->when($get('allocation_ip'), fn ($ips, $current) => $ips->push($current))
-                                ->unique()
-                                ->mapWithKeys(fn (string $ip) => [$ip => $ip]))
+                            ->options(fn () => collect($this->getOwnerRecord()->node->ipAddresses())->mapWithKeys(fn (string $ip) => [$ip => $ip]))
                             ->label(trans('admin/server.ip_address'))
                             ->inlineLabel()
                             ->ip()
@@ -129,18 +126,6 @@ class AllocationsRelationManager extends RelationManager
                                         cache()->forget("nodes.{$this->getOwnerRecord()->node->id}.ips");
                                     })
                             )
-                            ->suffixAction(
-                                Action::make('custom_ip')
-                                    ->icon(TablerIcon::Keyboard)
-                                    ->tooltip(trans('admin/node.custom_ip'))
-                                    ->schema([
-                                        TextInput::make('custom_ip')
-                                            ->label(trans('admin/node.ip_address'))
-                                            ->ip()
-                                            ->required(),
-                                    ])
-                                    ->action(fn (array $data, Set $set) => $set('allocation_ip', $data['custom_ip']))
-                            )
                             ->afterStateUpdated(fn (Set $set) => $set('allocation_ports', []))
                             ->required(),
                         TextInput::make('allocation_alias')

app/Filament/Admin/Resources/Users/UserResource.php

@@ -142,7 +142,7 @@ class UserResource extends Resource
             ])
             ->toolbarActions([
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
                 CreateAction::make()
                     ->hiddenLabel()

app/Filament/Admin/Resources/Webhooks/WebhookResource.php

@@ -114,7 +114,7 @@ class WebhookResource extends Resource
             ->toolbarActions([
                 CreateAction::make(),
                 BulkActionGroup::make([
-                    DeleteBulkAction::make('exclude_bulk_delete'),
+                    DeleteBulkAction::make(),
                 ]),
             ])
             ->emptyStateIcon(TablerIcon::Webhook)

app/Filament/App/Resources/Servers/Pages/ListServers.php

@@ -70,7 +70,7 @@ class ListServers extends ListRecords
             ImageColumn::make('icon')
                 ->label('')
                 ->imageSize(46)
-                ->state(fn (Server $server) => $server->icon ?: $server->egg->icon),
+                ->state(fn (Server $server) => $server->icon ?: $server->egg->image),
             TextColumn::make('condition')
                 ->label(trans('server/dashboard.status'))
                 ->badge()
@@ -81,8 +81,7 @@ class ListServers extends ListRecords
                 ->label(trans('server/dashboard.title'))
                 ->description(fn (Server $server) => $server->description)
                 ->grow()
-                ->searchable()
-                ->sortable(),
+                ->searchable(),
             TextColumn::make('allocation.address')
                 ->label('')
                 ->badge()

app/Filament/Components/Actions/DeleteIcon.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Actions;
-
-use App\Enums\TablerIcon;
-use App\Models\Traits\HasIcon;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Illuminate\Support\Facades\Storage;
-
-class DeleteIcon extends Action
-{
-    /** @var string[] */
-    protected ?array $iconFormats = null;
-
-    protected ?string $iconStoragePath = null;
-
-    public static function getDefaultName(): ?string
-    {
-        return 'delete_icon';
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->visible(fn ($record) => $record->icon);
-
-        $this->hiddenLabel();
-
-        $this->tooltip(trans('admin/egg.import.delete_icon'));
-
-        $this->icon(TablerIcon::Trash);
-
-        $this->color('danger');
-
-        $this->action(function ($record) {
-            foreach ($this->getIconFormats() as $ext) {
-                $path = $this->getIconStoragePath() . "/$record->uuid.$ext";
-                if (Storage::disk('public')->exists($path)) {
-                    Storage::disk('public')->delete($path);
-                }
-            }
-
-            Notification::make()
-                ->title(trans('admin/egg.import.icon_deleted'))
-                ->success()
-                ->send();
-
-            $record->refresh();
-        });
-    }
-
-    /** @param string[] $iconFormats */
-    public function iconFormats(?array $iconFormats): static
-    {
-        $this->iconFormats = $iconFormats;
-
-        return $this;
-    }
-
-    public function iconStoragePath(?string $iconStoragePath): static
-    {
-        $this->iconStoragePath = $iconStoragePath;
-
-        return $this;
-    }
-
-    /** @return string[] */
-    public function getIconFormats(): array
-    {
-        return $this->iconFormats ?? array_keys(HasIcon::$iconFormats);
-    }
-
-    public function getIconStoragePath(): ?string
-    {
-        return $this->iconStoragePath;
-    }
-}

app/Filament/Components/Actions/DeleteServerIcon.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Filament\Components\Actions;
+
+use App\Enums\TablerIcon;
+use App\Models\Server;
+use Filament\Actions\Action;
+use Filament\Notifications\Notification;
+use Illuminate\Support\Facades\Storage;
+
+class DeleteServerIcon extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'delete_icon';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->visible(fn ($record) => $record->icon);
+
+        $this->hiddenLabel();
+
+        $this->tooltip(trans('admin/server.import_image'));
+
+        $this->icon(TablerIcon::Trash);
+
+        $this->color('danger');
+
+        $this->action(function ($record) {
+            foreach (array_keys(Server::IMAGE_FORMATS) as $ext) {
+                $path = Server::ICON_STORAGE_PATH . "/$record->uuid.$ext";
+                if (Storage::disk('public')->exists($path)) {
+                    Storage::disk('public')->delete($path);
+                }
+            }
+
+            Notification::make()
+                ->title(trans('server/setting.server_info.icon.deleted'))
+                ->success()
+                ->send();
+
+            $record->refresh();
+        });
+    }
+}

app/Filament/Components/Actions/RotateDatabasePasswordAction.php

@@ -16,15 +16,13 @@ class RotateDatabasePasswordAction extends Action
 {
     public static function getDefaultName(): ?string
     {
-        return 'exclude_hint_rotate';
+        return 'hint_rotate';
     }
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->hiddenLabel();
-
         $this->tooltip(trans('admin/databasehost.rotate'));
 
         $this->icon(TablerIcon::Refresh);

app/Filament/Components/Actions/UploadIcon.php

@@ -1,168 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Actions;
-
-use App\Enums\TablerIcon;
-use App\Models\Traits\HasIcon;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\TextInput;
-use Filament\Infolists\Components\TextEntry;
-use Filament\Notifications\Notification;
-use Filament\Schemas\Components\Image;
-use Filament\Schemas\Components\Tabs;
-use Filament\Schemas\Components\Tabs\Tab;
-use Filament\Schemas\Components\Utilities\Get;
-use Filament\Schemas\Components\Utilities\Set;
-use Illuminate\Support\Facades\Http;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-
-class UploadIcon extends Action
-{
-    /** @var string[] */
-    protected ?array $iconFormats = null;
-
-    public static function getDefaultName(): ?string
-    {
-        return 'upload_icon';
-    }
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->hiddenLabel();
-
-        $this->tooltip(trans('admin/egg.import.import_icon'));
-
-        $this->icon(TablerIcon::PhotoUp);
-
-        $this->modal();
-
-        $this->modalHeading('');
-
-        $this->modalSubmitActionLabel(trans('admin/egg.import.import_icon'));
-
-        $this->schema([
-            Tabs::make()
-                ->contained(false)
-                ->tabs([
-                    Tab::make(trans('admin/egg.import.url'))
-                        ->schema([
-                            TextInput::make('icon_url')
-                                ->label(trans('admin/egg.import.icon_url'))
-                                ->reactive()
-                                ->autocomplete(false)
-                                ->debounce(500)
-                                ->afterStateUpdated(function ($state, Set $set) {
-                                    if (!$state) {
-                                        $set('icon_url_error', null);
-
-                                        return;
-                                    }
-
-                                    try {
-                                        $this->validateIconUrl($state);
-
-                                        $set('icon_url_error', null);
-                                    } catch (Exception $exception) {
-                                        $set('icon_url_error', $exception->getMessage());
-                                    }
-                                }),
-                            TextEntry::make('icon_url_error')
-                                ->hiddenLabel()
-                                ->visible(fn (Get $get) => $get('icon_url_error') !== null)
-                                ->afterStateHydrated(fn (Get $get) => $get('icon_url_error')),
-                            Image::make(fn (Get $get) => $get('icon_url'), '')
-                                ->imageSize(150)
-                                ->visible(fn (Get $get) => $get('icon_url') && !$get('icon_url_error'))
-                                ->alignCenter(),
-                        ]),
-                    Tab::make(trans('admin/egg.import.file'))
-                        ->schema([
-                            FileUpload::make('icon')
-                                ->hiddenLabel()
-                                ->previewable()
-                                ->openable(false)
-                                ->downloadable(false)
-                                ->maxSize(256)
-                                ->maxFiles(1)
-                                ->columnSpanFull()
-                                ->alignCenter()
-                                ->imageEditor()
-                                ->image()
-                                ->acceptedFileTypes(fn () => $this->getIconFormats())
-                                ->saveUploadedFileUsing(fn (TemporaryUploadedFile $file, $record) => $record->writeIcon($file->getClientOriginalExtension(), $file->getContent())),
-                        ]),
-                ]),
-        ]);
-
-        $this->action(function (array $data, $record) {
-            if (!empty($data['icon_url'])) {
-                $this->validateIconUrl($data['icon_url']);
-
-                $content = Http::timeout(5)->connectTimeout(1)->withoutRedirecting()->get($data['icon_url'])->body();
-
-                if (empty($content)) {
-                    throw new Exception(trans('admin/egg.import.invalid_url'));
-                }
-
-                $extension = strtolower(pathinfo(parse_url($data['icon_url'], PHP_URL_PATH), PATHINFO_EXTENSION));
-
-                if (empty($extension)) {
-                    throw new Exception(trans('admin/egg.import.invalid_url'));
-                }
-
-                $record->writeIcon($extension, $content);
-
-                Notification::make()
-                    ->title(trans('admin/egg.import.icon_updated'))
-                    ->success()
-                    ->send();
-            } elseif (!empty($data['icon'])) {
-                Notification::make()
-                    ->title(trans('admin/egg.import.icon_updated'))
-                    ->success()
-                    ->send();
-            } else {
-                Notification::make()
-                    ->title(trans('admin/egg.import.no_icon'))
-                    ->warning()
-                    ->send();
-            }
-        });
-    }
-
-    protected function validateIconUrl(string $url): void
-    {
-        if (!in_array(parse_url($url, PHP_URL_SCHEME), ['http', 'https'], true)) {
-            throw new Exception(trans('admin/egg.import.invalid_url'));
-        }
-
-        if (!filter_var($url, FILTER_VALIDATE_URL)) {
-            throw new Exception(trans('admin/egg.import.invalid_url'));
-        }
-
-        $host = parse_url($url, PHP_URL_HOST);
-        $ip = gethostbyname($host);
-
-        if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false) {
-            throw new Exception(trans('admin/egg.import.no_local_ip'));
-        }
-    }
-
-    /** @param string[] $iconFormats */
-    public function iconFormats(?array $iconFormats): static
-    {
-        $this->iconFormats = $iconFormats;
-
-        return $this;
-    }
-
-    /** @return string[] */
-    public function getIconFormats(): array
-    {
-        return $this->iconFormats ?? array_values(HasIcon::$iconFormats);
-    }
-}

app/Filament/Components/Forms/Fields/StartupVariable.php

@@ -49,7 +49,7 @@ class StartupVariable extends Field
 
         $this->hintIcon(TablerIcon::Code, fn (StartupVariable $component) => implode('|', $component->getVariableRules()));
 
-        $this->helperText(fn (StartupVariable $component) => $component->getVariableDesc());
+        $this->helperText(fn (StartupVariable $component) => !$component->getVariableDesc() ? '—' : $component->getVariableDesc());
 
         $this->rules(fn (StartupVariable $component) => $component->getVariableRules());
 
@@ -70,7 +70,7 @@ class StartupVariable extends Field
             ],
             StartupVariableType::Toggle => [
                 ...parent::getDefaultStateCasts(),
-                new BooleanStateCast(false, true),
+                new BooleanStateCast(false),
             ],
             default => parent::getDefaultStateCasts()
         };

app/Filament/Components/Tables/Columns/NodeClientHealthColumn.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Filament\Components\Tables\Columns;
-
-use Filament\Support\Enums\Alignment;
-use Filament\Tables\Columns\IconColumn;
-use Illuminate\Support\Facades\Blade;
-
-class NodeClientHealthColumn extends IconColumn
-{
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->label(trans('admin/node.table.reachable'));
-
-        $this->alignCenter();
-    }
-
-    public function toEmbeddedHtml(): string
-    {
-        $alignment = $this->getAlignment();
-
-        $attributes = $this->getExtraAttributeBag()
-            ->class([
-                'fi-ta-icon',
-                'fi-inline' => $this->isInline(),
-                'fi-ta-icon-has-line-breaks' => $this->isListWithLineBreaks(),
-                'fi-wrapped' => $this->canWrap(),
-                ($alignment instanceof Alignment) ? "fi-align-{$alignment->value}" : (is_string($alignment) ? $alignment : ''),
-            ])
-            ->toHtml();
-
-        return Blade::render(<<<'BLADE'
-            <div <?= $attributes ?>>
-                @livewire('node-client-connectivity', ['node' => $record, 'lazy' => true])
-            </div>
-        BLADE, [
-            'attributes' => $attributes,
-            'record' => $this->getRecord(),
-        ]);
-    }
-}

app/Filament/Components/Tables/Filters/TagsFilter.php

@@ -21,9 +21,9 @@ class TagsFilter extends BaseFilter
     {
         parent::setUp();
 
-        $this->query(fn (Builder $query, array $data) => $query->when($data['tag'] ?? null, fn (Builder $query, $tag) => $query->whereJsonContains('tags', $tag)));
+        $this->query(fn (Builder $query, array $data) => $query->when($data['tag'], fn (Builder $query, $tag) => $query->whereJsonContains('tags', $tag)));
 
-        $this->indicateUsing(fn (array $data) => ($data['tag'] ?? null) ? 'Tag: ' . $data['tag'] : null);
+        $this->indicateUsing(fn (array $data) => $data['tag'] ? 'Tag: ' . $data['tag'] : null);
 
         $this->resetState(['tag' => null]);
 

app/Filament/Pages/Auth/EditProfile.php

@@ -254,7 +254,7 @@ class EditProfile extends BaseEditProfile
                                         ->columnSpanFull(),
                                 ])
                                 ->headerActions([
-                                    Action::make('exclude_create_api_key')
+                                    Action::make('create_api_key')
                                         ->label(trans('filament-actions::create.single.modal.actions.create.label'))
                                         ->disabled(fn (Get $get) => empty($get('description')))
                                         ->successRedirectUrl(self::getUrl(['tab' => 'api-keys::data::tab'], panel: 'app'))
@@ -343,7 +343,7 @@ class EditProfile extends BaseEditProfile
                                     ->live(),
                             ])
                             ->headerActions([
-                                Action::make('exclude_create_ssh_key')
+                                Action::make('create_ssh_key')
                                     ->label(trans('filament-actions::create.single.modal.actions.create.label'))
                                     ->disabled(fn (Get $get) => empty($get('name')) || empty($get('public_key')))
                                     ->successRedirectUrl(self::getUrl(['tab' => 'ssh-keys::data::tab'], panel: 'app'))
@@ -426,13 +426,13 @@ class EditProfile extends BaseEditProfile
                 ->label(trans('profile.tabs.activity'))
                 ->icon(TablerIcon::History)
                 ->schema([
-                    Repeater::make('activity') // TODO: move to a table
-                        ->label(trans('profile.activity_info'))
+                    Repeater::make('activity')
+                        ->hiddenLabel()
                         ->inlineLabel(false)
                         ->deletable(false)
                         ->addable(false)
                         ->relationship(null, function (Builder $query) {
-                            $query->orderBy('timestamp', 'desc')->limit(50);
+                            $query->orderBy('timestamp', 'desc');
                         })
                         ->schema([
                             TextEntry::make('log')
@@ -474,17 +474,6 @@ class EditProfile extends BaseEditProfile
                                     false => 'Icon Button',
                                 ]),
                         ]),
-                    Section::make(trans('profile.admin'))
-                        ->collapsible()
-                        ->icon(TablerIcon::Shield)
-                        ->visible(fn (User $user) => $user->isAdmin())
-                        ->schema([
-                            ToggleButtons::make('redirect_to_admin')
-                                ->label(trans('profile.redirect_to_admin'))
-                                ->helperText(trans('profile.redirect_to_admin_help'))
-                                ->inline()
-                                ->boolean(),
-                        ]),
                     Section::make(trans('profile.console'))
                         ->collapsible()
                         ->icon(TablerIcon::Terminal2)
@@ -610,7 +599,6 @@ class EditProfile extends BaseEditProfile
             'dashboard_layout' => $data['dashboard_layout'],
             'top_navigation' => $data['top_navigation'],
             'button_style' => $data['button_style'],
-            'redirect_to_admin' => $data['redirect_to_admin'] ?? $this->getUser()->getCustomization(CustomizationKey::RedirectToAdmin),
         ];
 
         unset(
@@ -620,7 +608,6 @@ class EditProfile extends BaseEditProfile
             $data['dashboard_layout'],
             $data['top_navigation'],
             $data['button_style'],
-            $data['redirect_to_admin'],
         );
 
         $data['customization'] = json_encode($customization);
@@ -636,7 +623,6 @@ class EditProfile extends BaseEditProfile
         $data['console_graph_period'] = (int) $this->getUser()->getCustomization(CustomizationKey::ConsoleGraphPeriod);
         $data['dashboard_layout'] = $this->getUser()->getCustomization(CustomizationKey::DashboardLayout);
         $data['button_style'] = $this->getUser()->getCustomization(CustomizationKey::ButtonStyle);
-        $data['redirect_to_admin'] = $this->getUser()->getCustomization(CustomizationKey::RedirectToAdmin);
 
         // Handle migration from boolean to string navigation types
         $topNavigation = $this->getUser()->getCustomization(CustomizationKey::TopNavigation);

app/Filament/Pages/Auth/Login.php

@@ -4,8 +4,6 @@ namespace App\Filament\Pages\Auth;
 
 use App\Extensions\Captcha\CaptchaService;
 use App\Extensions\OAuth\OAuthService;
-use BladeUI\Icons\Exceptions\SvgNotFound;
-use BladeUI\Icons\Factory as IconFactory;
 use Filament\Actions\Action;
 use Filament\Auth\Pages\Login as BaseLogin;
 use Filament\Forms\Components\TextInput;
@@ -13,7 +11,6 @@ use Filament\Schemas\Components\Actions;
 use Filament\Schemas\Components\Component;
 use Filament\Schemas\Schema;
 use Filament\Support\Colors\Color;
-use Filament\Support\Enums\Alignment;
 use Illuminate\Validation\ValidationException;
 
 class Login extends BaseLogin
@@ -22,23 +19,14 @@ class Login extends BaseLogin
 
     protected CaptchaService $captchaService;
 
-    protected IconFactory $iconFactory;
-
-    public function boot(OAuthService $oauthService, CaptchaService $captchaService, IconFactory $iconFactory): void
+    public function boot(OAuthService $oauthService, CaptchaService $captchaService): void
     {
         $this->oauthService = $oauthService;
         $this->captchaService = $captchaService;
-        $this->iconFactory = $iconFactory;
     }
 
     public function form(Schema $schema): Schema
     {
-        if (config('auth.disable_password_login', false)) {
-            return $schema->components([
-                $this->getOAuthFormComponent(),
-            ]);
-        }
-
         $components = [
             $this->getLoginFormComponent(),
             $this->getPasswordFormComponent(),
@@ -99,38 +87,18 @@ class Login extends BaseLogin
             $color = $schema->getHexColor();
             $color = is_string($color) ? Color::hex($color) : null;
 
-            $icon = $schema->getIcon();
-            if (is_string($icon)) {
-                try {
-                    $this->iconFactory->svg($icon);
-                } catch (SvgNotFound) {
-                    $icon = null;
-                }
-            }
-
             $actions[] = Action::make("oauth_$id")
                 ->label($schema->getName())
-                ->icon($icon)
+                ->icon($schema->getIcon())
                 ->color($color)
                 ->url(route('auth.oauth.redirect', ['driver' => $id], false));
         }
 
-        return Actions::make($actions)->alignment(fn () => config('auth.disable_password_login', false) ? Alignment::Center : null);
-    }
-
-    protected function getFormActions(): array
-    {
-        return config('auth.disable_password_login', false) ? [] : parent::getFormActions();
+        return Actions::make($actions);
     }
 
     protected function getCredentialsFromFormData(array $data): array
     {
-        if (config('auth.disable_password_login', false)) {
-            throw ValidationException::withMessages([
-                'data.login' => trans('auth.password_login_disabled'),
-            ]);
-        }
-
         $loginType = filter_var($data['login'], FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
 
         return [

app/Filament/Server/Pages/Mounts.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace App\Filament\Server\Pages;
-
-use App\Enums\SubuserPermission;
-use App\Enums\TablerIcon;
-use App\Facades\Activity;
-use App\Models\Mount;
-use App\Models\Server;
-use BackedEnum;
-use Exception;
-use Filament\Facades\Filament;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Notifications\Notification;
-use Filament\Schemas\Components\Section;
-use Filament\Schemas\Schema;
-use Illuminate\Support\HtmlString;
-
-class Mounts extends ServerFormPage
-{
-    protected static string|BackedEnum|null $navigationIcon = TablerIcon::LayersLinked;
-
-    protected static ?int $navigationSort = 9;
-
-    public static function canAccess(): bool
-    {
-        return parent::canAccess() && user()?->can(SubuserPermission::MountRead, Filament::getTenant());
-    }
-
-    protected function authorizeAccess(): void
-    {
-        abort_unless(user()?->can(SubuserPermission::MountRead, Filament::getTenant()), 403);
-    }
-
-    protected function fillForm(): void
-    {
-        $this->form->fill([
-            'mounts' => $this->getRecord()->mounts->pluck('id')->toArray(),
-        ]);
-    }
-
-    public function form(Schema $schema): Schema
-    {
-        $server = $this->getRecord();
-
-        $allowedMounts = Mount::query()
-            ->where('user_mountable', true)
-            ->where(function ($query) use ($server) {
-                $query->whereDoesntHave('nodes')
-                    ->orWhereHas('nodes', fn ($q) => $q->where('nodes.id', $server->node_id));
-            })
-            ->where(function ($query) use ($server) {
-                $query->whereDoesntHave('eggs')
-                    ->orWhereHas('eggs', fn ($q) => $q->where('eggs.id', $server->egg_id));
-            })
-            ->get();
-
-        return parent::form($schema)
-            ->components([
-                Section::make([
-                    CheckboxList::make('mounts')
-                        ->label(trans('server/mount.description'))
-                        ->relationship('mounts')
-                        ->options(fn () => $allowedMounts->mapWithKeys(fn (Mount $mount) => [$mount->id => $mount->name]))
-                        ->descriptions(fn () => $allowedMounts->mapWithKeys(fn (Mount $mount) => [$mount->id => new HtmlString(str("$mount->source -> $mount->target")->stripTags() . ($mount->description ? '<br>' . str($mount->description)->stripTags() : ''))]))
-                        ->helperText(fn () => $allowedMounts->isEmpty() ? trans('server/mount.no_mounts') : null)
-                        ->disabled(fn (Server $server) => !user()?->can(SubuserPermission::MountUpdate, $server))
-                        ->bulkToggleable()
-                        ->live()
-                        ->afterStateUpdated(function ($state) {
-                            $this->save();
-                        })
-                        ->columnSpanFull(),
-                ]),
-            ]);
-    }
-
-    public function save(): void
-    {
-        abort_unless(user()?->can(SubuserPermission::MountUpdate, $this->getRecord()), 403);
-
-        try {
-            $this->form->getState();
-            $this->form->saveRelationships();
-
-            Activity::event('server:mount.update')
-                ->log();
-
-            Notification::make()
-                ->title(trans('server/mount.notification_updated'))
-                ->body(trans('server/mount.notification_updated_body'))
-                ->success()
-                ->send();
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->title(trans('server/mount.notification_failed'))
-                ->body($exception->getMessage())
-                ->danger()
-                ->send();
-        }
-    }
-
-    public function getTitle(): string
-    {
-        return trans('server/mount.title');
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return trans('server/mount.title');
-    }
-}

app/Filament/Server/Pages/Settings.php

@@ -5,13 +5,14 @@ namespace App\Filament\Server\Pages;
 use App\Enums\SubuserPermission;
 use App\Enums\TablerIcon;
 use App\Facades\Activity;
-use App\Filament\Components\Actions\DeleteIcon;
-use App\Filament\Components\Actions\UploadIcon;
+use App\Filament\Components\Actions\DeleteServerIcon;
 use App\Models\Server;
 use App\Services\Servers\ReinstallServerService;
 use BackedEnum;
 use Exception;
 use Filament\Actions\Action;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
@@ -20,14 +21,20 @@ use Filament\Schemas\Components\Fieldset;
 use Filament\Schemas\Components\Grid;
 use Filament\Schemas\Components\Image;
 use Filament\Schemas\Components\Section;
+use Filament\Schemas\Components\Tabs;
+use Filament\Schemas\Components\Tabs\Tab;
+use Filament\Schemas\Components\Utilities\Get;
+use Filament\Schemas\Components\Utilities\Set;
 use Filament\Schemas\Schema;
 use Filament\Support\Enums\Alignment;
+use Illuminate\Support\Facades\Storage;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class Settings extends ServerFormPage
 {
     protected static string|BackedEnum|null $navigationIcon = TablerIcon::Settings;
 
-    protected static ?int $navigationSort = 11;
+    protected static ?int $navigationSort = 10;
 
     /**
      * @throws Exception
@@ -72,20 +79,140 @@ class Settings extends ServerFormPage
                                             ->afterStateUpdated(fn ($state, Server $server) => $this->updateDescription($state ?? '', $server)),
                                     ]),
                                 Grid::make()
+                                    ->columns(2)
                                     ->columnStart(6)
                                     ->schema([
                                         Image::make('', 'icon')
-                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->icon)
-                                            ->url(fn ($record) => $record->icon ?: $record->egg->icon)
+                                            ->hidden(fn ($record) => !$record->icon && !$record->egg->image)
+                                            ->url(fn ($record) => $record->icon ?: $record->egg->image)
                                             ->tooltip(fn ($record) => $record->icon ? '' : trans('server/setting.server_info.icon.tooltip'))
-                                            ->imageSize(150)
-                                            ->columnSpanFull()
+                                            ->columnSpan(2)
                                             ->alignJustify(),
-                                        UploadIcon::make()
-                                            ->authorize(fn (Server $server) => user()?->can(SubuserPermission::SettingsChangeIcon, $server)),
-                                        DeleteIcon::make()
-                                            ->iconStoragePath(Server::getIconStoragePath())
-                                            ->authorize(fn (Server $server) => user()?->can(SubuserPermission::SettingsChangeIcon, $server)),
+                                        Action::make('uploadIcon')
+                                            ->hiddenLabel()
+                                            ->tooltip(trans('admin/server.import_image'))
+                                            ->icon(TablerIcon::PhotoUp)
+                                            ->modal()
+                                            ->modalSubmitActionLabel(trans('server/setting.server_info.icon.upload'))
+                                            ->schema([
+                                                Tabs::make()
+                                                    ->contained(false)
+                                                    ->tabs([
+                                                        Tab::make(trans('admin/egg.import.url'))
+                                                            ->schema([
+                                                                Hidden::make('imageUrl'),
+                                                                Hidden::make('imageExtension'),
+                                                                TextInput::make('image_url')
+                                                                    ->label(trans('admin/egg.import.image_url'))
+                                                                    ->reactive()
+                                                                    ->autocomplete(false)
+                                                                    ->debounce(500)
+                                                                    ->afterStateUpdated(function ($state, Set $set) {
+                                                                        if (!$state) {
+                                                                            $set('image_url_error', null);
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
+
+                                                                            return;
+                                                                        }
+
+                                                                        try {
+                                                                            if (!in_array(parse_url($state, PHP_URL_SCHEME), ['http', 'https'], true)) {
+                                                                                throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                            }
+
+                                                                            if (!filter_var($state, FILTER_VALIDATE_URL)) {
+                                                                                throw new \Exception(trans('admin/egg.import.invalid_url'));
+                                                                            }
+
+                                                                            $extension = strtolower(pathinfo(parse_url($state, PHP_URL_PATH), PATHINFO_EXTENSION));
+
+                                                                            if (!array_key_exists($extension, Server::IMAGE_FORMATS)) {
+                                                                                throw new \Exception(trans('admin/egg.import.unsupported_format', ['format' => implode(', ', array_keys(Server::IMAGE_FORMATS))]));
+                                                                            }
+
+                                                                            $host = parse_url($state, PHP_URL_HOST);
+                                                                            $ip = gethostbyname($host);
+
+                                                                            if (
+                                                                                filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE) === false
+                                                                            ) {
+                                                                                throw new \Exception(trans('admin/egg.import.no_local_ip'));
+                                                                            }
+
+                                                                            $set('imageUrl', $state);
+                                                                            $set('imageExtension', $extension);
+                                                                            $set('image_url_error', null);
+
+                                                                        } catch (\Exception $e) {
+                                                                            $set('image_url_error', $e->getMessage());
+                                                                            $set('imageUrl', null);
+                                                                            $set('imageExtension', null);
+                                                                        }
+                                                                    }),
+                                                                TextEntry::make('image_url_error')
+                                                                    ->hiddenLabel()
+                                                                    ->visible(fn (Get $get) => $get('image_url_error') !== null)
+                                                                    ->afterStateHydrated(fn (Get $get) => $get('image_url_error')),
+                                                                Image::make(fn (Get $get) => $get('image_url'), '')
+                                                                    ->imageSize(150)
+                                                                    ->visible(fn (Get $get) => $get('image_url') && !$get('image_url_error'))
+                                                                    ->alignCenter(),
+                                                            ]),
+                                                        Tab::make(trans('admin/egg.import.file'))
+                                                            ->schema([
+                                                                FileUpload::make('image')
+                                                                    ->hiddenLabel()
+                                                                    ->previewable()
+                                                                    ->openable(false)
+                                                                    ->downloadable(false)
+                                                                    ->maxSize(256)
+                                                                    ->maxFiles(1)
+                                                                    ->columnSpanFull()
+                                                                    ->alignCenter()
+                                                                    ->imageEditor()
+                                                                    ->image()
+                                                                    ->disk('public')
+                                                                    ->directory(Server::ICON_STORAGE_PATH)
+                                                                    ->acceptedFileTypes([
+                                                                        'image/png',
+                                                                        'image/jpeg',
+                                                                        'image/webp',
+                                                                        'image/svg+xml',
+                                                                    ])
+                                                                    ->getUploadedFileNameForStorageUsing(function (TemporaryUploadedFile $file, $record) {
+                                                                        return $record->uuid . '.' . $file->getClientOriginalExtension();
+                                                                    }),
+                                                            ]),
+                                                    ]),
+                                            ])
+                                            ->action(function (array $data, $record): void {
+
+                                                if (!empty($data['imageUrl']) && !empty($data['imageExtension'])) {
+                                                    $this->saveIconFromUrl($data['imageUrl'], $data['imageExtension'], $record);
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+
+                                                    return;
+                                                }
+
+                                                if (!empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('server/setting.server_info.icon.updated'))
+                                                        ->success()
+                                                        ->send();
+                                                }
+
+                                                if (empty($data['imageUrl']) && empty($data['image'])) {
+                                                    Notification::make()
+                                                        ->title(trans('admin/egg.import.no_image'))
+                                                        ->warning()
+                                                        ->send();
+                                                }
+                                            }),
+                                        DeleteServerIcon::make(),
                                     ]),
                                 TextInput::make('uuid')
                                     ->label(trans('server/setting.server_info.uuid'))
@@ -319,6 +446,37 @@ class Settings extends ServerFormPage
         }
     }
 
+    /**
+     * Save an icon from URL download to a file.
+     *
+     * @throws Exception
+     */
+    private function saveIconFromUrl(string $imageUrl, string $extension, Server $server): void
+    {
+        $context = stream_context_create([
+            'http' => ['timeout' => 3],
+            'https' => [
+                'timeout' => 3,
+                'verify_peer' => true,
+                'verify_peer_name' => true,
+            ],
+        ]);
+
+        $data = @file_get_contents($imageUrl, false, $context, 0, 262144); //256KB
+
+        if (empty($data)) {
+            throw new \Exception(trans('admin/egg.import.invalid_url'));
+        }
+
+        $normalizedExtension = match ($extension) {
+            'svg+xml' => 'svg',
+            'jpeg' => 'jpg',
+            default => $extension,
+        };
+
+        Storage::disk('public')->put(Server::ICON_STORAGE_PATH . "/$server->uuid.$normalizedExtension", $data);
+    }
+
     public function getTitle(): string
     {
         return trans('server/setting.title');

app/Filament/Server/Pages/Startup.php

@@ -28,7 +28,7 @@ class Startup extends ServerFormPage
 {
     protected static string|BackedEnum|null $navigationIcon = TablerIcon::PlayerPlay;
 
-    protected static ?int $navigationSort = 10;
+    protected static ?int $navigationSort = 9;
 
     /**
      * @throws Exception
@@ -149,16 +149,12 @@ class Startup extends ServerFormPage
         return parent::canAccess() && user()?->can(SubuserPermission::StartupRead, Filament::getTenant());
     }
 
-    public function update(null|string|bool $state, ServerVariable $serverVariable): void
+    public function update(?string $state, ServerVariable $serverVariable): void
     {
         if (!$serverVariable->variable->user_editable) {
             return;
         }
 
-        if (is_bool($state)) {
-            $state = $state ? '1' : '0';
-        }
-
         $original = $serverVariable->variable_value;
 
         try {

app/Filament/Server/Resources/Activities/ActivityResource.php

@@ -139,7 +139,6 @@ class ActivityResource extends Resource
             ]);
     }
 
-    /** @return Builder<ActivityLog> */
     public static function getEloquentQuery(): Builder
     {
         /** @var Server $server */

app/Filament/Server/Resources/Backups/BackupResource.php

@@ -27,6 +27,7 @@ use BackedEnum;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Actions\CreateAction;
+use Filament\Actions\DeleteAction;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Textarea;
@@ -76,7 +77,7 @@ class BackupResource extends Resource
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->backup_limit ?? 0;
+        return $server->backup_limit;
     }
 
     public static function defaultForm(Schema $schema): Schema
@@ -127,7 +128,7 @@ class BackupResource extends Resource
             ])
             ->recordActions([
                 ActionGroup::make([
-                    Action::make('exclude_rename')
+                    Action::make('rename')
                         ->icon(TablerIcon::Pencil)
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
                         ->label(trans('server/backup.actions.rename.title'))
@@ -157,14 +158,14 @@ class BackupResource extends Resource
                                 ->send();
                         })
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_lock')
+                    Action::make('lock')
                         ->iconSize(IconSize::Large)
                         ->icon(fn (Backup $backup) => !$backup->is_locked ? TablerIcon::Lock : TablerIcon::LockOpen)
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
                         ->label(fn (Backup $backup) => !$backup->is_locked ? trans('server/backup.actions.lock.lock') : trans('server/backup.actions.lock.unlock'))
                         ->action(fn (BackupController $backupController, Backup $backup, Request $request) => $backupController->toggleLock($request, $server, $backup))
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_download')
+                    Action::make('download')
                         ->label(trans('server/backup.actions.download'))
                         ->iconSize(IconSize::Large)
                         ->color('primary')
@@ -172,7 +173,7 @@ class BackupResource extends Resource
                         ->authorize(fn () => user()?->can(SubuserPermission::BackupDownload, $server))
                         ->url(fn (DownloadLinkService $downloadLinkService, Backup $backup, Request $request) => $downloadLinkService->handle($backup, $request->user()), true)
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_restore')
+                    Action::make('restore')
                         ->label(trans('server/backup.actions.restore.title'))
                         ->iconSize(IconSize::Large)
                         ->color('success')
@@ -225,12 +226,7 @@ class BackupResource extends Resource
                                 ->send();
                         })
                         ->visible(fn (Backup $backup) => $backup->status === BackupStatus::Successful),
-                    Action::make('exclude_delete')
-                        ->icon(TablerIcon::Trash)
-                        ->color('danger')
-                        ->requiresConfirmation()
-                        ->authorize(fn () => user()?->can(SubuserPermission::BackupDelete, $server))
-                        ->label(trans('filament-actions::delete.single.label'))
+                    DeleteAction::make('delete')
                         ->iconSize(IconSize::Large)
                         ->disabled(fn (Backup $backup) => $backup->is_locked && $backup->status !== BackupStatus::Failed)
                         ->modalDescription(fn (Backup $backup) => trans('server/backup.actions.delete.description', ['backup' => $backup->name]))

app/Filament/Server/Resources/Databases/DatabaseResource.php

@@ -62,7 +62,7 @@ class DatabaseResource extends Resource
         /** @var Server $server */
         $server = Filament::getTenant();
 
-        return $server->database_limit ?? 0;
+        return $server->database_limit;
     }
 
     /**

app/Filament/Server/Resources/Files/Pages/EditFiles.php

@@ -149,7 +149,7 @@ class EditFiles extends Page
                                 try {
                                     $contents = $this->getDaemonFileRepository()->getContent($this->path, config('panel.files.max_edit_size'));
 
-                                    return convert_to_utf8($contents);
+                                    return mb_convert_encoding($contents, 'UTF-8', ['UTF-8', 'UTF-16', 'ISO-8859-1', 'ASCII']);
                                 } catch (FileSizeTooLargeException) {
                                     AlertBanner::make('file_too_large')
                                         ->title(trans('server/file.alerts.file_too_large.title', ['name' => basename($this->path)]))
@@ -259,9 +259,9 @@ class EditFiles extends Page
         return $this->fileRepository;
     }
 
-    public static function getUrl(array $parameters = [], bool $isAbsolute = true, ?string $panel = null, ?Model $tenant = null, bool $shouldGuessMissingParameters = false, ?string $configuration = null): string
+    public static function getUrl(array $parameters = [], bool $isAbsolute = true, ?string $panel = null, ?Model $tenant = null, bool $shouldGuessMissingParameters = false): string
     {
-        return parent::getUrl($parameters, $isAbsolute, $panel, $tenant, $shouldGuessMissingParameters, $configuration) . '/';
+        return parent::getUrl($parameters, $isAbsolute, $panel, $tenant) . '/';
     }
 
     public static function route(string $path): PageRegistration

app/Filament/Server/Resources/Files/Pages/ListFiles.php

@@ -16,8 +16,10 @@ use App\Livewire\AlertBanner;
 use App\Models\File;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonFileRepository;
+use App\Services\Nodes\NodeJWTService;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
+use Carbon\CarbonImmutable;
 use Exception;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -614,6 +616,28 @@ class ListFiles extends ListRecords
         };
     }
 
+    public function getUploadUrl(NodeJWTService $jwtService): string
+    {
+        /** @var Server $server */
+        $server = Filament::getTenant();
+
+        if (!user()?->can(SubuserPermission::FileCreate, $server)) {
+            abort(403, 'You do not have permission to upload files.');
+        }
+
+        $token = $jwtService
+            ->setExpiresAt(CarbonImmutable::now()->addMinutes(15))
+            ->setUser(user())
+            ->setClaims(['server_uuid' => $server->uuid])
+            ->handle($server->node, user()->id . $server->uuid);
+
+        return sprintf(
+            '%s/upload/file?token=%s',
+            $server->node->getConnectionAddress(),
+            $token->toString()
+        );
+    }
+
     public function getUploadSizeLimit(): int
     {
         /** @var Server $server */

app/Filament/Server/Resources/Schedules/Pages/CreateSchedule.php

@@ -8,7 +8,6 @@ use App\Models\Schedule;
 use App\Models\Server;
 use App\Traits\Filament\CanCustomizeHeaderActions;
 use App\Traits\Filament\CanCustomizeHeaderWidgets;
-use Filament\Actions\Action;
 use Filament\Facades\Filament;
 use Filament\Resources\Pages\CreateRecord;
 
@@ -21,17 +20,6 @@ class CreateSchedule extends CreateRecord
 
     protected static bool $canCreateAnother = false;
 
-    protected function getCreateFormAction(): Action
-    {
-        $hasFormWrapper = $this->hasFormWrapper();
-
-        return Action::make('exclude_create')
-            ->label(__('filament-panels::resources/pages/create-record.form.actions.create.label'))
-            ->submit($hasFormWrapper ? $this->getSubmitFormLivewireMethodName() : null)
-            ->action($hasFormWrapper ? null : $this->getSubmitFormLivewireMethodName())
-            ->keyBindings(['mod+s']);
-    }
-
     protected function afterCreate(): void
     {
         /** @var Schedule $schedule */

app/Filament/Server/Resources/Schedules/RelationManagers/TasksRelationManager.php

@@ -7,7 +7,6 @@ use App\Facades\Activity;
 use App\Models\Schedule;
 use App\Models\Task;
 use Exception;
-use Filament\Actions\Action;
 use Filament\Actions\CreateAction;
 use Filament\Actions\DeleteAction;
 use Filament\Actions\EditAction;
@@ -74,7 +73,6 @@ class TasksRelationManager extends RelationManager
         return $table
             ->reorderable('sequence_id')
             ->defaultSort('sequence_id')
-            ->reorderRecordsTriggerAction(fn (Action $action, bool $isReordering) => $action->hiddenLabel()->tooltip(fn () => $action->getLabel()))
             ->columns([
                 TextColumn::make('action')
                     ->label(trans('server/schedule.tasks.actions.title'))

app/Filament/Server/Resources/Schedules/ScheduleResource.php

@@ -97,7 +97,8 @@ class ScheduleResource extends Resource
                     ->formatStateUsing(fn (?Schedule $schedule) => $schedule?->status->value ?? 'new')
                     ->options(fn (?Schedule $schedule) => [$schedule?->status->value ?? 'new' => $schedule?->status->getLabel() ?? 'New'])
                     ->visibleOn('view'),
-                Section::make(trans('server/schedule.cron'))
+                Section::make('Cron')
+                    ->label(trans('server/schedule.cron'))
                     ->description(function (Get $get) {
                         try {
                             $nextRun = Utilities::getScheduleNextRunDate($get('cron_minute'), $get('cron_hour'), $get('cron_day_of_month'), $get('cron_month'), $get('cron_day_of_week'))->timezone(user()->timezone ?? 'UTC');
@@ -109,22 +110,22 @@ class ScheduleResource extends Resource
                     })
                     ->schema([
                         Actions::make([
-                            CronPresetAction::make('exclude_hourly')
+                            CronPresetAction::make('hourly')
                                 ->label(trans('server/schedule.time.hourly'))
                                 ->cron('0', '*', '*', '*', '*'),
-                            CronPresetAction::make('exclude_daily')
+                            CronPresetAction::make('daily')
                                 ->label(trans('server/schedule.time.daily'))
                                 ->cron('0', '0', '*', '*', '*'),
-                            CronPresetAction::make('exclude_weekly_monday')
+                            CronPresetAction::make('weekly_monday')
                                 ->label(trans('server/schedule.time.weekly_mon'))
                                 ->cron('0', '0', '*', '*', '1'),
-                            CronPresetAction::make('exclude_weekly_sunday')
+                            CronPresetAction::make('weekly_sunday')
                                 ->label(trans('server/schedule.time.weekly_sun'))
                                 ->cron('0', '0', '*', '*', '0'),
-                            CronPresetAction::make('exclude_monthly')
+                            CronPresetAction::make('monthly')
                                 ->label(trans('server/schedule.time.monthly'))
                                 ->cron('0', '0', '1', '*', '*'),
-                            CronPresetAction::make('exclude_every_x_minutes')
+                            CronPresetAction::make('every_x_minutes')
                                 ->label(trans('server/schedule.time.every_min'))
                                 ->color(fn (Get $get) => str($get('cron_minute'))->startsWith('*/')
                                                     && $get('cron_hour') == '*'
@@ -147,7 +148,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_hours')
+                            CronPresetAction::make('every_x_hours')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && str($get('cron_hour'))->startsWith('*/')
                                                     && $get('cron_day_of_month') == '*'
@@ -169,7 +170,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_days')
+                            CronPresetAction::make('every_x_days')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && str($get('cron_day_of_month'))->startsWith('*/')
@@ -191,7 +192,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*');
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_months')
+                            CronPresetAction::make('every_x_months')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && $get('cron_day_of_month') == '1'
@@ -213,7 +214,7 @@ class ScheduleResource extends Resource
                                     $set('cron_month', '*/' . $data['x']);
                                     $set('cron_day_of_week', '*');
                                 }),
-                            CronPresetAction::make('exclude_every_x_day_of_week')
+                            CronPresetAction::make('every_x_day_of_week')
                                 ->color(fn (Get $get) => $get('cron_minute') == '0'
                                                     && $get('cron_hour') == '0'
                                                     && $get('cron_day_of_month') == '*'

app/Filament/Server/Resources/Subusers/SubuserResource.php

@@ -79,15 +79,15 @@ class SubuserResource extends Resource
 
             foreach ($data['permissions'] as $permission) {
                 $options[$permission] = str($permission)->headline();
-                $descriptions[$permission] = trans($data['translation_prefix']. '.' . $data['name'] . '_' . str($permission)->replace('-', '_'));
+                $descriptions[$permission] = trans('server/user.permissions.' . $data['name'] . '_' . str($permission)->replace('-', '_'));
                 $permissionsArray[$data['name']][] = $permission;
             }
 
             $tabs[] = Tab::make($data['name'])
-                ->label(trans($data['translation_prefix']. '.' . $data['name'] . '_title'))
+                ->label(str($data['name'])->headline())
                 ->schema([
                     Section::make()
-                        ->description(trans($data['translation_prefix']. '.' . $data['name'] . '_desc'))
+                        ->description(trans('server/user.permissions.' . $data['name'] . '_desc'))
                         ->icon($data['icon'])
                         ->contained(false)
                         ->schema([
@@ -123,6 +123,18 @@ class SubuserResource extends Resource
                     ),
             ])
             ->recordActions([
+                DeleteAction::make()
+                    ->label(trans('server/user.delete'))
+                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
+                    ->successNotificationTitle(null)
+                    ->action(function (Subuser $subuser, SubuserDeletionService $subuserDeletionService) use ($server) {
+                        $subuserDeletionService->handle($subuser, $server);
+
+                        Notification::make()
+                            ->title(trans('server/user.notification_delete'))
+                            ->success()
+                            ->send();
+                    }),
                 EditAction::make()
                     ->label(trans('server/user.edit'))
                     ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
@@ -167,7 +179,7 @@ class SubuserResource extends Resource
                                     ])
                                     ->formatStateUsing(fn (Subuser $subuser) => $subuser->user->email),
                                 Actions::make([
-                                    Action::make('exclude_assignAll')
+                                    Action::make('assignAll')
                                         ->label(trans('server/user.assign_all'))
                                         ->action(function (Set $set) use ($permissionsArray) {
                                             $permissions = $permissionsArray;
@@ -202,19 +214,6 @@ class SubuserResource extends Resource
 
                         return $data;
                     }),
-                DeleteAction::make()
-                    ->label(trans('server/user.delete'))
-                    ->hidden(fn (Subuser $subuser) => user()?->id === $subuser->user->id)
-                    ->authorize(fn () => user()?->can(SubuserPermission::UserDelete, $server))
-                    ->successNotificationTitle(null)
-                    ->action(function (Subuser $subuser, SubuserDeletionService $subuserDeletionService) use ($server) {
-                        $subuserDeletionService->handle($subuser, $server);
-
-                        Notification::make()
-                            ->title(trans('server/user.notification_delete'))
-                            ->success()
-                            ->send();
-                    }),
             ])
             ->toolbarActions([
                 CreateAction::make('invite')
@@ -244,7 +243,7 @@ class SubuserResource extends Resource
                                     ])
                                     ->required(),
                                 Actions::make([
-                                    Action::make('exclude_assignAll')
+                                    Action::make('assignAll')
                                         ->label(trans('server/user.assign_all'))
                                         ->action(function (Set $set, Get $get) use ($permissionsArray) {
                                             $permissions = $permissionsArray;

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

@@ -13,17 +13,10 @@ use Illuminate\Auth\SessionGuard;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\RateLimiter;
-use Symfony\Component\HttpKernel\Exception\TooManyRequestsHttpException;
 use Throwable;
 
 class AccountController extends ClientApiController
 {
-    /**
-     * The number of seconds that must elapse before the email change throttle resets.
-     */
-    private const EMAIL_UPDATE_THROTTLE = 60 * 60 * 24;
-
     /**
      * AccountController constructor.
      */
@@ -70,22 +63,10 @@ class AccountController extends ClientApiController
      */
     public function updateEmail(UpdateEmailRequest $request): JsonResponse
     {
-        $user = $request->user();
-
-        // Only allow a user to change their email three times in the span
-        // of 24 hours. This prevents malicious users from trying to find
-        // existing accounts in the system by constantly changing their email.
-        if (RateLimiter::tooManyAttempts($key = "user:update-email:{$user->uuid}", 3)) {
-            throw new TooManyRequestsHttpException(message: 'Your email address has been changed too many times today. Please try again later.');
-        }
-
-        $original = $user->email;
-
-        if (mb_strtolower($original) !== mb_strtolower($request->validated('email'))) {
-            RateLimiter::hit($key, self::EMAIL_UPDATE_THROTTLE);
-
-            $this->updateService->handle($user, $request->validated());
+        $original = $request->user()->email;
+        $this->updateService->handle($request->user(), $request->validated());
 
+        if ($original !== $request->input('email')) {
             Activity::event('user:account.email-changed')
                 ->property(['old' => $original, 'new' => $request->input('email')])
                 ->log();
@@ -104,9 +85,7 @@ class AccountController extends ClientApiController
      */
     public function updatePassword(UpdatePasswordRequest $request): JsonResponse
     {
-        $user = Activity::event('user:account.password-changed')->transaction(function () use ($request) {
-            return $this->updateService->handle($request->user(), $request->validated());
-        });
+        $user = $this->updateService->handle($request->user(), $request->validated());
 
         $guard = $this->manager->guard();
         // If you do not update the user in the session you'll end up working with a
@@ -119,6 +98,8 @@ class AccountController extends ClientApiController
             $guard->logoutOtherDevices($request->input('password'));
         }
 
+        Activity::event('user:account.password-changed')->log();
+
         return new JsonResponse([], Response::HTTP_NO_CONTENT);
     }
 }

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

@@ -87,7 +87,7 @@ class BackupController extends ClientApiController
         }
 
         $backup = Activity::event('server:backup.start')->transaction(function ($log) use ($action, $server, $request) {
-            $server->backups()->lockForUpdate()->count();
+            $server->backups()->lockForUpdate();
 
             $backup = $action->handle($server, $request->input('name'));
 

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

@@ -60,7 +60,7 @@ class DatabaseController extends ClientApiController
     public function store(StoreDatabaseRequest $request, Server $server): array
     {
         $database = Activity::event('server:database.create')->transaction(function ($log) use ($request, $server) {
-            $server->databases()->lockForUpdate()->count();
+            $server->databases()->lockForUpdate();
 
             $database = $this->deployDatabaseService->handle($server, $request->validated());
 
@@ -87,12 +87,15 @@ class DatabaseController extends ClientApiController
      */
     public function rotatePassword(RotatePasswordRequest $request, Server $server, Database $database): array
     {
+        $this->managementService->rotatePassword($database);
+        $database->refresh();
+
         Activity::event('server:database.rotate-password')
             ->subject($database)
             ->property('name', $database->database)
-            ->transaction(fn () => $this->managementService->rotatePassword($database));
+            ->log();
 
-        return $this->fractal->item($database->refresh())
+        return $this->fractal->item($database)
             ->parseIncludes(['password'])
             ->transformWith($this->getTransformer(DatabaseTransformer::class))
             ->toArray();

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

@@ -77,7 +77,7 @@ class FileController extends ClientApiController
             ->property('file', $request->get('file'))
             ->log();
 
-        return new Response(convert_to_utf8($response), Response::HTTP_OK, ['Content-Type' => 'text/plain; charset=utf-8']);
+        return new Response($response, Response::HTTP_OK, ['Content-Type' => 'text/plain']);
     }
 
     /**

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

@@ -87,13 +87,13 @@ class StartupController extends ClientApiController
 
         $startup = $this->startupCommandService->handle($server);
 
-        if ($original !== $request->input('value')) {
+        if ($variable->env_variable !== $request->input('value')) {
             Activity::event('server:startup.edit')
                 ->subject($variable)
                 ->property([
                     'variable' => $variable->env_variable,
                     'old' => $original,
-                    'new' => $request->input('value') ?? '',
+                    'new' => $request->input('value'),
                 ])
                 ->log();
         }

app/Http/Controllers/Api/Remote/Backups/BackupRemoteUploadController.php

@@ -56,7 +56,7 @@ class BackupRemoteUploadController extends Controller
         /** @var Server $server */
         $server = $model->server;
         if ($server->node_id !== $node->id) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
+            throw new HttpForbiddenException('You do not have permission to access that backup.');
         }
 
         // Prevent backups that have already been completed from trying to
@@ -91,7 +91,7 @@ class BackupRemoteUploadController extends Controller
         }
 
         // Execute the CreateMultipartUpload request
-        $result = $client->execute($client->getCommand('CreateMultipartUpload', $params));
+        $result = $adapter->executeS3Command($client->getCommand('CreateMultipartUpload', $params));
 
         // Get the UploadId from the CreateMultipartUpload request, this is needed to create
         // the other presigned urls.

app/Http/Controllers/Api/Remote/Backups/BackupStatusController.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers\Api\Remote\Backups;
 
-use App\Events\Server\BackupCompleted;
 use App\Exceptions\DisplayException;
 use App\Exceptions\Http\HttpForbiddenException;
 use App\Extensions\Backups\BackupManager;
@@ -48,7 +47,7 @@ class BackupStatusController extends Controller
         /** @var Server $server */
         $server = $model->server;
         if ($server->node_id !== $node->id) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
+            throw new HttpForbiddenException('You do not have permission to access that backup.');
         }
 
         if ($model->is_successful) {
@@ -80,8 +79,6 @@ class BackupStatusController extends Controller
             }
         });
 
-        event(new BackupCompleted($model));
-
         return new JsonResponse([], JsonResponse::HTTP_NO_CONTENT);
     }
 
@@ -100,11 +97,6 @@ class BackupStatusController extends Controller
         /** @var Backup $model */
         $model = Backup::query()->where('uuid', $backup)->firstOrFail();
 
-        $node = $request->attributes->get('node');
-        if (!$model->server->node->is($node)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $model->server->update(['status' => null]);
 
         Activity::event($request->boolean('successful') ? 'server:backup.restore-complete' : 'server.backup.restore-failed')
@@ -146,7 +138,7 @@ class BackupStatusController extends Controller
 
         $client = $adapter->getClient();
         if (!$successful) {
-            $client->execute($client->getCommand('AbortMultipartUpload', $params));
+            $adapter->executeS3Command($client->getCommand('AbortMultipartUpload', $params));
 
             return;
         }
@@ -157,7 +149,7 @@ class BackupStatusController extends Controller
         ];
 
         if (is_null($parts)) {
-            $params['MultipartUpload']['Parts'] = $client->execute($client->getCommand('ListParts', $params))['Parts'];
+            $params['MultipartUpload']['Parts'] = $adapter->executeS3Command($client->getCommand('ListParts', $params))['Parts'];
         } else {
             foreach ($parts as $part) {
                 $params['MultipartUpload']['Parts'][] = [
@@ -167,6 +159,6 @@ class BackupStatusController extends Controller
             }
         }
 
-        $client->execute($client->getCommand('CompleteMultipartUpload', $params));
+        $adapter->executeS3Command($client->getCommand('CompleteMultipartUpload', $params));
     }
 }

app/Http/Controllers/Api/Remote/Servers/ServerContainersController.php

@@ -3,23 +3,18 @@
 namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ContainerStatus;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Server;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 
 class ServerContainersController extends Controller
 {
     /**
      * Updates the server container's status on the Panel
      */
-    public function status(Request $request, Server $server): JsonResponse
+    public function status(ServerRequest $request, Server $server): JsonResponse
     {
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $status = ContainerStatus::tryFrom($request->json('data.new_state')) ?? ContainerStatus::Missing;
 
         cache()->put("servers.$server->uuid.status", $status, now()->addHour());

app/Http/Controllers/Api/Remote/Servers/ServerDetailsController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ServerState;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Facades\Activity;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Http\Resources\Daemon\ServerConfigurationCollection;
 use App\Models\ActivityLog;
 use App\Models\Backup;
@@ -17,7 +17,6 @@ use Illuminate\Database\ConnectionInterface;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Throwable;
-use Webmozart\Assert\Assert;
 
 class ServerDetailsController extends Controller
 {
@@ -34,21 +33,8 @@ class ServerDetailsController extends Controller
      * Returns details about the server that allows daemon to self-recover and ensure
      * that the state of the server matches the Panel at all times.
      */
-    public function __invoke(Request $request, Server $server): JsonResponse
+    public function __invoke(ServerRequest $request, Server $server): JsonResponse
     {
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        $transfer = $server->transfer;
-
-        // If the server is being transferred allow either node to request information about
-        // the server. If the server is not being transferred only the target node is allowed
-        // to fetch these details.
-        $valid = $transfer ? $node->id === $transfer->old_node || $node->id === $transfer->new_node : $node->id === $server->node_id;
-
-        if (!$valid) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         return new JsonResponse([
             'settings' => $this->configurationStructureService->handle($server),
             'process_configuration' => $this->eggConfigurationService->handle($server),

app/Http/Controllers/Api/Remote/Servers/ServerInstallController.php

@@ -4,13 +4,12 @@ namespace App\Http\Controllers\Api\Remote\Servers;
 
 use App\Enums\ServerState;
 use App\Events\Server\Installed as ServerInstalled;
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Exceptions\Model\DataValidationException;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Api\Remote\InstallationDataRequest;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Server;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
 class ServerInstallController extends Controller
@@ -18,18 +17,12 @@ class ServerInstallController extends Controller
     /**
      * Returns installation information for a server.
      */
-    public function index(Request $request, Server $server): JsonResponse
+    public function index(ServerRequest $request, Server $server): JsonResponse
     {
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
-        $egg = $server->egg;
-
         return new JsonResponse([
-            'container_image' => $egg->copy_script_container,
-            'entrypoint' => $egg->copy_script_entry,
-            'script' => $egg->copy_script_install,
+            'container_image' => $server->egg->copy_script_container,
+            'entrypoint' => $server->egg->copy_script_entry,
+            'script' => $server->egg->copy_script_install,
         ]);
     }
 
@@ -42,10 +35,6 @@ class ServerInstallController extends Controller
     {
         $status = null;
 
-        if (!$server->node->is($request->attributes->get('node'))) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $successful = $request->boolean('successful');
 
         // Make sure the type of failure is accurate

app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php

@@ -2,20 +2,17 @@
 
 namespace App\Http\Controllers\Api\Remote\Servers;
 
-use App\Exceptions\Http\HttpForbiddenException;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Api\Remote\ServerRequest;
 use App\Models\Allocation;
-use App\Models\Node;
 use App\Models\Server;
 use App\Repositories\Daemon\DaemonServerRepository;
 use Illuminate\Database\ConnectionInterface;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
 use Throwable;
-use Webmozart\Assert\Assert;
 
 class ServerTransferController extends Controller
 {
@@ -32,22 +29,13 @@ class ServerTransferController extends Controller
      *
      * @throws Throwable
      */
-    public function failure(Request $request, Server $server): JsonResponse
+    public function failure(ServerRequest $request, Server $server): JsonResponse
     {
         $transfer = $server->transfer;
         if (is_null($transfer)) {
             throw new ConflictHttpException('Server is not being transferred.');
         }
 
-        /* @var Node $node */
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        // Either node can tell the panel that the transfer has failed. Only the new node
-        // can tell the panel that it was successful.
-        if (!$node->is($transfer->newNode) && !$node->is($transfer->oldNode)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         $this->connection->transaction(function () use ($transfer) {
             $transfer->forceFill(['successful' => false])->saveOrFail();
 
@@ -65,22 +53,13 @@ class ServerTransferController extends Controller
      *
      * @throws Throwable
      */
-    public function success(Request $request, Server $server): JsonResponse
+    public function success(ServerRequest $request, Server $server): JsonResponse
     {
         $transfer = $server->transfer;
         if (is_null($transfer)) {
             throw new ConflictHttpException('Server is not being transferred.');
         }
 
-        /* @var Node $node */
-        Assert::isInstanceOf($node = $request->attributes->get('node'), Node::class);
-
-        // Only the new node communicates a successful state to the panel, so we should
-        // not allow the old node to hit this endpoint.
-        if (!$node->is($transfer->newNode)) {
-            throw new HttpForbiddenException('Requesting node does not have permission to access this server.');
-        }
-
         /** @var Server $server */
         $server = $this->connection->transaction(function () use ($server, $transfer) {
             $data = [];

app/Http/Middleware/RequireTwoFactorAuthentication.php

@@ -23,7 +23,7 @@ class RequireTwoFactorAuthentication
      * order to perform actions. If so, we check the level at which it is required (all users
      * or just admins) and then check if the user has enabled it for their account.
      *
-     * @throws TwoFactorAuthRequiredException
+     * @throws \App\Exceptions\Http\TwoFactorAuthRequiredException
      */
     public function handle(Request $request, \Closure $next): mixed
     {

app/Http/Middleware/SetSecurityHeaders.php

@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Http\Middleware;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Response;
-
-class SetSecurityHeaders
-{
-    /**
-     * Ideally we move away from X-Frame-Options/X-XSS-Protection and implement a
-     * proper standard CSP, but I can guarantee that will break for a lot of folks
-     * using custom plugins and who knows what image embeds.
-     *
-     * We'll circle back to that at a later date when it can be more fully controlled
-     * by the admin to support those cases without too much trouble.
-     *
-     * @var array<string, string>
-     */
-    protected static array $headers = [
-        'X-Frame-Options' => 'DENY',
-        'X-Content-Type-Options' => 'nosniff',
-        'X-XSS-Protection' => '1; mode=block',
-        'Referrer-Policy' => 'no-referrer-when-downgrade',
-    ];
-
-    /**
-     * Enforces some basic security headers on all responses returned by the software.
-     * If a header has already been set in another location within the code it will be
-     * skipped over here.
-     *
-     * @param  (\Closure(mixed): Response)  $next
-     */
-    public function handle(Request $request, \Closure $next): mixed
-    {
-        $response = $next($request);
-
-        foreach (static::$headers as $key => $value) {
-            if (!$response->headers->has($key)) {
-                $response->headers->set($key, $value);
-            }
-        }
-
-        return $response;
-    }
-}

app/Http/Middleware/VerifyCsrfToken.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Foundation\Http\Middleware\PreventRequestForgery as BaseMiddleware;
+use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
 
-class PreventRequestForgery extends BaseMiddleware
+class VerifyCsrfToken extends BaseVerifier
 {
     /**
      * The URIs that should be excluded from CSRF verification. These are

app/Http/Requests/Api/Application/ApplicationApiRequest.php

@@ -87,7 +87,7 @@ abstract class ApplicationApiRequest extends FormRequest
         $value = $this->route()->parameter($key);
 
         Assert::isInstanceOf($value, $expect);
-        Assert::isInstanceOf($value, Model::class); // @phpstan-ignore staticMethod.alreadyNarrowedType
+        Assert::isInstanceOf($value, Model::class);
         Assert::true($value->exists);
 
         /* @var T $value */

app/Http/Requests/Api/Remote/InstallationDataRequest.php

@@ -2,15 +2,8 @@
 
 namespace App\Http\Requests\Api\Remote;
 
-use Illuminate\Foundation\Http\FormRequest;
-
-class InstallationDataRequest extends FormRequest
+class InstallationDataRequest extends ServerRequest
 {
-    public function authorize(): bool
-    {
-        return true;
-    }
-
     /**
      * @return array<string, string|string[]>
      */

app/Http/Requests/Api/Remote/ServerRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Requests\Api\Remote;
+
+use App\Models\Node;
+use App\Models\Server;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ServerRequest extends FormRequest
+{
+    public function authorize(): bool
+    {
+        /** @var Node $node */
+        $node = $this->attributes->get('node');
+
+        /** @var ?Server $server */
+        $server = $this->route()->parameter('server');
+
+        if ($server) {
+            if ($server->transfer) {
+                return $server->transfer->old_node === $node->id || $server->transfer->new_node === $node->id;
+            }
+
+            return $server->node_id === $node->id;
+        }
+
+        return false;
+    }
+}

app/Http/Responses/LoginResponse.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Http\Responses;
-
-use App\Enums\CustomizationKey;
-use App\Models\User;
-use Filament\Auth\Http\Responses\Contracts\LoginResponse as LoginResponseContract;
-use Filament\Facades\Filament;
-use Illuminate\Http\RedirectResponse;
-use Livewire\Features\SupportRedirects\Redirector;
-
-class LoginResponse implements LoginResponseContract
-{
-    public function toResponse($request): RedirectResponse|Redirector
-    {
-        /** @var User|null $user */
-        $user = Filament::auth()->user();
-
-        if ($user?->getCustomization(CustomizationKey::RedirectToAdmin) && $user->canAccessPanel(Filament::getPanel('admin'))) {
-            return redirect()->intended(Filament::getPanel('admin')->getUrl());
-        }
-
-        return redirect()->intended(Filament::getUrl());
-    }
-}

app/Jobs/Job.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Jobs;
+
+use Illuminate\Bus\Queueable;
+
+abstract class Job
+{
+    /*
+    |--------------------------------------------------------------------------
+    | Queueable Jobs
+    |--------------------------------------------------------------------------
+    |
+    | This job base class provides a central location to place any logic that
+    | is shared across all of your jobs. The trait included with the class
+    | provides access to the "onQueue" and "delay" queue helper methods.
+    |
+    */
+
+    use Queueable;
+}

app/Jobs/Plugin/InstallPlugin.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Jobs\Plugin;
-
-use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
-use App\Models\Plugin;
-use App\Models\User;
-use App\Services\Helpers\PluginService;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class InstallPlugin implements ShouldBeUnique, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function __construct(public User $user, public Plugin $plugin) {}
-
-    public function handle(PluginService $pluginService): void
-    {
-        try {
-            $pluginService->installPlugin($this->plugin, !$this->plugin->isTheme() || !$pluginService->hasThemePluginEnabled());
-
-            Notification::make()
-                ->success()
-                ->title(trans('admin/plugin.notifications.installed'))
-                ->body($this->plugin->name)
-                ->actions([
-                    Action::make('goto_plugins')
-                        ->label(trans('admin/plugin.notifications.goto_plugins'))
-                        ->url(ListPlugins::getUrl(panel: 'admin')),
-                ])
-                ->sendToDatabase($this->user);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->danger()
-                ->title(trans('admin/plugin.notifications.install_error'))
-                ->body($exception->getMessage())
-                ->sendToDatabase($this->user);
-        }
-    }
-
-    public function uniqueId(): string
-    {
-        return 'plugin:install:' . $this->plugin->id;
-    }
-}

app/Jobs/Plugin/UninstallPlugin.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Jobs\Plugin;
-
-use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
-use App\Models\Plugin;
-use App\Models\User;
-use App\Services\Helpers\PluginService;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class UninstallPlugin implements ShouldBeUnique, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function __construct(public User $user, public Plugin $plugin) {}
-
-    public function handle(PluginService $pluginService): void
-    {
-        try {
-            $pluginService->uninstallPlugin($this->plugin);
-
-            Notification::make()
-                ->success()
-                ->title(trans('admin/plugin.notifications.uninstalled'))
-                ->body($this->plugin->name)
-                ->actions([
-                    Action::make('goto_plugins')
-                        ->label(trans('admin/plugin.notifications.goto_plugins'))
-                        ->url(ListPlugins::getUrl(panel: 'admin')),
-                ])
-                ->sendToDatabase($this->user);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->danger()
-                ->title(trans('admin/plugin.notifications.uninstall_error'))
-                ->body($exception->getMessage())
-                ->sendToDatabase($this->user);
-        }
-    }
-
-    public function uniqueId(): string
-    {
-        return 'plugin:uninstall:' . $this->plugin->id;
-    }
-}

app/Jobs/Plugin/UpdatePlugin.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Jobs\Plugin;
-
-use App\Filament\Admin\Resources\Plugins\Pages\ListPlugins;
-use App\Models\Plugin;
-use App\Models\User;
-use App\Services\Helpers\PluginService;
-use Exception;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-
-class UpdatePlugin implements ShouldBeUnique, ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public function __construct(public User $user, public Plugin $plugin) {}
-
-    public function handle(PluginService $pluginService): void
-    {
-        try {
-            $pluginService->updatePlugin($this->plugin);
-
-            Notification::make()
-                ->success()
-                ->title(trans('admin/plugin.notifications.updated'))
-                ->body($this->plugin->name)
-                ->actions([
-                    Action::make('goto_plugins')
-                        ->label(trans('admin/plugin.notifications.goto_plugins'))
-                        ->url(ListPlugins::getUrl(panel: 'admin')),
-                ])
-                ->sendToDatabase($this->user);
-        } catch (Exception $exception) {
-            report($exception);
-
-            Notification::make()
-                ->danger()
-                ->title(trans('admin/plugin.notifications.update_error'))
-                ->body($exception->getMessage())
-                ->sendToDatabase($this->user);
-        }
-    }
-
-    public function uniqueId(): string
-    {
-        return 'plugin:update:' . $this->plugin->id;
-    }
-}

app/Jobs/ProcessWebhook.php

@@ -7,7 +7,6 @@ use App\Models\WebhookConfiguration;
 use Exception;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -35,12 +34,6 @@ class ProcessWebhook implements ShouldQueue
             $data = reset($data);
         }
 
-        if ($data instanceof Arrayable) {
-            $data = $data->toArray();
-        } elseif (is_object($data)) {
-            $data = get_object_vars($data);
-        }
-
         if (is_string($data)) {
             $data = Arr::wrap(json_decode($data, true) ?? []);
         }
@@ -67,7 +60,7 @@ class ProcessWebhook implements ShouldQueue
             $headers = [];
 
             if ($this->webhookConfiguration->type === WebhookType::Regular) {
-                foreach ($this->webhookConfiguration->headers ?? [] as $key => $value) {
+                foreach ($this->webhookConfiguration->headers as $key => $value) {
                     $headers[$key] = $this->webhookConfiguration->replaceVars($data, $value);
                 }
             }

app/Jobs/RevokeSftpAccessJob.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Jobs;
-
-use App\Models\Node;
-use App\Models\Server;
-use App\Repositories\Daemon\DaemonServerRepository;
-use Illuminate\Contracts\Queue\ShouldBeUnique;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Queue\Queueable;
-use Illuminate\Http\Client\ConnectionException;
-use Illuminate\Queue\Attributes\DeleteWhenMissingModels;
-use Illuminate\Queue\Attributes\WithoutRelations;
-
-/**
- * Revokes all SFTP access for a user on a given node or for a specific server.
- */
-#[DeleteWhenMissingModels]
-class RevokeSftpAccessJob implements ShouldBeUnique, ShouldQueue
-{
-    use Queueable;
-
-    public int $tries = 3;
-
-    public int $maxExceptions = 1;
-
-    public function __construct(
-        public readonly string $user,
-        #[WithoutRelations]
-        public readonly Server|Node $target,
-    ) {}
-
-    public function uniqueId(): string
-    {
-        $target = $this->target instanceof Node ? "node:{$this->target->uuid}" : "server:{$this->target->uuid}";
-
-        return "revoke-sftp:{$this->user}:{$target}";
-    }
-
-    public function handle(DaemonServerRepository $repository): void
-    {
-        try {
-            if ($this->target instanceof Server) {
-                $repository->setServer($this->target)->deauthorize($this->user);
-            } else {
-                $repository->setNode($this->target)->deauthorize($this->user);
-            }
-        } catch (ConnectionException) {
-            // Keep retrying this job with a longer and longer backoff until we hit three
-            // attempts at which point we stop and will assume the node is fully offline
-            // and we are just wasting time.
-            $this->release($this->attempts() * 10);
-        }
-    }
-}

app/Jobs/Schedule/RunTaskJob.php

@@ -7,7 +7,6 @@ use App\Jobs\Job;
 use App\Models\Task;
 use Carbon\CarbonImmutable;
 use Exception;
-use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Queue\InteractsWithQueue;
@@ -15,10 +14,9 @@ use Illuminate\Queue\SerializesModels;
 use InvalidArgumentException;
 use Throwable;
 
-class RunTaskJob implements ShouldQueue
+class RunTaskJob extends Job implements ShouldQueue
 {
     use InteractsWithQueue;
-    use Queueable;
     use SerializesModels;
 
     /**

app/Listeners/RevocationListener.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Listeners;
-
-use App\Events\User\Deleting;
-use App\Events\User\PasswordChanged;
-use App\Jobs\RevokeSftpAccessJob;
-use App\Models\Node;
-use Illuminate\Database\Eloquent\Collection;
-
-class RevocationListener
-{
-    public function handle(Deleting|PasswordChanged $event): void
-    {
-        $user = $event->user;
-
-        // Look at all of the nodes that a user is associated with and trigger a job
-        // that disconnects them from websockets and SFTP.
-        Node::query()
-            ->whereIn('nodes.id', $user->directAccessibleServers()->select('servers.node_id')->distinct())
-            ->chunk(50, function (Collection $nodes) use ($user) {
-                $nodes->each(fn (Node $node) => RevokeSftpAccessJob::dispatch($user->uuid, $node));
-            });
-    }
-}

app/Listeners/Server/BackupCompletedListener.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace App\Listeners\Server;
-
-use App\Events\Server\BackupCompleted;
-use App\Filament\Server\Resources\Backups\Pages\ListBackups;
-use App\Notifications\BackupCompleted as BackupCompletedNotification;
-use Filament\Actions\Action;
-use Filament\Notifications\Notification;
-
-class BackupCompletedListener
-{
-    public function handle(BackupCompleted $event): void
-    {
-        $event->backup->loadMissing('server');
-        $event->backup->server->loadMissing('user');
-
-        $locale = $event->backup->server->user->language ?? 'en';
-
-        Notification::make()
-            ->status($event->backup->is_successful ? 'success' : 'danger')
-            ->title(trans('notifications.backup_' . ($event->backup->is_successful ? 'completed' : 'failed'), locale: $locale))
-            ->body(trans('notifications.backup_body', ['name' => $event->backup->name, 'server' => $event->backup->server->name], $locale))
-            ->actions([
-                Action::make('exclude_view')
-                    ->button()
-                    ->label(trans('notifications.view_backups', locale: $locale))
-                    ->markAsRead()
-                    ->url(fn () => ListBackups::getUrl(panel: 'server', tenant: $event->backup->server)),
-            ])
-            ->sendToDatabase($event->backup->server->user);
-
-        if (config()->get('panel.email.send_backup_completed_notification', true)) {
-            $event->backup->server->user->notify(new BackupCompletedNotification($event->backup));
-        }
-    }
-}

app/Listeners/Server/SubUserAddedListener.php

@@ -29,8 +29,6 @@ class SubUserAddedListener
             ])
             ->sendToDatabase($event->subuser->user);
 
-        if (config('panel.email.send_added_to_server_notification', true)) {
-            $event->subuser->user->notify(new AddedToServer($event->subuser->server));
-        }
+        $event->subuser->user->notify(new AddedToServer($event->subuser->server));
     }
 }