chore: update SECURITY.md

ref; https://github.com/pterodactyl/panel/pull/5074 which targets the wrong branch
ui(admin): better handling of manual HTML rendering
2026-02-08 11:19:53 +03:00 · 2024-04-16 15:17:36 -06:00 · 2024-04-11 10:47:00 -06:00 · 2024-04-11 10:42:18 -06:00 · 2024-04-10 18:13:25 -06:00 · 2024-04-10 17:38:09 -06:00
2259 changed files with 76753 additions and 70160 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,29 +0,0 @@
-**.DS_Store
-.env
-.devcontainer
-.dockerignore
-.editorconfig
-.git
-.github
-**.gitignore
-.php-cs-fixer.dist.php
-.prettierrc.json
-.vscode
-Dockerfile
-bounties.md
-compose.yml
-contributing.md
-contributor_license_agreement.md
-database/database.sqlite
-docker/README.md
-node_modules
-phpstan.neon
-phpunit.xml
-readme.md
-storage/debugbar/*.json
-storage/framework/cache/data/*
-storage/framework/sessions/*
-storage/framework/testing
-storage/framework/views/*.php
-storage/logs/*.log
-vendor
--- a/.env.ci
+++ b/.env.ci
@@ -0,0 +1,20 @@
+APP_ENV=testing
+APP_DEBUG=true
+APP_KEY=SomeRandomString3232RandomString
+APP_THEME=pterodactyl
+APP_TIMEZONE=UTC
+APP_URL=http://localhost/
+APP_ENVIRONMENT_ONLY=true
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_DATABASE=testing
+DB_USERNAME=root
+DB_PASSWORD=
+
+CACHE_DRIVER=array
+SESSION_DRIVER=array
+MAIL_DRIVER=array
+QUEUE_DRIVER=sync
+
+HASHIDS_SALT=test123
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,44 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=
-APP_URL=http://panel.test
-APP_INSTALLED=false
+APP_THEME=pterodactyl
+APP_TIMEZONE=UTC
+APP_URL=http://panel.example.com
 APP_LOCALE=en
+APP_ENVIRONMENT_ONLY=true
+
+LOG_CHANNEL=daily
+LOG_DEPRECATIONS_CHANNEL=null
+LOG_LEVEL=debug
+
+DB_CONNECTION=mysql
+DB_HOST=127.0.0.1
+DB_PORT=3306
+DB_DATABASE=panel
+DB_USERNAME=pterodactyl
+DB_PASSWORD=
+
+REDIS_HOST=127.0.0.1
+REDIS_PASSWORD=null
+REDIS_PORT=6379
+
+CACHE_DRIVER=file
+QUEUE_CONNECTION=redis
+SESSION_DRIVER=file
+
+HASHIDS_SALT=
+HASHIDS_LENGTH=8
+
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.example.com
+MAIL_PORT=25
+MAIL_USERNAME=
+MAIL_PASSWORD=
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=no-reply@example.com
+MAIL_FROM_NAME="Pterodactyl Panel"
+# You should set this to your domain to prevent it defaulting to 'localhost', causing
+# mail servers such as Gmail to reject your mail.
+#
+# @see: https://github.com/pterodactyl/panel/pull/3110
+# MAIL_EHLO_DOMAIN=panel.example.com
--- a/.eslintignore
+++ b/.eslintignore
@@ -0,0 +1,6 @@
+public
+node_modules
+resources/views
+babel.config.js
+tailwind.config.js
+webpack.config.js
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -0,0 +1,51 @@
+/** @type {import('eslint').Linter.Config} */
+module.exports = {
+    parser: '@typescript-eslint/parser',
+    parserOptions: {
+        ecmaVersion: 6,
+        ecmaFeatures: {
+            jsx: true,
+        },
+        project: './tsconfig.json',
+        tsconfigRootDir: './',
+    },
+    settings: {
+        react: {
+            pragma: 'React',
+            version: 'detect',
+        },
+        linkComponents: [
+            { name: 'Link', linkAttribute: 'to' },
+            { name: 'NavLink', linkAttribute: 'to' },
+        ],
+    },
+    env: {
+        browser: true,
+        es6: true,
+    },
+    plugins: ['react', 'react-hooks', 'prettier', '@typescript-eslint'],
+    extends: [
+        // 'standard',
+        'eslint:recommended',
+        'plugin:react/recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:jest-dom/recommended',
+    ],
+    rules: {
+        eqeqeq: 'error',
+        'prettier/prettier': ['error', {}, { usePrettierrc: true }],
+        // TypeScript can infer this significantly better than eslint ever can.
+        'react/prop-types': 0,
+        'react/display-name': 0,
+        '@typescript-eslint/no-explicit-any': 0,
+        '@typescript-eslint/no-non-null-assertion': 0,
+        // This setup is required to avoid a spam of errors when running eslint about React being
+        // used before it is defined.
+        //
+        // @see https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/docs/rules/no-use-before-define.md#how-to-use
+        'no-use-before-define': 0,
+        '@typescript-eslint/no-use-before-define': 'warn',
+        '@typescript-eslint/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+        '@typescript-eslint/ban-ts-comment': ['error', { 'ts-expect-error': 'allow-with-description' }],
+    },
+};
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1 @@
-github: pelican-dev
-custom: [https://hub.pelican.dev/donors]
+github: [matthewpi]
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -5,23 +5,23 @@ body:
 - type: markdown
  attributes:
    value: |
-      Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our Discord Server.
+      Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](https://discord.gg/pterodactyl).

- type: textarea
+- type: textarea      
  attributes:
    label: Current Behavior
    description: Please provide a clear & concise description of the issue.
  validations:
    required: true

- type: textarea
+- type: textarea      
  attributes:
    label: Expected Behavior
    description: Please describe what you expected to happen.
  validations:
    required: true

- type: textarea
+- type: textarea      
  attributes:
    label: Steps to Reproduce
    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will result in this issue being closed.
@@ -33,6 +33,7 @@ body:
  attributes:
    label: Panel Version
    description: Version number of your Panel (latest is not a version)
+    placeholder: 1.4.0
  validations:
    required: true

@@ -41,22 +42,23 @@ body:
  attributes:
    label: Wings Version
    description: Version number of your Wings (latest is not a version)
+    placeholder: 1.4.2
  validations:
    required: true
-
+    
 - type: input
  id: egg-details
  attributes:
    label: Games and/or Eggs Affected
    description: Please include the specific game(s) or egg(s) you are running into this bug with.
    placeholder: Minecraft (Paper), Minecraft (Forge)
-
+ 
 - type: input
  id: docker-image
  attributes:
    label: Docker Image
    description: The specific Docker image you are using for the game(s) above.
-    placeholder: ghcr.io/pelican-dev/yolks:java_17
+    placeholder: ghcr.io/pterodactyl/yolks:java_17

 - type: textarea
  id: panel-logs
@@ -64,17 +66,18 @@ body:
    label: Error Logs
    description: |
      Run the following command to collect logs on your system.
-      Wings: `sudo wings diagnostics --hastebin-url=https://logs.pelican.dev`
-      Panel: `tail -n 300 /var/www/pelican/storage/logs/laravel-$(date +%F).log | curl --data-binary @- https://logs.pelican.dev`
-    placeholder: "https://logs.pelican.dev/c17f750e"
+      
+      Wings: `sudo wings diagnostics`
+      Panel: `tail -n 150 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc pteropaste.com 99`
+    placeholder: "https://pteropaste.com/a1h6z"
    render: bash
  validations:
    required: false
-
+    
 - type: checkboxes
  attributes:
    label: Is there an existing issue for this?
-    description: Please [search here](https://github.com/pelican-dev/panel/issues) to see if an issue already exists for your problem.
+    description: Please [search here](https://github.com/pterodactyl/panel/issues) to see if an issue already exists for your problem.
    options:
    - label: I have searched the existing issues before opening this issue.
      required: true
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,11 +1,8 @@
 blank_issues_enabled: true
 contact_links:
-  - name: Feature Request
-    url: https://github.com/pelican-dev/panel/discussions
-    about: Suggest a new feature or improvement for the software.
  - name: Installation Help
-    url: https://pelican.dev/discord
+    url: https://discord.gg/pterodactyl
    about: Please visit our Discord for help with your installation.
  - name: General Question
-    url: https://pelican.dev/discord
-    about: Please visit our Discord for general questions about Pelican.
+    url: https://discord.gg/pterodactyl
+    about: Please visit our Discord for general questions about Pterodactyl.
--- a/.github/ISSUE_TEMPLATE/feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,32 @@
+name: Feature Request
+description: Suggest a new feature or improvement for the software.
+labels: [feature request]
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing feature request for this?
+    description: Please [search here](https://github.com/pterodactyl/panel/issues?q=is%3Aissue) to see if someone else has already suggested this.
+    options:
+    - label: I have searched the existing issues before opening this feature request.
+      required: true
+
+- type: textarea
+  attributes:
+    label: Describe the feature you would like to see.
+    description: "A clear & concise description of the feature you'd like to have added, and what issues it would solve."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Describe the solution you'd like.
+    description: "You must explain how you'd like to see this feature implemented. Technical implementation details are not necessary, rather an idea of how you'd like to see this feature used."
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Additional context to this request.
+    description: "Add any other context or screenshots about the feature request."
+  validations:
+    required: false
--- a/.github/docker/README.md
+++ b/.github/docker/README.md
@@ -0,0 +1,76 @@
+# Pterodactyl Panel - Docker Image
+This is a ready to use docker image for the panel.
+
+## Requirements
+This docker image requires some additional software to function. The software can either be provided in other containers (see the [docker-compose.yml](https://github.com/pterodactyl/panel/blob/develop/docker-compose.example.yml) as an example) or as existing instances.
+
+A mysql database is required. We recommend the stock [MariaDB Image](https://hub.docker.com/_/mariadb/) image if you prefer to run it in a docker container. As a non-containerized option we recommend mariadb.
+
+A caching software is required as well. We recommend the stock [Redis Image](https://hub.docker.com/_/redis/) image. You can choose any of the [supported options](#cache-drivers).
+
+You can provide additional settings using a custom `.env` file or by setting the appropriate environment variables in the docker-compose file.
+
+## Setup
+
+Start the docker container and the required dependencies (either provide existing ones or start containers as well, see the [docker-compose.yml](https://github.com/pterodactyl/panel/blob/develop/docker-compose.example.yml) file as an example.
+
+After the startup is complete you'll need to create a user.
+If you are running the docker container without docker-compose, use:
+```
+docker exec -it <container id> php artisan p:user:make
+```
+If you are using docker compose use
+```
+docker-compose exec panel php artisan p:user:make
+```
+
+## Environment Variables
+There are multiple environment variables to configure the panel when not providing your own `.env` file, see the following table for details on each available option.
+
+Note: If your `APP_URL` starts with `https://` you need to provide an `LE_EMAIL` as well so Certificates can be generated.
+
+| Variable            | Description                                                                    | Required |
+| ------------------- | ------------------------------------------------------------------------------ | -------- |
+| `APP_URL`           | The URL the panel will be reachable with (including protocol)                  | yes      |
+| `APP_TIMEZONE`      | The timezone to use for the panel                                              | yes      |
+| `LE_EMAIL`          | The email used for letsencrypt certificate generation                          | yes      |
+| `DB_HOST`           | The host of the mysql instance                                                 | yes      |
+| `DB_PORT`           | The port of the mysql instance                                                 | yes      |
+| `DB_DATABASE`       | The name of the mysql database                                                 | yes      |
+| `DB_USERNAME`       | The mysql user                                                                 | yes      |
+| `DB_PASSWORD`       | The mysql password for the specified user                                      | yes      |
+| `CACHE_DRIVER`      | The cache driver        (see [Cache drivers](#cache-drivers) for detais)       | yes      |
+| `SESSION_DRIVER`    |                                                                                | yes      |
+| `QUEUE_DRIVER`      |                                                                                | yes      |
+| `REDIS_HOST`        | The hostname or IP address of the redis database                               | yes      |
+| `REDIS_PASSWORD`    | The password used to secure the redis database                                 | maybe    |
+| `REDIS_PORT`        | The port the redis database is using on the host                               | maybe    |
+| `MAIL_DRIVER`       | The email driver (see [Mail drivers](#mail-drivers) for details)               | yes      |
+| `MAIL_FROM`         | The email that should be used as the sender email                              | yes      |
+| `MAIL_HOST`         | The host of your mail driver instance                                          | maybe    |
+| `MAIL_PORT`         | The port of your mail driver instance                                          | maybe    |
+| `MAIL_USERNAME`     | The username for your mail driver                                              | maybe    |
+| `MAIL_PASSWORD`     | The password for your mail driver                                              | maybe    |
+
+
+### Cache drivers
+You can choose between different cache drivers depending on what you prefer.
+We recommend redis when using docker as it can be started in a container easily.
+
+| Driver   | Description                          | Required variables                                     |
+| -------- | ------------------------------------ | ------------------------------------------------------ |
+| redis    | host where redis is running          | `REDIS_HOST`                                           |
+| redis    | port redis is running on             | `REDIS_PORT`                                           |
+| redis    | redis database password              | `REDIS_PASSWORD`                                       |
+
+### Mail drivers
+You can choose between different mail drivers according to your needs.
+Every driver requires `MAIL_FROM` to be set.
+
+| Driver   | Description                          | Required variables                                            |
+| -------- | ------------------------------------ | ------------------------------------------------------------- |
+| mail     | uses the installed php mail          |                                                               |
+| mandrill | [Mandrill](http://www.mandrill.com/) | `MAIL_USERNAME`                                               |
+| postmark | [Postmark](https://postmarkapp.com/) | `MAIL_USERNAME`                                               |
+| mailgun  | [Mailgun](https://www.mailgun.com/)  | `MAIL_USERNAME`, `MAIL_HOST`                                  |
+| smtp     | Any SMTP server can be configured    | `MAIL_USERNAME`, `MAIL_HOST`, `MAIL_PASSWORD`, `MAIL_PORT`    |
--- a/.github/docker/default.conf
+++ b/.github/docker/default.conf
@@ -0,0 +1,51 @@
+# If using Ubuntu this file should be placed in:
+# 			/etc/nginx/sites-available/
+#
+# If using CentOS this file should be placed in:
+#				 /etc/nginx/conf.d/
+#
+server {
+    listen 80;
+    server_name _;
+    
+    root /app/public;
+    index index.html index.htm index.php;
+    charset utf-8;
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location = /favicon.ico { access_log off; log_not_found off; }
+    location = /robots.txt  { access_log off; log_not_found off; }
+
+    access_log off;
+    error_log  /var/log/nginx/pterodactyl.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+  
+    sendfile off;
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        # the fastcgi_pass path needs to be changed accordingly when using CentOS
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}
--- a/.github/docker/default_ssl.conf
+++ b/.github/docker/default_ssl.conf
@@ -0,0 +1,70 @@
+# If using Ubuntu this file should be placed in: 
+# 			/etc/nginx/sites-available/
+#
+server {
+    listen 80;
+    server_name <domain>;
+    return 301 https://$server_name$request_uri;
+}
+
+server {
+    listen 443 ssl http2;
+    server_name <domain>;
+
+    root /app/public;
+    index index.php;
+
+    access_log /var/log/nginx/pterodactyl.app-access.log;
+    error_log  /var/log/nginx/pterodactyl.app-error.log error;
+
+    # allow larger file uploads and longer script runtimes
+    client_max_body_size 100m;
+    client_body_timeout 120s;
+    
+    sendfile off;
+
+    # strengthen ssl security
+    ssl_certificate /etc/letsencrypt/live/<domain>/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/<domain>/privkey.pem;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_prefer_server_ciphers on;
+    ssl_session_cache shared:SSL:10m;
+    ssl_ciphers "EECDH+AESGCM:EDH+AESGCM:ECDHE-RSA-AES128-GCM-SHA256:AES256+EECDH:DHE-RSA-AES128-GCM-SHA256:AES256+EDH:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA:HIGH:!aNULL:!eNULL:!EXPORT:!DES:!MD5:!PSK:!RC4";
+    
+    # See the link below for more SSL information:
+    #     https://raymii.org/s/tutorials/Strong_SSL_Security_On_nginx.html
+    #
+    # ssl_dhparam /etc/ssl/certs/dhparam.pem;
+
+    # Add headers to serve security related headers
+    add_header Strict-Transport-Security "max-age=15768000; preload;";
+    add_header X-Content-Type-Options nosniff;
+    add_header X-XSS-Protection "1; mode=block";
+    add_header X-Robots-Tag none;
+    add_header Content-Security-Policy "frame-ancestors 'self'";
+
+    location / {
+        try_files $uri $uri/ /index.php?$query_string;
+    }
+
+    location ~ \.php$ {
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include fastcgi_params;
+        fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_param HTTP_PROXY "";
+        fastcgi_intercept_errors off;
+        fastcgi_buffer_size 16k;
+        fastcgi_buffers 4 16k;
+        fastcgi_connect_timeout 300;
+        fastcgi_send_timeout 300;
+        fastcgi_read_timeout 300;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    location ~ /\.ht {
+        deny all;
+    }
+}
--- a/.github/docker/entrypoint.sh
+++ b/.github/docker/entrypoint.sh
@@ -0,0 +1,81 @@
+#!/bin/ash -e
+cd /app
+
+mkdir -p /var/log/panel/logs/ /var/log/supervisord/ /var/log/nginx/ /var/log/php7/ \
+  && chmod 777 /var/log/panel/logs/ \
+  && ln -s /app/storage/logs/ /var/log/panel/
+
+## check for .env file and generate app keys if missing
+if [ -f /app/var/.env ]; then
+  echo "external vars exist."
+  rm -rf /app/.env
+  ln -s /app/var/.env /app/
+else
+  echo "external vars don't exist."
+  rm -rf /app/.env
+  touch /app/var/.env
+
+  ## manually generate a key because key generate --force fails
+  if [ -z $APP_KEY ]; then
+     echo -e "Generating key."
+     APP_KEY=$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+     echo -e "Generated app key: $APP_KEY"
+     echo -e "APP_KEY=$APP_KEY" > /app/var/.env
+  else
+    echo -e "APP_KEY exists in environment, using that."
+    echo -e "APP_KEY=$APP_KEY" > /app/var/.env
+  fi
+
+  ln -s /app/var/.env /app/
+fi
+
+echo "Checking if https is required."
+if [ -f /etc/nginx/http.d/panel.conf ]; then
+  echo "Using nginx config already in place."
+  if [ $LE_EMAIL ]; then
+    echo "Checking for cert update"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  else
+    echo "No letsencrypt email is set"
+  fi
+else
+  echo "Checking if letsencrypt email is set."
+  if [ -z $LE_EMAIL ]; then
+    echo "No letsencrypt email is set using http config."
+    cp .github/docker/default.conf /etc/nginx/http.d/panel.conf
+  else
+    echo "writing ssl config"
+    cp .github/docker/default_ssl.conf /etc/nginx/http.d/panel.conf
+    echo "updating ssl config for domain"
+    sed -i "s|<domain>|$(echo $APP_URL | sed 's~http[s]*://~~g')|g" /etc/nginx/http.d/panel.conf
+    echo "generating certs"
+    certbot certonly -d $(echo $APP_URL | sed 's~http[s]*://~~g')  --standalone -m $LE_EMAIL --agree-tos -n
+  fi
+  echo "Removing the default nginx config"
+  rm -rf /etc/nginx/http.d/default.conf
+fi
+
+if [[ -z $DB_PORT ]]; then
+  echo -e "DB_PORT not specified, defaulting to 3306"
+  DB_PORT=3306
+fi
+
+## check for DB up before starting the panel
+echo "Checking database status."
+until nc -z -v -w30 $DB_HOST $DB_PORT
+do
+  echo "Waiting for database connection..."
+  # wait for 1 seconds before check again
+  sleep 1
+done
+
+## make sure the db is set up
+echo -e "Migrating and Seeding D.B"
+php artisan migrate --seed --force
+
+## start cronjobs for the queue
+echo -e "Starting cron jobs."
+crond -L /var/log/crond -l 5
+
+echo -e "Starting supervisord."
+exec "$@"
--- a/.github/docker/supervisord.conf
+++ b/.github/docker/supervisord.conf
@@ -1,25 +1,23 @@
 [unix_http_server]
 file=/tmp/supervisor.sock                       ; path to your socket file
-username=dummy
-password=dummy

 [supervisord]
-logfile=/var/www/html/storage/logs/supervisord/supervisord.log    ; supervisord log file
+logfile=/var/log/supervisord/supervisord.log    ; supervisord log file
 logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
 logfile_backups=2                               ; number of backed up logfiles
 loglevel=error                                  ; info, debug, warn, trace
-pidfile=/var/run/supervisord/supervisord.pid    ; pidfile location
-nodaemon=true                                   ; run supervisord as a daemon
+pidfile=/var/run/supervisord.pid                ; pidfile location
+nodaemon=false                                  ; run supervisord as a daemon
 minfds=1024                                     ; number of startup file descriptors
 minprocs=200                                    ; number of process descriptors
+user=root                                       ; default user
+childlogdir=/var/log/supervisord/               ; where child log files will live

 [rpcinterface:supervisor]
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface

 [supervisorctl]
 serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
-username=dummy
-password=dummy

 [program:php-fpm]
 command=/usr/local/sbin/php-fpm -F
@@ -27,21 +25,15 @@ autostart=true
 autorestart=true

 [program:queue-worker]
-command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3
+command=/usr/local/bin/php /app/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
+user=nginx
 autostart=true
 autorestart=true

-[program:caddy]
-command=caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
-autostart=%(ENV_SUPERVISORD_CADDY)s
-autorestart=%(ENV_SUPERVISORD_CADDY)s
+[program:nginx]
+command=/usr/sbin/nginx -g 'daemon off;'
+autostart=true
+autorestart=true
 priority=10
-stdout_logfile=/dev/fd/1
-stdout_logfile_maxbytes=0
-redirect_stderr=true
-
-[program:supercronic]
-command=supercronic -overlapping /etc/supercronic/crontab
-autostart=true
-autorestart=true
-redirect_stderr=true
+stdout_events_enabled=true
+stderr_events_enabled=true
--- a/.github/docker/www.conf
+++ b/.github/docker/www.conf
@@ -0,0 +1,16 @@
+[www]
+
+user = nginx
+group = nginx
+
+listen = 127.0.0.1:9000
+listen.owner = nginx
+listen.group = nginx
+listen.mode = 0750
+
+pm = ondemand
+pm.max_children = 9
+pm.process_idle_timeout = 10s
+pm.max_requests = 200
+
+clear_env = no
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -3,40 +3,33 @@ name: Build
 on:
  push:
    branches:
-      - main
+      - "develop"
+      - "1.0-develop"
  pull_request:
+    branches:
+      - "develop"
+      - "1.0-develop"

 jobs:
  ui:
    name: UI
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    strategy:
-      fail-fast: true
+      fail-fast: false
      matrix:
-        node-version: [20, 22]
+        node-version: [16]
    steps:
      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install PHP dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
+        uses: actions/checkout@v3

      - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node-version }}
          cache: "yarn"

-      - name: Install JS dependencies
+      - name: Install dependencies
        run: yarn install --frozen-lockfile

      - name: Build
-        run: yarn build
+        run: yarn build:production
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -3,81 +3,22 @@ name: Tests
 on:
  push:
    branches:
-      - main
+      - "develop"
+      - "1.0-develop"
  pull_request:
-
-env:
-  APP_ENV: testing
-  APP_DEBUG: "false"
-  APP_KEY: ThisIsARandomStringForTests12345
-  APP_TIMEZONE: UTC
-  APP_URL: http://localhost/
-  CACHE_DRIVER: array
-  MAIL_MAILER: array
-  SESSION_DRIVER: array
-  QUEUE_CONNECTION: sync
-  GUZZLE_TIMEOUT: 60
-  GUZZLE_CONNECT_TIMEOUT: 60
+    branches:
+      - "develop"
+      - "1.0-develop"

 jobs:
-  sqlite:
-    name: SQLite
-    runs-on: ubuntu-latest
+  tests:
+    name: Tests
+    runs-on: ubuntu-20.04
    strategy:
-      fail-fast: true
+      fail-fast: false
      matrix:
-        php: [8.2, 8.3, 8.4]
-    env:
-      DB_CONNECTION: sqlite
-      DB_DATABASE: testing.sqlite
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
-
-      - name: Create SQLite file
-        run: touch database/testing.sqlite
-
-      - name: Unit tests
-        run: vendor/bin/pest tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/pest tests/Integration
-
-  mysql:
-    name: MySQL
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [8.2, 8.3, 8.4]
-        database: ["mysql:8"]
+        php: [8.1, 8.2]
+        database: ["mariadb:10.2", "mysql:8"]
    services:
      database:
        image: ${{ matrix.database }}
@@ -87,14 +28,9 @@ jobs:
        ports:
          - 3306
        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    env:
-      DB_CONNECTION: mysql
-      DB_HOST: 127.0.0.1
-      DB_DATABASE: testing
-      DB_USERNAME: root
    steps:
      - name: Code Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Get cache directory
        id: composer-cache
@@ -102,7 +38,7 @@ jobs:
          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

      - name: Cache
-        uses: actions/cache@v4
+        uses: actions/cache@v3
        with:
          path: ${{ steps.composer-cache.outputs.dir }}
          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
@@ -113,148 +49,24 @@ jobs:
        uses: shivammathur/setup-php@v2
        with:
          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
          tools: composer:v2
          coverage: none

+      - name: Setup .env
+        run: cp .env.ci .env
+
      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist

      - name: Unit tests
-        run: vendor/bin/pest tests/Unit
+        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
+        if: ${{ always() }}
        env:
          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true

      - name: Integration tests
-        run: vendor/bin/pest tests/Integration
+        run: vendor/bin/phpunit tests/Integration
        env:
          DB_PORT: ${{ job.services.database.ports[3306] }}
          DB_USERNAME: root
-
-  mariadb:
-    name: MariaDB
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [8.2, 8.3, 8.4]
-        database: ["mariadb:10.6", "mariadb:10.11", "mariadb:11.4"]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: testing
-        ports:
-          - 3306
-        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
-      DB_DATABASE: testing
-      DB_USERNAME: root
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
-
-      - name: Unit tests
-        run: vendor/bin/pest tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/pest tests/Integration
-        env:
-          DB_PORT: ${{ job.services.database.ports[3306] }}
-          DB_USERNAME: root
-
-  postgresql:
-    name: PostgreSQL
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [8.2, 8.3, 8.4]
-        database: ["postgres:14"]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          POSTGRES_DB: testing
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-        ports:
-          - 5432:5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    env:
-      DB_CONNECTION: pgsql
-      DB_HOST: 127.0.0.1
-      DB_DATABASE: testing
-      DB_USERNAME: postgres
-      DB_PASSWORD: postgres
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
-
-      - name: Unit tests
-        run: vendor/bin/pest tests/Unit
-        env:
-          DB_HOST: UNIT_NO_DB
-          SKIP_MIGRATIONS: true
-
-      - name: Integration tests
-        run: vendor/bin/pest tests/Integration
--- a/.github/workflows/cla.yaml
+++ b/.github/workflows/cla.yaml
@@ -1,30 +0,0 @@
-name: "CLA Assistant"
-on:
-  issue_comment:
-    types: [created]
-  pull_request_target:
-    types: [opened,closed,synchronize]
-
-permissions:
-  actions: write
-  contents: read
-  pull-requests: write
-  statuses: write
-
-jobs:
-  CLAAssistant:
-    runs-on: ubuntu-latest
-    steps:
-      - name: "CLA Assistant"
-        if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: contributor-assistant/github-action@v2.4.0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_PERSONAL_ACCESS_TOKEN }}
-        with:
-          path-to-signatures: 'version1/cla.json'
-          path-to-document: 'https://github.com/pelican-dev/panel/blob/main/contributor_license_agreement.md'
-          branch: 'main'
-          allowlist: dependabot[bot]
-          remote-organization-name: pelican-dev
-          remote-repository-name: cla-signatures
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,168 +0,0 @@
-name: Docker
-
-on:
-  push:
-    branches:
-      - main
-  release:
-    types:
-      - published
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-php-base:
-    name: Build PHP base image on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    permissions:
-      contents: read
-      packages: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-24.04
-            arch: amd64
-            platform: linux/amd64
-          - os: ubuntu-24.04-arm
-            arch: arm64
-            platform: linux/arm64
-    steps:
-      - name: Code checkout
-        uses: actions/checkout@v4
-      
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v3
-      
-      - name: Build the base PHP image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile.base
-          push: false
-          load: true
-          platforms: ${{ matrix.platform }}
-          tags: base-php:${{ matrix.arch }}
-          cache-from: type=gha,scope=base-php${{ matrix.arch }}
-          cache-to: type=gha,scope=base-php${{ matrix.arch }}
-
-      - name: Export image to file
-        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@v4
-        with:
-          name: base-php-${{ matrix.arch }}.tar
-          path: base-php-${{ matrix.arch }}.tar
-          retention-days: 7
-
-
-  build-and-push:
-    name: Build and Push ubuntu-24.04
-    runs-on: ubuntu-24.04
-    needs: build-php-base
-    permissions:
-      contents: read
-      packages: write
-    # Start a temp local registry because workflow can not pull from localy loaded images
-    services:
-      registry:
-        image: registry:2
-        ports:
-          - 5000:5000 
-    # Always run against a tag, even if the commit into the tag has [docker skip] within the commit message.
-    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@v4
-
-      - name: Docker metadata
-        id: docker_meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          flavor: |
-            latest=false
-          tags: |
-            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
-            type=ref,event=tag
-            type=ref,event=branch
-
-      - name: Set up QEMU
-        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@v3
-        with:
-          driver-opts: network=host
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Get Build Information
-        id: build_info
-        run: |
-          echo "version_tag=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_OUTPUT
-          echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-        # Download the base PHP image AMD64
-      - uses: actions/download-artifact@v4
-        with:
-          name: base-php-amd64.tar
-        
-        # Download the base PHP image ARM64
-      - uses: actions/download-artifact@v4
-        with:
-          name: base-php-arm64.tar
-
-      - name: Load base images into local registry
-        run: |
-          docker load -i base-php-amd64.tar
-          docker load -i base-php-arm64.tar
-          docker tag base-php:amd64 localhost:5000/base-php:amd64
-          docker tag base-php:arm64 localhost:5000/base-php:arm64
-          docker push localhost:5000/base-php:amd64
-          docker push localhost:5000/base-php:arm64
-          rm base-php-arm64.tar base-php-amd64.tar
-          
-      - 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
-              
-      - name: Build and Push (tag)
-        uses: docker/build-push-action@v6
-        if: "github.event_name == 'release' && github.event.action == 'published'"
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          platforms: 'linux/amd64,linux/arm64'
-          build-args: |
-            VERSION=${{ steps.build_info.outputs.version_tag }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          cache-from: type=gha,scope=tagged${{ matrix.os }}
-          cache-to: type=gha,scope=tagged${{ matrix.os }},mode=max
-        
-      - name: Build and Push (main)
-        uses: docker/build-push-action@v6
-        if: "github.event_name == 'push' && contains(github.ref, 'main')"
-        with:
-          context: .
-          file: ./Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
-          platforms: 'linux/amd64,linux/arm64'
-          build-args: |
-            VERSION=dev-${{ steps.build_info.outputs.short_sha }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          cache-from: type=gha,scope=${{ matrix.os }}
-          cache-to: type=gha,scope=${{ matrix.os }},mode=max
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -0,0 +1,68 @@
+name: Docker
+
+on:
+  push:
+    branches:
+      - develop
+      - 1.0-develop
+  pull_request:
+    branches:
+      - develop
+      - 1.0-develop
+  release:
+    types:
+      - published
+
+jobs:
+  push:
+    name: Push
+    runs-on: ubuntu-20.04
+    if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Docker metadata
+        id: docker_meta
+        uses: docker/metadata-action@v4
+        with:
+          images: ghcr.io/pterodactyl/panel
+          flavor: |
+            latest=false
+          tags: |
+            type=raw,value=latest,enable=${{ github.event_name == 'release' && github.event.action == 'published' && github.event.release.prerelease == false }}
+            type=ref,event=tag
+            type=ref,event=branch
+
+      - name: Setup QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Setup Docker buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        if: "github.event_name != 'pull_request'"
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
+
+      - name: Update version
+        if: "github.event_name == 'release' && github.event.action == 'published'"
+        env:
+          REF: ${{ github.event.release.tag_name }}
+        run: |
+          sed -i "s/    'version' => 'canary',/    'version' => '${REF:1}',/" config/app.php
+
+      - name: Build and Push
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -1,71 +1,36 @@
 name: Lint

 on:
+  push:
+    branches:
+      - "develop"
+      - "1.0-develop"
  pull_request:
    branches:
-      - '**'
+      - "develop"
+      - "1.0-develop"

 jobs:
-  pint:
-    name: Pint
-    runs-on: ubuntu-latest
+  lint:
+    name: Lint
+    runs-on: ubuntu-20.04
    steps:
      - name: Code Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3

      - name: Setup PHP
        uses: shivammathur/setup-php@v2
        with:
-          php-version: "8.3"
+          php-version: "8.1"
          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
          tools: composer:v2
          coverage: none

      - name: Setup .env
-        run: cp .env.example .env
+        run: cp .env.ci .env

      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist

-      - name: Pint
-        run: vendor/bin/pint --test
-  phpstan:
-    name: PHPStan
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [ 8.2, 8.3, 8.4 ]
-    steps:
-      - name: Code Checkout
-        uses: actions/checkout@v4
-
-      - name: Get cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-${{ matrix.php }}-
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Setup .env
-        run: cp .env.example .env
-
-      - name: Install dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-scripts
-
-      - name: PHPStan
-        run: vendor/bin/phpstan --memory-limit=-1 --error-format=github
+      - name: PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -8,44 +8,30 @@ on:
 jobs:
  release:
    name: Release
-    runs-on: ubuntu-22.04
-    permissions:
-      contents: write
-
+    runs-on: ubuntu-20.04
    steps:
      - name: Code checkout
-        uses: actions/checkout@v4
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-
-      - name: Install PHP dependencies
-        run: composer install --no-interaction --no-suggest --no-progress --no-autoloader --no-scripts --no-dev
+        uses: actions/checkout@v3

      - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
        with:
-          node-version: 20
+          node-version: 16
          cache: "yarn"

-      - name: Install JS dependencies
+      - name: Install dependencies
        run: yarn install --frozen-lockfile

      - name: Build
-        run: yarn build
+        run: yarn build:production

      - name: Create release branch and bump version
        env:
          REF: ${{ github.ref }}
        run: |
          BRANCH=release/${REF:10}
-          git config --local user.email "github-actions[bot]@users.noreply.github.com"
-          git config --local user.name "github-actions[bot]"
+          git config --local user.email "ci@pterodactyl.io"
+          git config --local user.name "Pterodactyl CI"
          git checkout -b $BRANCH
          git push -u origin $BRANCH
          sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
@@ -55,22 +41,49 @@ jobs:

      - name: Create release archive
        run: |
-          rm -rf node_modules vendor tests CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.xml shell.nix
-          tar -czf panel.tar.gz * .env.example
+          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpunit.xml shell.nix 
+          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json

-      - name: Create checksum
+      - name: Extract changelog
+        env:
+          REF: ${{ github.ref }}
+        run: |
+          sed -n "/^## ${REF:10}/,/^## /{/^## /b;p}" CHANGELOG.md > ./RELEASE_CHANGELOG
+
+      - name: Create checksum and add to changelog
        run: |
          SUM=`sha256sum panel.tar.gz`
+          echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
          echo $SUM > checksum.txt

      - name: Create release
        id: create_release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          draft: true
          prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
-          files: |
-            panel.tar.gz
-            checksum.txt
+          body_path: ./RELEASE_CHANGELOG
+
+      - name: Upload release archive
+        id: upload-release-archive
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: panel.tar.gz
+          asset_name: panel.tar.gz
+          asset_content_type: application/gzip
+
+      - name: Upload release checksum
+        id: upload-release-checksum
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./checksum.txt
+          asset_name: checksum.txt
+          asset_content_type: text/plain
--- a/.github/workflows/shift.yaml
+++ b/.github/workflows/shift.yaml
@@ -1,20 +0,0 @@
-name: Shift
-
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * 5"
-
-jobs:
-  shift:
-    runs-on: ubuntu-latest
-    timeout-minutes: 5
-    steps:
-      - name: Shift
-        run: |
-          curl -X POST -s -retry 5 -m 60 --fail-with-body \
-            https://laravelshift.com/api/run \
-            -H "Accept: application/json" \
-            -d "api_token=${{ secrets.SHIFT_TOKEN }}" \
-            -d "code=${{ secrets.SHIFT_CODE }}" \
-            -d "scs=github:${{ github.repository }}:${{ github.ref_name }}"
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,36 @@
-/.phpunit.cache
-/node_modules
-/public/build
-/public/storage
-/storage/*.key
-/storage/pail
-/storage/clockwork/*
 /vendor
 *.DS_Store*
-.env
-.env.backup
-.env.production
-.phpactor.json
-.phpunit.result.cache
-Homestead.json
-Homestead.yaml
-auth.json
-npm-debug.log
-yarn-error.log
-/.fleet
+!.env.ci
+!.env.example
+.env*
+.vagrant/*
+.vscode/*
+storage/framework/*
 /.idea
-/.nova
-/.vscode
+/nbproject
+/.direnv

+node_modules
+*.log
+_ide_helper.php
+_ide_helper_models.php
+.phpstorm.meta.php
+.yarn
 public/assets/manifest.json
-/database/*.sqlite*
-_ide_helper*
-/.phpstorm.meta.php
+
+# For local development with docker
+# Remove if we ever put the Dockerfile in the repo
+.dockerignore
+docker-compose.yml
+
+# for image related files
+misc
+.php-cs-fixer.cache
+coverage.xml
+resources/lang/locales.js
+.phpunit.result.cache
+
+/public/build
+/public/hot
+result
+docker-compose.yaml
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -0,0 +1,52 @@
+<?php
+
+use PhpCsFixer\Config;
+use PhpCsFixer\Finder;
+
+$finder = (new Finder())
+    ->in(__DIR__)
+    ->exclude([
+        'vendor',
+        'node_modules',
+        'storage',
+        'bootstrap/cache',
+    ])
+    ->notName(['_ide_helper*']);
+
+return (new Config())
+    ->setRiskyAllowed(true)
+    ->setFinder($finder)
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        '@PSR12' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'heredoc_to_nowdoc' => true,
+        'no_alias_functions' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_return' => true,
+        'ordered_imports' => [
+            'sort_algorithm' => 'length',
+        ],
+        'phpdoc_align' => [
+            'align' => 'left',
+            'tags' => [
+                'param',
+                'property',
+                'return',
+                'throws',
+                'type',
+                'var',
+            ],
+        ],
+        'random_api_migration' => true,
+        'ternary_to_null_coalescing' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
+    ]);
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -0,0 +1,63 @@
+# Local Development
+Pterodactyl is now powered by React, Typescript, and Tailwindcss using webpack at its core to generate compiled assets.
+Release versions of Pterodactyl will include pre-compiled, minified, and hashed assets ready-to-go.
+
+However, if you are interested in running custom themes or making modifications to the React files you'll need a build
+system in place to generate these compiled assets. To get your environment setup you'll need at minimum:
+
+* [Node.js](https://nodejs.org/en/) v14.x.x
+* [Yarn](https://classic.yarnpkg.com/lang/en/) v1.x.x
+* [Go](https://golang.org/) 1.17.x
+
+### Install Dependencies
+```bash
+yarn install
+```
+
+The command above will download all of the dependencies necessary to get Pterodactyl assets building. After that, its as
+simple as running the command below to generate assets while you're developing. Until you've run this command at least
+once you'll likely see a 500 error on your Panel about a missing `manifest.json` file. This is generated by the commands
+below.
+
+```bash
+# Build the compiled set of assets for development.
+yarn run build
+
+# Build the assets automatically as they are changed. This allows you to refresh
+# the page and see the changes immediately.
+yarn run watch
+```
+
+### Hot Module Reloading
+For more advanced users, we also support 'Hot Module Reloading', allowing you to quickly see changes you're making
+to the Vue template files without having to reload the page you're on. To Get started with this, you just need
+to run the command below.
+
+```bash
+PUBLIC_PATH=http://192.168.1.1:8080 yarn run serve --host 192.168.1.1
+```
+
+There are two _very important_ parts of this command to take note of and change for your specific environment. The first
+is the `--host` flag, which is required and should point to the machine where the `webpack-serve` server will be running.
+The second is the `PUBLIC_PATH` environment variable which is the URL pointing to the HMR server and is appended to all of
+the asset URLs used in Pterodactyl.
+
+#### Development Environment
+If you're using the [`pterodactyl/development`](https://github.com/pterodactyl/development) environments, which are
+highly recommended, you can just run `yarn run serve` to run the HMR server, no additional configuration is necessary.
+
+### Building for Production
+Once you have your files squared away and ready for the live server, you'll be needing to generate compiled, minified,
+and hashed assets to push live. To do so, run the command below:
+
+```bash
+yarn run build:production
+```
+
+This will generate a production JS bundle and associated assets, all located in `public/assets/` which will need to
+be uploaded to your server or CDN for clients to use.
+
+### Running Wings
+To run `wings` in development all you need to do is set up the configuration file as normal when adding a new node, and
+then you can build and run a local version of Wings by executing `make debug` in the Wings code directory. This must
+be run on a Linux VM of some sort, you cannot run this locally on macOS or Windows.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,74 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at support@pterodactyl.io. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,31 @@
+# Contributing
+
+Pterodactyl does not accept Pull Requests (PRs) _for new functionality_ from users that are not currently part of the
+core project team. It has become overwhelming to try and give the proper time and attention that such complicated PRs
+tend to require — and deserve. As a result, it is in the project's best interest to limit the scope of work on
+new functionality to work done within the core project team.
+
+PRs that address existing _bugs_ with a corresponding issue opened in our issue tracker will continue to be accepted
+and reviewed. Their scope is often significantly more targeted, and simply improving upon existing and well defined
+logic.
+
+### Responsible Disclosure
+
+This is a fairly in-depth project and makes use of a lot of parts. We strive to keep everything as secure as possible
+and welcome you to take a look at the code provided in this project yourself. We do ask that you be considerate of
+others who are using the software and not publicly disclose security issues without contacting us first by email.
+
+We'll make a deal with you: if you contact us by email, and we fail to respond to you within a week you are welcome to
+publicly disclose whatever issue you have found. We understand how frustrating it is when you find something big and
+no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and
+keeping this community safe.
+
+If you've found what you believe is a security issue please email `matthew@pterodactyl.io`. Please check
+[SECURITY.md](/SECURITY.md) for additional details.
+
+### Contact Us
+
+You can find us in a couple places online. First and foremost, we're active right here on GitHub. If you encounter a
+bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
+
+You can also find us on [Discord](https://discord.gg/pterodactyl).
--- a/139
+++ b/139
@@ -1,110 +1,41 @@
-# syntax=docker.io/docker/dockerfile:1.13-labs
-# Pelican Production Dockerfile
+# Stage 0:
+# Build the assets that are needed for the frontend. This build stage is then discarded
+# since we won't need NodeJS anymore in the future. This Docker image ships a final production
+# level distribution of Pterodactyl.
+FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
+WORKDIR /app
+COPY . ./
+RUN yarn install --frozen-lockfile \
+    && yarn run build:production

-##
-#  If you want to build this locally you want to run `docker build -f Dockerfile.dev`
-##
+# Stage 1:
+# Build the actual container with all of the needed PHP dependencies that will run the application.
+FROM --platform=$TARGETOS/$TARGETARCH php:8.1-fpm-alpine
+WORKDIR /app
+COPY . ./
+COPY --from=0 /app/public/assets ./public/assets
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot certbot-nginx \
+    && docker-php-ext-configure zip \
+    && docker-php-ext-install bcmath gd pdo_mysql zip \
+    && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
+    && cp .env.example .env \
+    && mkdir -p bootstrap/cache/ storage/logs storage/framework/sessions storage/framework/views storage/framework/cache \
+    && chmod 777 -R bootstrap storage \
+    && composer install --no-dev --optimize-autoloader \
+    && rm -rf .env bootstrap/cache/*.php \
+    && mkdir -p /app/storage/logs/ \
+    && chown -R nginx:nginx .

-# ================================
-# Stage 1-1: Composer Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS composer
+RUN rm /usr/local/etc/php-fpm.conf \
+    && echo "* * * * * /usr/local/bin/php /app/artisan schedule:run >> /dev/null 2>&1" >> /var/spool/cron/crontabs/root \
+    && echo "0 23 * * * certbot renew --nginx --quiet" >> /var/spool/cron/crontabs/root \
+    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
+    && mkdir -p /var/run/php /var/run/nginx

-WORKDIR /build
-
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-
-# Copy bare minimum to install Composer dependencies
-COPY composer.json composer.lock ./
-
-RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
-
-# ================================
-# Stage 1-2: Yarn Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
-
-WORKDIR /build
-
-# Copy bare minimum to install Yarn dependencies
-COPY package.json yarn.lock ./
-
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile
-
-# ================================
-# Stage 2-1: Composer Optimize
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
-
-# Copy full code to optimize autoload
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-
-RUN composer dump-autoload --optimize
-
-# ================================
-# Stage 2-2: Build Frontend Assets
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
-
-WORKDIR /build
-
-# Copy full code
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-COPY --from=composer /build .
-
-RUN yarn run build
-
-# ================================
-# Stage 5: Build Final Application Image
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH localhost:5000/base-php:$TARGETARCH AS final
-
-WORKDIR /var/www/html
-
-# Install additional required libraries
-RUN apk add --no-cache \
-    caddy ca-certificates supervisor supercronic fcgi
-
-COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
-
-# Set permissions
-# First ensure all files are owned by root and restrict www-data to read access
-RUN chown root:www-data ./ \
-    && chmod 750 ./ \
-    # Files should not have execute set, but directories need it
-    && find ./ -type d -exec chmod 750 {} \; \
-    # Create necessary directories
-    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
-    # Symlinks for env, database, and avatars
-    && ln -s /pelican-data/.env ./.env \
-    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
-    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
-    # Allow www-data write permissions where necessary
-    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/
-
-# Configure Supervisor
-COPY docker/supervisord.conf /etc/supervisord.conf
-COPY docker/Caddyfile /etc/caddy/Caddyfile
-# Add Laravel scheduler to crontab
-COPY docker/crontab /etc/supercronic/crontab
-
-COPY docker/entrypoint.sh /entrypoint.sh
-COPY docker/healthcheck.sh /healthcheck.sh
-
-HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD /bin/ash /healthcheck.sh
+COPY .github/docker/default.conf /etc/nginx/http.d/default.conf
+COPY .github/docker/www.conf /usr/local/etc/php-fpm.conf
+COPY .github/docker/supervisord.conf /etc/supervisord.conf

 EXPOSE 80 443
-
-VOLUME /pelican-data
-
-USER www-data
-
-ENTRYPOINT [ "/bin/ash", "/entrypoint.sh" ]
+ENTRYPOINT [ "/bin/ash", ".github/docker/entrypoint.sh" ]
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]
--- a/Dockerfile.base
+++ b/Dockerfile.base
@@ -1,10 +0,0 @@
-# ================================
-# Stage 0: Build PHP Base Image
-# ================================
-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/
-
-RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
-
-RUN rm /usr/local/bin/install-php-extensions
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,114 +0,0 @@
-# syntax=docker.io/docker/dockerfile:1.13-labs
-# Pelican Development Dockerfile
-
-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/
-
-RUN install-php-extensions bcmath gd intl zip opcache pcntl posix pdo_mysql pdo_pgsql
-
-RUN rm /usr/local/bin/install-php-extensions
-
-# ================================
-# Stage 1-1: Composer Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH base AS composer
-
-WORKDIR /build
-
-COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
-
-# Copy bare minimum to install Composer dependencies
-COPY composer.json composer.lock ./
-
-RUN composer install --no-dev --no-interaction --no-autoloader --no-scripts
-
-# ================================
-# Stage 1-2: Yarn Install
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH node:20-alpine AS yarn
-
-WORKDIR /build
-
-# Copy bare minimum to install Yarn dependencies
-COPY package.json yarn.lock ./
-
-RUN yarn config set network-timeout 300000 \
-    && yarn install --frozen-lockfile
-
-# ================================
-# Stage 2-1: Composer Optimize
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH composer AS composerbuild
-
-# Copy full code to optimize autoload
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-
-RUN composer dump-autoload --optimize
-
-# ================================
-# Stage 2-2: Build Frontend Assets
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH yarn AS yarnbuild
-
-WORKDIR /build
-
-# Copy full code
-COPY --exclude=Caddyfile --exclude=docker/ . ./
-COPY --from=composer /build .
-
-RUN yarn run build
-
-# ================================
-# Stage 5: Build Final Application Image
-# ================================
-FROM --platform=$TARGETOS/$TARGETARCH base AS final
-
-WORKDIR /var/www/html
-
-# Install additional required libraries
-RUN apk add --no-cache \
-    caddy ca-certificates supervisor supercronic fcgi coreutils
-
-COPY --chown=root:www-data --chmod=640 --from=composerbuild /build .
-COPY --chown=root:www-data --chmod=640 --from=yarnbuild /build/public ./public
-
-# Set permissions
-# First ensure all files are owned by root and restrict www-data to read access
-RUN chown root:www-data ./ \
-    && chmod 750 ./ \
-    # Files should not have execute set, but directories need it
-    && find ./ -type d -exec chmod 750 {} \; \
-    # Create necessary directories
-    && mkdir -p /pelican-data/storage /var/www/html/storage/app/public /var/run/supervisord /etc/supercronic \
-    # Symlinks for env, database, and avatars
-    && ln -s /pelican-data/.env ./.env \
-    && ln -s /pelican-data/database/database.sqlite ./database/database.sqlite \
-    && ln -sf /var/www/html/storage/app/public /var/www/html/public/storage \
-    && ln -s  /pelican-data/storage/avatars /var/www/html/storage/app/public/avatars \
-    && ln -s  /pelican-data/storage/fonts /var/www/html/storage/app/public/fonts \
-    # Allow www-data write permissions where necessary
-    && chown -R www-data:www-data /pelican-data ./storage ./bootstrap/cache /var/run/supervisord /var/www/html/public/storage \
-    && chmod -R u+rwX,g+rwX,o-rwx /pelican-data ./storage ./bootstrap/cache /var/run/supervisord \
-    && chown -R www-data: /usr/local/etc/php/
-
-# Configure Supervisor
-COPY docker/supervisord.conf /etc/supervisord.conf
-COPY docker/Caddyfile /etc/caddy/Caddyfile
-# Add Laravel scheduler to crontab
-COPY docker/crontab /etc/supercronic/crontab
-
-COPY docker/entrypoint.sh /entrypoint.sh
-COPY docker/healthcheck.sh /healthcheck.sh
-
-HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
-  CMD /bin/ash /healthcheck.sh
-
-EXPOSE 80 443
-
-VOLUME /pelican-data
-
-USER www-data
-
-ENTRYPOINT [ "/bin/ash", "/entrypoint.sh" ]
-CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -0,0 +1,24 @@
+# The MIT License (MIT)
+
+```
+Pterodactyl®
+Copyright © Dane Everitt <dane@daneeveritt.com> and contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+```
--- a/README.md
+++ b/README.md
@@ -0,0 +1,72 @@
+[![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
+
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/ci.yaml?label=Tests&style=for-the-badge&branch=1.0-develop)
+![Discord](https://img.shields.io/discord/122900397965705216?label=Discord&logo=Discord&logoColor=white&style=for-the-badge)
+![GitHub Releases](https://img.shields.io/github/downloads/pterodactyl/panel/latest/total?style=for-the-badge)
+![GitHub contributors](https://img.shields.io/github/contributors/pterodactyl/panel?style=for-the-badge)
+
+# Pterodactyl Panel
+
+Pterodactyl® is a free, open-source game server management panel built with PHP, React, and Go. Designed with security
+in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive
+UI to end users.
+
+Stop settling for less. Make game servers a first class citizen on your platform.
+
+![Image](https://cdn.pterodactyl.io/site-assets/pterodactyl_v1_demo.gif)
+
+## Documentation
+
+* [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
+* [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
+* [Community Guides](https://pterodactyl.io/community/about.html)
+* Or, get additional help [via Discord](https://discord.gg/pterodactyl)
+
+## Sponsors
+
+I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's development.
+[Interested in becoming a sponsor?](https://github.com/sponsors/matthewpi)
+
+| Company                                                   | About                                                                                                                                                                                                                                           |
+|-----------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [**Aussie Server Hosts**](https://aussieserverhosts.com/) | No frills Australian Owned and operated High Performance Server hosting for some of the most demanding games serving Australia and New Zealand.                                                                                                 |
+| [**BisectHosting**](https://www.bisecthosting.com/)       | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012.                                                                                                 |
+| [**MineStrator**](https://minestrator.com/)               | Looking for the most highend French hosting company for your minecraft server? More than 24,000 members on our discord trust us. Give us a try!                                                                                                 |
+| [**VibeGAMES**](https://vibegames.net/)                   | VibeGAMES is a game server provider that specializes in DDOS protection for the games we offer. We have multiple locations in the US, Brazil, France, Germany, Singapore, Australia and South Africa.                                           |
+| [**HostEZ**](https://hostez.io)                           | US & EU Rust & Minecraft Hosting. DDoS Protected bare metal, VPS and colocation with low latency, high uptime and maximum availability. EZ!                                                                                                     |
+| [**Blueprint**](https://blueprint.zip/?pterodactyl=true)  | Create and install Pterodactyl addons and themes with the growing Blueprint framework - the package-manager for Pterodactyl. Use multiple modifications at once without worrying about conflicts and make use of the large extension ecosystem. |
+
+### Supported Games
+
+Pterodactyl supports a wide variety of games by utilizing Docker containers to isolate each instance. This gives
+you the power to run game servers without bloating machines with a host of additional dependencies.
+
+Some of our core supported games include:
+
+* Minecraft — including Paper, Sponge, Bungeecord, Waterfall, and more
+* Rust
+* Terraria
+* Teamspeak
+* Mumble
+* Team Fortress 2
+* Counter Strike: Global Offensive
+* Garry's Mod
+* ARK: Survival Evolved
+
+In addition to our standard nest of supported games, our community is constantly pushing the limits of this software
+and there are plenty more games available provided by the community. Some of these games include:
+
+* Factorio
+* San Andreas: MP
+* Pocketmine MP
+* Squad
+* Xonotic
+* Starmade
+* Discord ATLBot, and most other Node.js/Python discord bots
+* [and many more...](https://github.com/parkervcp/eggs)
+
+## License
+
+Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
+
+Code released under the [MIT License](./LICENSE.md).
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,19 @@
+# Security Policy
+
+## Supported Versions
+
+The following versions of Pterodactyl are receiving active support and maintenance. Any security vulnerabilities discovered must be reproducible in supported versions.
+
+| Panel  | Daemon       | Supported          |
+|--------|--------------|--------------------|
+| 1.11.x | wings@1.11.x | :white_check_mark: |
+| 0.7.x  | daemon@0.6.x | :x:                |
+
+
+## Reporting a Vulnerability
+
+Please reach out directly to any project team member on Discord when reporting a security vulnerability, or you can email `matthew@pterodactyl.io`.
+
+We make every effort to respond as soon as possible, although it may take a day or two for us to sync internally and determine the severity of the report and its impact. Please, _do not_ use a public facing channel or GitHub issues to report sensitive security issues.
+
+As part of our process, we will create a security advisory for the affected versions and disclose it publicly, usually two to four weeks after a releasing a version that addresses it.
--- a/app/Checks/CacheCheck.php
+++ b/app/Checks/CacheCheck.php
@@ -1,58 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Exception;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Str;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class CacheCheck extends Check
-{
-    protected ?string $driver = null;
-
-    public function driver(string $driver): self
-    {
-        $this->driver = $driver;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $driver = $this->driver ?? $this->defaultDriver();
-
-        $result = Result::make()->meta([
-            'driver' => $driver,
-        ]);
-
-        try {
-            return $this->canWriteValuesToCache($driver)
-                ? $result->ok(trans('admin/health.results.cache.ok'))
-                : $result->failed(trans('admin/health.results.cache.failed_retrieve'));
-        } catch (Exception $exception) {
-            return $result->failed(trans('admin/health.results.cache.failed', ['error' => $exception->getMessage()]));
-        }
-    }
-
-    protected function defaultDriver(): ?string
-    {
-        return config('cache.default', 'file');
-    }
-
-    protected function canWriteValuesToCache(?string $driver): bool
-    {
-        $expectedValue = Str::random(5);
-
-        $cacheName = "laravel-health:check-{$expectedValue}";
-
-        Cache::driver($driver)->put($cacheName, $expectedValue, 10);
-
-        $actualValue = Cache::driver($driver)->get($cacheName);
-
-        Cache::driver($driver)->forget($cacheName);
-
-        return $actualValue === $expectedValue;
-    }
-}
--- a/app/Checks/DatabaseCheck.php
+++ b/app/Checks/DatabaseCheck.php
@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Exception;
-use Illuminate\Support\Facades\DB;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class DatabaseCheck extends Check
-{
-    protected ?string $connectionName = null;
-
-    public function connectionName(string $connectionName): self
-    {
-        $this->connectionName = $connectionName;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $connectionName = $this->connectionName ?? $this->getDefaultConnectionName();
-
-        $result = Result::make()->meta([
-            'connection_name' => $connectionName,
-        ]);
-
-        try {
-            DB::connection($connectionName)->getPdo();
-
-            return $result->ok(trans('admin/health.results.database.ok'));
-        } catch (Exception $exception) {
-            return $result->failed(trans('admin/health.results.database.failed', ['error' => $exception->getMessage()]));
-        }
-    }
-
-    protected function getDefaultConnectionName(): string
-    {
-        return config('database.default');
-    }
-}
--- a/app/Checks/DebugModeCheck.php
+++ b/app/Checks/DebugModeCheck.php
@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-use function config;
-
-class DebugModeCheck extends Check
-{
-    protected bool $expected = false;
-
-    public function expectedToBe(bool $bool): self
-    {
-        $this->expected = $bool;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $actual = config('app.debug');
-
-        $result = Result::make()
-            ->meta([
-                'actual' => $actual,
-                'expected' => $this->expected,
-            ])
-            ->shortSummary($this->convertToWord($actual));
-
-        return $this->expected === $actual
-            ? $result->ok()
-            : $result->failed(trans('admin/health.results.debugmode.failed', [
-                'actual' => $this->convertToWord($actual),
-                'expected' => $this->convertToWord($this->expected),
-            ]));
-    }
-
-    protected function convertToWord(bool $boolean): string
-    {
-        return $boolean ? 'true' : 'false';
-    }
-}
--- a/app/Checks/EnvironmentCheck.php
+++ b/app/Checks/EnvironmentCheck.php
@@ -1,38 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Illuminate\Support\Facades\App;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class EnvironmentCheck extends Check
-{
-    protected string $expectedEnvironment = 'production';
-
-    public function expectEnvironment(string $expectedEnvironment): self
-    {
-        $this->expectedEnvironment = $expectedEnvironment;
-
-        return $this;
-    }
-
-    public function run(): Result
-    {
-        $actualEnvironment = (string) App::environment();
-
-        $result = Result::make()
-            ->meta([
-                'actual' => $actualEnvironment,
-                'expected' => $this->expectedEnvironment,
-            ])
-            ->shortSummary($actualEnvironment);
-
-        return $this->expectedEnvironment === $actualEnvironment
-            ? $result->ok(trans('admin/health.results.environment.ok'))
-            : $result->failed(trans('admin/health.results.environment.failed', [
-                'actual' => $actualEnvironment,
-                'expected' => $this->expectedEnvironment,
-            ]));
-    }
-}
--- a/app/Checks/NodeVersionsCheck.php
+++ b/app/Checks/NodeVersionsCheck.php
@@ -1,47 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use App\Models\Node;
-use App\Services\Helpers\SoftwareVersionService;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-use Spatie\Health\Enums\Status;
-
-class NodeVersionsCheck extends Check
-{
-    public function __construct(private SoftwareVersionService $versionService) {}
-
-    public function run(): Result
-    {
-        $all = Node::all();
-
-        if ($all->isEmpty()) {
-            $result = Result::make()
-                ->notificationMessage(trans('admin/health.results.nodeversions.no_nodes_created'))
-                ->shortSummary(trans('admin/health.results.nodeversions.no_nodes'));
-            $result->status = Status::skipped();
-
-            return $result;
-        }
-
-        $outdated = $all
-            ->filter(fn (Node $node) => !isset($node->systemInformation()['exception']) && !$this->versionService->isLatestWings($node->systemInformation()['version']))
-            ->count();
-
-        $all = $all->count();
-        $latestVersion = $this->versionService->latestWingsVersion();
-
-        $result = Result::make()
-            ->meta([
-                'all' => $all,
-                'outdated' => $outdated,
-                'latestVersion' => $latestVersion,
-            ])
-            ->shortSummary($outdated === 0 ? trans('admin/health.results.nodeversions.all_up_to_date') : trans('admin/health.results.nodeversions.outdated', ['outdated' => $outdated, 'all' => $all]));
-
-        return $outdated === 0
-            ? $result->ok(trans('admin/health.results.nodeversions.ok'))
-            : $result->failed(trans('admin/health.results.nodeversions.failed', ['outdated' => $outdated, 'all' => $all]));
-    }
-}
--- a/app/Checks/PanelVersionCheck.php
+++ b/app/Checks/PanelVersionCheck.php
@@ -1,34 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use App\Services\Helpers\SoftwareVersionService;
-use Spatie\Health\Checks\Check;
-use Spatie\Health\Checks\Result;
-
-class PanelVersionCheck extends Check
-{
-    public function __construct(private SoftwareVersionService $versionService) {}
-
-    public function run(): Result
-    {
-        $isLatest = $this->versionService->isLatestPanel();
-        $currentVersion = $this->versionService->currentPanelVersion();
-        $latestVersion = $this->versionService->latestPanelVersion();
-
-        $result = Result::make()
-            ->meta([
-                'isLatest' => $isLatest,
-                'currentVersion' => $currentVersion,
-                'latestVersion' => $latestVersion,
-            ])
-            ->shortSummary($isLatest ? trans('admin/health.results.panelversion.up_to_date') : trans('admin/health.results.panelversion.outdated'));
-
-        return $isLatest
-            ? $result->ok(trans('admin/health.results.panelversion.ok'))
-            : $result->failed(trans('admin/health.results.panelversion.failed', [
-                'currentVersion' => $currentVersion,
-                'latestVersion' => $latestVersion,
-            ]));
-    }
-}
--- a/app/Checks/ScheduleCheck.php
+++ b/app/Checks/ScheduleCheck.php
@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Carbon\Carbon;
-use Composer\InstalledVersions;
-use Spatie\Health\Checks\Checks\ScheduleCheck as BaseCheck;
-use Spatie\Health\Checks\Result;
-
-class ScheduleCheck extends BaseCheck
-{
-    public function run(): Result
-    {
-        $result = Result::make()->ok(trans('admin/health.results.schedule.ok'));
-
-        $lastHeartbeatTimestamp = cache()->store($this->cacheStoreName)->get($this->cacheKey);
-
-        if (!$lastHeartbeatTimestamp) {
-            return $result->failed(trans('admin/health.results.schedule.failed_not_ran'));
-        }
-
-        $latestHeartbeatAt = Carbon::createFromTimestamp($lastHeartbeatTimestamp);
-
-        $carbonVersion = InstalledVersions::getVersion('nesbot/carbon');
-
-        $minutesAgo = $latestHeartbeatAt->diffInMinutes();
-
-        if (version_compare($carbonVersion,
-            '3.0.0', '<')) {
-            $minutesAgo += 1;
-        }
-
-        if ($minutesAgo > $this->heartbeatMaxAgeInMinutes) {
-            return $result->failed(trans('admin/health.results.schedule.failed_last_ran', [
-                'time' => $minutesAgo,
-            ]));
-        }
-
-        return $result;
-    }
-}
--- a/app/Checks/UsedDiskSpaceCheck.php
+++ b/app/Checks/UsedDiskSpaceCheck.php
@@ -1,16 +0,0 @@
-<?php
-
-namespace App\Checks;
-
-use Spatie\Health\Checks\Checks\UsedDiskSpaceCheck as BaseCheck;
-
-class UsedDiskSpaceCheck extends BaseCheck
-{
-    protected function getDiskUsagePercentage(): int
-    {
-        $freeSpace = disk_free_space($this->filesystemName ?? '/');
-        $totalSpace = disk_total_space($this->filesystemName ?? '/');
-
-        return 100 - ($freeSpace * 100 / $totalSpace);
-    }
-}
--- a/app/Console/Commands/Egg/CheckEggUpdatesCommand.php
+++ b/app/Console/Commands/Egg/CheckEggUpdatesCommand.php
@@ -1,62 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Egg;
-
-use App\Enums\EggFormat;
-use App\Models\Egg;
-use App\Services\Eggs\Sharing\EggExporterService;
-use Exception;
-use Illuminate\Console\Command;
-use JsonException;
-use Symfony\Component\Yaml\Yaml;
-
-class CheckEggUpdatesCommand extends Command
-{
-    protected $signature = 'p:egg:check-updates';
-
-    public function handle(EggExporterService $exporterService): void
-    {
-        $eggs = Egg::all();
-        foreach ($eggs as $egg) {
-            try {
-                $this->check($egg, $exporterService);
-            } catch (Exception $exception) {
-                $this->error("{$egg->name}: Error ({$exception->getMessage()})");
-            }
-        }
-    }
-
-    /**
-     * @throws JsonException
-     */
-    private function check(Egg $egg, EggExporterService $exporterService): void
-    {
-        if (is_null($egg->update_url)) {
-            $this->comment("$egg->name: Skipping (no update url set)");
-
-            return;
-        }
-
-        $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 = file_get_contents($egg->update_url);
-        assert($remote !== false);
-
-        $remote = $isYaml ? Yaml::parse($remote) : json_decode($remote, true);
-
-        unset($local['exported_at'], $remote['exported_at']);
-
-        $localHash = md5(json_encode($local, JSON_THROW_ON_ERROR));
-        $remoteHash = md5(json_encode($remote, JSON_THROW_ON_ERROR));
-
-        $status = $localHash === $remoteHash ? 'Up-to-date' : 'Found update';
-        $this->{($localHash === $remoteHash) ? 'info' : 'warn'}("$egg->name: $status");
-
-        cache()->put("eggs.$egg->uuid.update", $localHash !== $remoteHash, now()->addHour());
-    }
-}
--- a/app/Console/Commands/Egg/UpdateEggIndexCommand.php
+++ b/app/Console/Commands/Egg/UpdateEggIndexCommand.php
@@ -1,46 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Egg;
-
-use Exception;
-use Illuminate\Console\Command;
-
-class UpdateEggIndexCommand extends Command
-{
-    protected $signature = 'p:egg:update-index';
-
-    public function handle(): int
-    {
-        try {
-            $data = file_get_contents('https://raw.githubusercontent.com/pelican-eggs/pelican-eggs.github.io/refs/heads/main/content/pelican.json');
-            $data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-
-            return 1;
-        }
-
-        $index = [];
-        foreach ($data['nests'] as $nest) {
-            $nestName = $nest['nest_type'];
-
-            $this->info("Nest: $nestName");
-
-            $nestEggs = [];
-            foreach ($nest['Eggs'] as $egg) {
-                $eggName = $egg['egg']['name'];
-
-                $this->comment("Egg: $eggName");
-
-                $nestEggs[$egg['download_url']] = $eggName;
-            }
-            $index[$nestName] = $nestEggs;
-
-            $this->info('');
-        }
-
-        cache()->forever('eggs.index', $index);
-
-        return 0;
-    }
-}
--- a/app/Console/Commands/Environment/AppSettingsCommand.php
+++ b/app/Console/Commands/Environment/AppSettingsCommand.php
@@ -1,32 +1,183 @@
 <?php

-namespace App\Console\Commands\Environment;
+namespace Pterodactyl\Console\Commands\Environment;

 use Illuminate\Console\Command;
+use Illuminate\Contracts\Console\Kernel;
+use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;

 class AppSettingsCommand extends Command
 {
+    use EnvironmentWriterTrait;
+
+    public const CACHE_DRIVERS = [
+        'redis' => 'Redis (recommended)',
+        'memcached' => 'Memcached',
+        'file' => 'Filesystem',
+    ];
+
+    public const SESSION_DRIVERS = [
+        'redis' => 'Redis (recommended)',
+        'memcached' => 'Memcached',
+        'database' => 'MySQL Database',
+        'file' => 'Filesystem',
+        'cookie' => 'Cookie',
+    ];
+
+    public const QUEUE_DRIVERS = [
+        'redis' => 'Redis (recommended)',
+        'database' => 'MySQL Database',
+        'sync' => 'Sync',
+    ];
+
    protected $description = 'Configure basic environment settings for the Panel.';

-    protected $signature = 'p:environment:setup';
+    protected $signature = 'p:environment:setup
+                            {--new-salt : Whether or not to generate a new salt for Hashids.}
+                            {--author= : The email that services created on this instance should be linked to.}
+                            {--url= : The URL that this Panel is running on.}
+                            {--timezone= : The timezone to use for Panel times.}
+                            {--cache= : The cache driver backend to use.}
+                            {--session= : The session driver backend to use.}
+                            {--queue= : The queue driver backend to use.}
+                            {--redis-host= : Redis host to use for connections.}
+                            {--redis-pass= : Password used to connect to redis.}
+                            {--redis-port= : Port to connect to redis over.}
+                            {--settings-ui= : Enable or disable the settings UI.}
+                            {--telemetry= : Enable or disable anonymous telemetry.}';

-    public function handle(): void
+    protected array $variables = [];
+
+    /**
+     * AppSettingsCommand constructor.
+     */
+    public function __construct(private Kernel $console)
    {
-        $path = base_path('.env');
-        if (!file_exists($path)) {
-            $this->comment('Copying example .env file');
-            copy($path . '.example', $path);
+        parent::__construct();
+    }
+
+    /**
+     * Handle command execution.
+     *
+     * @throws \Pterodactyl\Exceptions\PterodactylException
+     */
+    public function handle(): int
+    {
+        if (empty(config('hashids.salt')) || $this->option('new-salt')) {
+            $this->variables['HASHIDS_SALT'] = str_random(20);
        }

-        if (!config('app.key')) {
-            $this->comment('Generating app key');
-            $this->call('key:generate');
+        $this->output->comment('Provide the email address that eggs exported by this Panel should be from. This should be a valid email address.');
+        $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
+            'Egg Author Email',
+            config('pterodactyl.service.author', 'unknown@unknown.com')
+        );
+
+        if (!filter_var($this->variables['APP_SERVICE_AUTHOR'], FILTER_VALIDATE_EMAIL)) {
+            $this->output->error('The service author email provided is invalid.');
+
+            return 1;
        }

-        $this->comment('Creating storage link');
-        $this->call('storage:link');
+        $this->output->comment('The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.');
+        $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
+            'Application URL',
+            config('app.url', 'https://example.com')
+        );

-        $this->comment('Caching components & icons');
-        $this->call('filament:optimize');
+        $this->output->comment('The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference https://php.net/manual/en/timezones.php.');
+        $this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate(
+            'Application Timezone',
+            \DateTimeZone::listIdentifiers(),
+            config('app.timezone')
+        );
+
+        $selected = config('cache.default', 'redis');
+        $this->variables['CACHE_DRIVER'] = $this->option('cache') ?? $this->choice(
+            'Cache Driver',
+            self::CACHE_DRIVERS,
+            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
+        );
+
+        $selected = config('session.driver', 'redis');
+        $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
+            'Session Driver',
+            self::SESSION_DRIVERS,
+            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
+        );
+
+        $selected = config('queue.default', 'redis');
+        $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
+            'Queue Driver',
+            self::QUEUE_DRIVERS,
+            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
+        );
+
+        if (!is_null($this->option('settings-ui'))) {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true';
+        } else {
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm('Enable UI based settings editor?', true) ? 'false' : 'true';
+        }
+
+        $this->output->comment('Please reference https://pterodactyl.io/panel/1.0/additional_configuration.html#telemetry for more detailed information regarding telemetry data and collection.');
+        $this->variables['PTERODACTYL_TELEMETRY_ENABLED'] = $this->option('telemetry') ?? $this->confirm(
+            'Enable sending anonymous telemetry data?',
+            config('pterodactyl.telemetry.enabled', true)
+        ) ? 'true' : 'false';
+
+        // Make sure session cookies are set as "secure" when using HTTPS
+        if (str_starts_with($this->variables['APP_URL'], 'https://')) {
+            $this->variables['SESSION_SECURE_COOKIE'] = 'true';
+        }
+
+        $this->checkForRedis();
+        $this->writeToEnvironment($this->variables);
+
+        $this->info($this->console->output());
+
+        return 0;
+    }
+
+    /**
+     * Check if redis is selected, if so, request connection details and verify them.
+     */
+    private function checkForRedis()
+    {
+        $items = collect($this->variables)->filter(function ($item) {
+            return $item === 'redis';
+        });
+
+        // Redis was not selected, no need to continue.
+        if (count($items) === 0) {
+            return;
+        }
+
+        $this->output->note('You\'ve selected the Redis driver for one or more options, please provide valid connection information below. In most cases you can use the defaults provided unless you have modified your setup.');
+        $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
+            'Redis Host',
+            config('database.redis.default.host')
+        );
+
+        $askForRedisPassword = true;
+        if (!empty(config('database.redis.default.password'))) {
+            $this->variables['REDIS_PASSWORD'] = config('database.redis.default.password');
+            $askForRedisPassword = $this->confirm('It seems a password is already defined for Redis, would you like to change it?');
+        }
+
+        if ($askForRedisPassword) {
+            $this->output->comment('By default a Redis server instance has no password as it is running locally and inaccessible to the outside world. If this is the case, simply hit enter without entering a value.');
+            $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
+                'Redis Password'
+            );
+        }
+
+        if (empty($this->variables['REDIS_PASSWORD'])) {
+            $this->variables['REDIS_PASSWORD'] = 'null';
+        }
+
+        $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
+            'Redis Port',
+            config('database.redis.default.port')
+        );
    }
 }
--- a/app/Console/Commands/Environment/CacheSettingsCommand.php
+++ b/app/Console/Commands/Environment/CacheSettingsCommand.php
@@ -1,66 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class CacheSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const CACHE_DRIVERS = [
-        'file' => 'Filesystem (default)',
-        'database' => 'Database',
-        'redis' => 'Redis',
-    ];
-
-    protected $description = 'Configure cache settings for the Panel.';
-
-    protected $signature = 'p:environment:cache
-                            {--driver= : The cache driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    /**
-     * CacheSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('cache.default', 'file');
-        $this->variables['CACHE_STORE'] = $this->option('driver') ?? $this->choice(
-            'Cache Driver',
-            self::CACHE_DRIVERS,
-            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['CACHE_STORE'] === 'redis') {
-            $this->requestRedisSettings();
-
-            if (config('queue.default') !== 'sync') {
-                $this->call('p:environment:queue-service', [
-                    '--overwrite' => true,
-                ]);
-            }
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}
--- a/app/Console/Commands/Environment/DatabaseSettingsCommand.php
+++ b/app/Console/Commands/Environment/DatabaseSettingsCommand.php
@@ -1,34 +1,25 @@
 <?php

-namespace App\Console\Commands\Environment;
+namespace Pterodactyl\Console\Commands\Environment;

-use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
-use PDOException;
+use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;

 class DatabaseSettingsCommand extends Command
 {
    use EnvironmentWriterTrait;

-    public const DATABASE_DRIVERS = [
-        'sqlite' => 'SQLite (recommended)',
-        'mariadb' => 'MariaDB',
-        'mysql' => 'MySQL',
-    ];
-
    protected $description = 'Configure database settings for the Panel.';

    protected $signature = 'p:environment:database
-                            {--driver= : The database driver backend to use.}
+                            {--host= : The connection address for the MySQL server.}
+                            {--port= : The connection port for the MySQL server.}
                            {--database= : The database to use.}
-                            {--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.}';
+                            {--username= : Username to use when connecting.}
+                            {--password= : Password to use for this database.}';

-    /** @var array<array-key, mixed> */
    protected array $variables = [];

    /**
@@ -41,148 +32,56 @@ class DatabaseSettingsCommand extends Command

    /**
     * Handle command execution.
+     *
+     * @throws \Pterodactyl\Exceptions\PterodactylException
     */
    public function handle(): int
    {
-        $this->error('Changing the database driver will NOT move any database data!');
-        $this->error('Please make sure you made a database backup first!');
-        $this->error('After changing the driver you will have to manually move the old data to the new database.');
-        if (!$this->confirm('Do you want to continue?')) {
-            return 1;
-        }
-
-        $selected = config('database.default', 'sqlite');
-        $this->variables['DB_CONNECTION'] = $this->option('driver') ?? $this->choice(
-            'Database Driver',
-            self::DATABASE_DRIVERS,
-            array_key_exists($selected, self::DATABASE_DRIVERS) ? $selected : null
+        $this->output->note('It is highly recommended to not use "localhost" as your database host as we have seen frequent socket connection issues. If you want to use a local connection you should be using "127.0.0.1".');
+        $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
+            'Database Host',
+            config('database.connections.mysql.host', '127.0.0.1')
        );

-        if ($this->variables['DB_CONNECTION'] === 'mysql') {
-            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
-            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
-                'Database Host',
-                config('database.connections.mysql.host', '127.0.0.1')
-            );
+        $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
+            'Database Port',
+            config('database.connections.mysql.port', 3306)
+        );

-            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-                'Database Port',
-                config('database.connections.mysql.port', 3306)
-            );
+        $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
+            'Database Name',
+            config('database.connections.mysql.database', 'panel')
+        );

-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Name',
-                config('database.connections.mysql.database', 'panel')
-            );
+        $this->output->note('Using the "root" account for MySQL connections is not only highly frowned upon, it is also not allowed by this application. You\'ll need to have created a MySQL user for this software.');
+        $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
+            'Database Username',
+            config('database.connections.mysql.username', 'pterodactyl')
+        );

-            $this->output->note(trans('commands.database_settings.DB_USERNAME_note'));
-            $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
-                'Database Username',
-                config('database.connections.mysql.username', 'pelican')
-            );
+        $askForMySQLPassword = true;
+        if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
+            $this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
+            $askForMySQLPassword = $this->confirm('It appears you already have a MySQL connection password defined, would you like to change it?');
+        }

-            $askForMySQLPassword = true;
-            if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
-                $this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
-                $askForMySQLPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
+        if ($askForMySQLPassword) {
+            $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
+        }
+
+        try {
+            $this->testMySQLConnection();
+        } catch (\PDOException $exception) {
+            $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
+            $this->output->error('Your connection credentials have NOT been saved. You will need to provide valid connection information before proceeding.');
+
+            if ($this->confirm('Go back and try again?')) {
+                $this->database->disconnect('_pterodactyl_command_test');
+
+                return $this->handle();
            }

-            if ($askForMySQLPassword) {
-                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
-            }
-
-            try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mysql',
-                    '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' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
-            } catch (PDOException $exception) {
-                $this->output->error(sprintf('Unable to connect to the MySQL 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'] === 'mariadb') {
-            $this->output->note(trans('commands.database_settings.DB_HOST_note'));
-            $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
-                'Database Host',
-                config('database.connections.mariadb.host', '127.0.0.1')
-            );
-
-            $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-                'Database Port',
-                config('database.connections.mariadb.port', 3306)
-            );
-
-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Name',
-                config('database.connections.mariadb.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.mariadb.username', 'pelican')
-            );
-
-            $askForMariaDBPassword = true;
-            if (!empty(config('database.connections.mariadb.password')) && $this->input->isInteractive()) {
-                $this->variables['DB_PASSWORD'] = config('database.connections.mariadb.password');
-                $askForMariaDBPassword = $this->confirm(trans('commands.database_settings.DB_PASSWORD_note'));
-            }
-
-            if ($askForMariaDBPassword) {
-                $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
-            }
-
-            try {
-                // Test connection
-                config()->set('database.connections._panel_command_test', [
-                    'driver' => 'mariadb',
-                    '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' => 'utf8mb4',
-                    'collation' => 'utf8mb4_unicode_ci',
-                    'strict' => true,
-                ]);
-
-                $this->database->connection('_panel_command_test')->getPdo();
-            } catch (PDOException $exception) {
-                $this->output->error(sprintf('Unable to connect to the MariaDB 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') {
-            $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-                'Database Path',
-                (string) env('DB_DATABASE', 'database.sqlite')
-            );
+            return 1;
        }

        $this->writeToEnvironment($this->variables);
@@ -191,4 +90,24 @@ class DatabaseSettingsCommand extends Command

        return 0;
    }
+
+    /**
+     * Test that we can connect to the provided MySQL instance and perform a selection.
+     */
+    private function testMySQLConnection()
+    {
+        config()->set('database.connections._pterodactyl_command_test', [
+            'driver' => 'mysql',
+            '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' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'strict' => true,
+        ]);
+
+        $this->database->connection('_pterodactyl_command_test')->getPdo();
+    }
 }
--- a/app/Console/Commands/Environment/EmailSettingsCommand.php
+++ b/app/Console/Commands/Environment/EmailSettingsCommand.php
@@ -1,10 +1,10 @@
 <?php

-namespace App\Console\Commands\Environment;
+namespace Pterodactyl\Console\Commands\Environment;

-use App\Exceptions\PanelException;
-use App\Traits\EnvironmentWriterTrait;
 use Illuminate\Console\Command;
+use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;

 class EmailSettingsCommand extends Command
 {
@@ -23,48 +23,52 @@ class EmailSettingsCommand extends Command
                            {--username=}
                            {--password=}';

-    /** @var array<array-key, mixed> */
    protected array $variables = [];

+    /**
+     * EmailSettingsCommand constructor.
+     */
+    public function __construct(private ConfigRepository $config)
+    {
+        parent::__construct();
+    }
+
    /**
     * Handle command execution.
     *
-     * @throws PanelException
+     * @throws \Pterodactyl\Exceptions\PterodactylException
     */
-    public function handle(): void
+    public function handle()
    {
-        $this->variables['MAIL_MAILER'] = $this->option('driver') ?? $this->choice(
+        $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
            trans('command/messages.environment.mail.ask_driver'),
            [
-                'log' => 'Log',
                'smtp' => 'SMTP Server',
                'sendmail' => 'sendmail Binary',
-                'mailgun' => 'Mailgun',
-                'mandrill' => 'Mandrill',
-                'postmark' => 'Postmark',
+                'mailgun' => 'Mailgun Transactional Email',
+                'mandrill' => 'Mandrill Transactional Email',
+                'postmark' => 'Postmark Transactional Email',
            ],
-            env('MAIL_MAILER', env('MAIL_DRIVER', 'smtp')),
+            $this->config->get('mail.default', 'smtp')
        );

-        $method = 'setup' . studly_case($this->variables['MAIL_MAILER']) . 'DriverVariables';
+        $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
        if (method_exists($this, $method)) {
            $this->{$method}();
        }

        $this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mail_from'),
-            config('mail.from.address')
+            $this->config->get('mail.from.address')
        );

        $this->variables['MAIL_FROM_NAME'] = $this->option('from') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mail_name'),
-            config('mail.from.name')
+            $this->config->get('mail.from.name')
        );

        $this->writeToEnvironment($this->variables);

-        $this->call('queue:restart');
-
        $this->line('Updating stored environment configuration file.');
        $this->line('');
    }
@@ -72,77 +76,77 @@ class EmailSettingsCommand extends Command
    /**
     * Handle variables for SMTP driver.
     */
-    private function setupSmtpDriverVariables(): void
+    private function setupSmtpDriverVariables()
    {
        $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
            trans('command/messages.environment.mail.ask_smtp_host'),
-            config('mail.mailers.smtp.host')
+            $this->config->get('mail.mailers.smtp.host')
        );

        $this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask(
            trans('command/messages.environment.mail.ask_smtp_port'),
-            config('mail.mailers.smtp.port')
+            $this->config->get('mail.mailers.smtp.port')
        );

        $this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask(
            trans('command/messages.environment.mail.ask_smtp_username'),
-            config('mail.mailers.smtp.username')
+            $this->config->get('mail.mailers.smtp.username')
        );

        $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
            trans('command/messages.environment.mail.ask_smtp_password')
        );

-        $this->variables['MAIL_SCHEME'] = $this->option('encryption') ?? $this->choice(
+        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
            trans('command/messages.environment.mail.ask_encryption'),
            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
-            config('mail.mailers.smtp.encryption', 'tls')
+            $this->config->get('mail.mailers.smtp.encryption', 'tls')
        );
    }

    /**
     * Handle variables for mailgun driver.
     */
-    private function setupMailgunDriverVariables(): void
+    private function setupMailgunDriverVariables()
    {
        $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mailgun_domain'),
-            config('services.mailgun.domain')
+            $this->config->get('services.mailgun.domain')
        );

        $this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mailgun_secret'),
-            config('services.mailgun.secret')
+            $this->config->get('services.mailgun.secret')
        );

        $this->variables['MAILGUN_ENDPOINT'] = $this->option('endpoint') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mailgun_endpoint'),
-            config('services.mailgun.endpoint')
+            $this->config->get('services.mailgun.endpoint')
        );
    }

    /**
     * Handle variables for mandrill driver.
     */
-    private function setupMandrillDriverVariables(): void
+    private function setupMandrillDriverVariables()
    {
        $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
            trans('command/messages.environment.mail.ask_mandrill_secret'),
-            config('services.mandrill.secret')
+            $this->config->get('services.mandrill.secret')
        );
    }

    /**
     * Handle variables for postmark driver.
     */
-    private function setupPostmarkDriverVariables(): void
+    private function setupPostmarkDriverVariables()
    {
        $this->variables['MAIL_DRIVER'] = 'smtp';
        $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';
        $this->variables['MAIL_PORT'] = 587;
        $this->variables['MAIL_USERNAME'] = $this->variables['MAIL_PASSWORD'] = $this->option('username') ?? $this->ask(
            trans('command/messages.environment.mail.ask_postmark_username'),
-            config('mail.username')
+            $this->config->get('mail.username')
        );
    }
 }
--- a/app/Console/Commands/Environment/QueueSettingsCommand.php
+++ b/app/Console/Commands/Environment/QueueSettingsCommand.php
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class QueueSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const QUEUE_DRIVERS = [
-        'database' => 'Database (default)',
-        'redis' => 'Redis',
-        'sync' => 'Synchronous',
-    ];
-
-    protected $description = 'Configure queue settings for the Panel.';
-
-    protected $signature = 'p:environment:queue
-                            {--driver= : The queue driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    /**
-     * QueueSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('queue.default', 'database');
-        $this->variables['QUEUE_CONNECTION'] = $this->option('driver') ?? $this->choice(
-            'Queue Driver',
-            self::QUEUE_DRIVERS,
-            array_key_exists($selected, self::QUEUE_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['QUEUE_CONNECTION'] === 'redis') {
-            $this->requestRedisSettings();
-
-            $this->call('p:environment:queue-service', [
-                '--overwrite' => true,
-            ]);
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}
--- a/app/Console/Commands/Environment/QueueWorkerServiceCommand.php
+++ b/app/Console/Commands/Environment/QueueWorkerServiceCommand.php
@@ -1,96 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\File;
-use Illuminate\Support\Facades\Process;
-
-class QueueWorkerServiceCommand extends Command
-{
-    protected $description = 'Create the service for the queue worker.';
-
-    protected $signature = 'p:environment:queue-service
-        {--service-name= : Name of the queue worker service.}
-        {--user= : The user that PHP runs under.}
-        {--group= : The group that PHP runs under.}
-        {--overwrite : Force overwrite if the service file already exists.}';
-
-    public function handle(): void
-    {
-        if (@file_exists('/.dockerenv')) {
-            $result = Process::run('supervisorctl restart queue-worker');
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-            $this->line('Queue worker service file updated successfully.');
-
-            return;
-        }
-        $serviceName = $this->option('service-name') ?? $this->ask('Queue worker service name', 'pelican-queue');
-        $path = '/etc/systemd/system/' . $serviceName  . '.service';
-
-        $fileExists = @file_exists($path);
-        if ($fileExists && !$this->option('overwrite') && !$this->confirm('The service file already exists. Do you want to overwrite it?')) {
-            $this->line('Creation of queue worker service file aborted because service file already exists.');
-
-            return;
-        }
-
-        $user = $this->option('user') ?? $this->ask('Webserver User', 'www-data');
-        $group = $this->option('group') ?? $this->ask('Webserver Group', 'www-data');
-
-        $redisUsed = config('queue.default') === 'redis' || config('session.driver') === 'redis' || config('cache.default') === 'redis';
-        $afterRedis = $redisUsed ? '
-After=redis-server.service' : '';
-
-        $basePath = base_path();
-
-        $success = File::put($path, "# Pelican Queue File
-# ----------------------------------
-
-[Unit]
-Description=Pelican Queue Service$afterRedis
-
-[Service]
-User=$user
-Group=$group
-Restart=always
-ExecStart=/usr/bin/php $basePath/artisan queue:work --tries=3
-StartLimitInterval=180
-StartLimitBurst=30
-RestartSec=5s
-
-[Install]
-WantedBy=multi-user.target
-        ");
-
-        if (!$success) {
-            $this->error('Error creating service file');
-
-            return;
-        }
-
-        if ($fileExists) {
-            $result = Process::run("systemctl restart $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error restarting service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file updated successfully.');
-        } else {
-            $result = Process::run("systemctl enable --now $serviceName.service");
-            if ($result->failed()) {
-                $this->error('Error enabling service: ' . $result->errorOutput());
-
-                return;
-            }
-
-            $this->line('Queue worker service file created successfully.');
-        }
-    }
-}
--- a/app/Console/Commands/Environment/RedisSetupCommand.php
+++ b/app/Console/Commands/Environment/RedisSetupCommand.php
@@ -1,52 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class RedisSetupCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    protected $description = 'Configure the Panel to use Redis as cache, queue and session driver.';
-
-    protected $signature = 'p:redis:setup
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    /**
-     * RedisSetupCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $this->variables['CACHE_STORE'] = 'redis';
-        $this->variables['QUEUE_CONNECTION'] = 'redis';
-        $this->variables['SESSION_DRIVER'] = 'redis';
-
-        $this->requestRedisSettings();
-
-        $this->call('p:environment:queue-service', [
-            '--overwrite' => true,
-        ]);
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}
--- a/app/Console/Commands/Environment/SessionSettingsCommand.php
+++ b/app/Console/Commands/Environment/SessionSettingsCommand.php
@@ -1,67 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Environment;
-
-use App\Traits\Commands\RequestRedisSettingsTrait;
-use App\Traits\EnvironmentWriterTrait;
-use Illuminate\Console\Command;
-use Illuminate\Contracts\Console\Kernel;
-
-class SessionSettingsCommand extends Command
-{
-    use EnvironmentWriterTrait;
-    use RequestRedisSettingsTrait;
-
-    public const SESSION_DRIVERS = [
-        'file' => 'Filesystem (default)',
-        'redis' => 'Redis',
-        'database' => 'Database',
-        'cookie' => 'Cookie',
-    ];
-
-    protected $description = 'Configure session settings for the Panel.';
-
-    protected $signature = 'p:environment:session
-                            {--driver= : The session driver backend to use.}
-                            {--redis-host= : Redis host to use for connections.}
-                            {--redis-user= : User used to connect to redis.}
-                            {--redis-pass= : Password used to connect to redis.}
-                            {--redis-port= : Port to connect to redis over.}';
-
-    /**
-     * SessionSettingsCommand constructor.
-     */
-    public function __construct(private Kernel $console)
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Handle command execution.
-     */
-    public function handle(): int
-    {
-        $selected = config('session.driver', 'file');
-        $this->variables['SESSION_DRIVER'] = $this->option('driver') ?? $this->choice(
-            'Session Driver',
-            self::SESSION_DRIVERS,
-            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
-        );
-
-        if ($this->variables['SESSION_DRIVER'] === 'redis') {
-            $this->requestRedisSettings();
-
-            if (config('queue.default') !== 'sync') {
-                $this->call('p:environment:queue-service', [
-                    '--overwrite' => true,
-                ]);
-            }
-        }
-
-        $this->writeToEnvironment($this->variables);
-
-        $this->info($this->console->output());
-
-        return 0;
-    }
-}
--- a/app/Console/Commands/InfoCommand.php
+++ b/app/Console/Commands/InfoCommand.php
@@ -1,17 +1,81 @@
 <?php

-namespace App\Console\Commands;
+namespace Pterodactyl\Console\Commands;

 use Illuminate\Console\Command;
+use Pterodactyl\Services\Helpers\SoftwareVersionService;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;

 class InfoCommand extends Command
 {
-    protected $description = 'Displays the application, database, email and backup configurations along with the panel version.';
+    protected $description = 'Displays the application, database, and email configurations along with the panel version.';

    protected $signature = 'p:info';

-    public function handle(): void
+    /**
+     * VersionCommand constructor.
+     */
+    public function __construct(private ConfigRepository $config, private SoftwareVersionService $versionService)
    {
-        $this->call('about');
+        parent::__construct();
+    }
+
+    /**
+     * Handle execution of command.
+     */
+    public function handle()
+    {
+        $this->output->title('Version Information');
+        $this->table([], [
+            ['Panel Version', $this->config->get('app.version')],
+            ['Latest Version', $this->versionService->getPanel()],
+            ['Up-to-Date', $this->versionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
+            ['Unique Identifier', $this->config->get('pterodactyl.service.author')],
+        ], 'compact');
+
+        $this->output->title('Application Configuration');
+        $this->table([], [
+            ['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ?: 'bg=red')],
+            ['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', !$this->config->get('app.debug') ?: 'bg=red')],
+            ['Installation URL', $this->config->get('app.url')],
+            ['Installation Directory', base_path()],
+            ['Timezone', $this->config->get('app.timezone')],
+            ['Cache Driver', $this->config->get('cache.default')],
+            ['Queue Driver', $this->config->get('queue.default')],
+            ['Session Driver', $this->config->get('session.driver')],
+            ['Filesystem Driver', $this->config->get('filesystems.default')],
+            ['Default Theme', $this->config->get('themes.active')],
+            ['Proxies', $this->config->get('trustedproxies.proxies')],
+        ], 'compact');
+
+        $this->output->title('Database Configuration');
+        $driver = $this->config->get('database.default');
+        $this->table([], [
+            ['Driver', $driver],
+            ['Host', $this->config->get("database.connections.$driver.host")],
+            ['Port', $this->config->get("database.connections.$driver.port")],
+            ['Database', $this->config->get("database.connections.$driver.database")],
+            ['Username', $this->config->get("database.connections.$driver.username")],
+        ], 'compact');
+
+        // TODO: Update this to handle other mail drivers
+        $this->output->title('Email Configuration');
+        $this->table([], [
+            ['Driver', $this->config->get('mail.default')],
+            ['Host', $this->config->get('mail.mailers.smtp.host')],
+            ['Port', $this->config->get('mail.mailers.smtp.port')],
+            ['Username', $this->config->get('mail.mailers.smtp.username')],
+            ['From Address', $this->config->get('mail.from.address')],
+            ['From Name', $this->config->get('mail.from.name')],
+            ['Encryption', $this->config->get('mail.mailers.smtp.encryption')],
+        ], 'compact');
+    }
+
+    /**
+     * Format output in a Name: Value manner.
+     */
+    private function formatText(string $value, string $opts = ''): string
+    {
+        return sprintf('<%s>%s</>', $opts, $value);
    }
 }
--- a/app/Console/Commands/Location/DeleteLocationCommand.php
+++ b/app/Console/Commands/Location/DeleteLocationCommand.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Location;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Collection;
+use Pterodactyl\Services\Locations\LocationDeletionService;
+use Pterodactyl\Contracts\Repository\LocationRepositoryInterface;
+
+class DeleteLocationCommand extends Command
+{
+    protected $description = 'Deletes a location from the Panel.';
+
+    protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
+
+    protected Collection $locations;
+
+    /**
+     * DeleteLocationCommand constructor.
+     */
+    public function __construct(
+        private LocationDeletionService $deletionService,
+        private LocationRepositoryInterface $repository
+    ) {
+        parent::__construct();
+    }
+
+    /**
+     * Respond to the command request.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     * @throws \Pterodactyl\Exceptions\Service\Location\HasActiveNodesException
+     */
+    public function handle()
+    {
+        $this->locations = $this->locations ?? $this->repository->all();
+        $short = $this->option('short') ?? $this->anticipate(
+            trans('command/messages.location.ask_short'),
+            $this->locations->pluck('short')->toArray()
+        );
+
+        $location = $this->locations->where('short', $short)->first();
+        if (is_null($location)) {
+            $this->error(trans('command/messages.location.no_location_found'));
+            if ($this->input->isInteractive()) {
+                $this->handle();
+            }
+
+            return;
+        }
+
+        $this->deletionService->handle($location->id);
+        $this->line(trans('command/messages.location.deleted'));
+    }
+}
--- a/app/Console/Commands/Location/MakeLocationCommand.php
+++ b/app/Console/Commands/Location/MakeLocationCommand.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Location;
+
+use Illuminate\Console\Command;
+use Pterodactyl\Services\Locations\LocationCreationService;
+
+class MakeLocationCommand extends Command
+{
+    protected $signature = 'p:location:make
+                            {--short= : The shortcode name of this location (ex. us1).}
+                            {--long= : A longer description of this location.}';
+
+    protected $description = 'Creates a new location on the system via the CLI.';
+
+    /**
+     * Create a new command instance.
+     */
+    public function __construct(private LocationCreationService $creationService)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle the command execution process.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function handle()
+    {
+        $short = $this->option('short') ?? $this->ask(trans('command/messages.location.ask_short'));
+        $long = $this->option('long') ?? $this->ask(trans('command/messages.location.ask_long'));
+
+        $location = $this->creationService->handle(compact('short', 'long'));
+        $this->line(trans('command/messages.location.created', [
+            'name' => $location->short,
+            'id' => $location->id,
+        ]));
+    }
+}
--- a/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
+++ b/app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php
@@ -1,12 +1,11 @@
 <?php

-namespace App\Console\Commands\Maintenance;
+namespace Pterodactyl\Console\Commands\Maintenance;

 use Carbon\Carbon;
 use Illuminate\Console\Command;
-use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 use Illuminate\Contracts\Filesystem\Filesystem;
-use SplFileInfo;
+use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;

 class CleanServiceBackupFilesCommand extends Command
 {
@@ -31,12 +30,11 @@ class CleanServiceBackupFilesCommand extends Command
    /**
     * Handle command execution.
     */
-    public function handle(): void
+    public function handle()
    {
-        /** @var SplFileInfo[] */
        $files = $this->disk->files('services/.bak');

-        collect($files)->each(function ($file) {
+        collect($files)->each(function (\SplFileInfo $file) {
            $lastModified = Carbon::createFromTimestamp($this->disk->lastModified($file->getPath()));
            if ($lastModified->diffInMinutes(Carbon::now()) > self::BACKUP_THRESHOLD_MINUTES) {
                $this->disk->delete($file->getPath());
--- a/app/Console/Commands/Maintenance/PruneImagesCommand.php
+++ b/app/Console/Commands/Maintenance/PruneImagesCommand.php
@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Console\Commands\Maintenance;
-
-use App\Models\Node;
-use Exception;
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Http;
-
-class PruneImagesCommand extends Command
-{
-    protected $signature = 'p:maintenance:prune-images {node?}';
-
-    protected $description = 'Clean up all dangling docker images to clear up disk space.';
-
-    public function handle(): void
-    {
-        $node = $this->argument('node');
-
-        if (empty($node)) {
-            $nodes = Node::all();
-            /** @var Node $node */
-            foreach ($nodes as $node) {
-                $this->cleanupImages($node);
-            }
-        } else {
-            $this->cleanupImages((int) $node);
-        }
-    }
-
-    private function cleanupImages(int|Node $node): void
-    {
-        if (!$node instanceof Node) {
-            $node = Node::query()->findOrFail($node);
-        }
-
-        try {
-            $response = Http::daemon($node)
-                ->connectTimeout(5)
-                ->timeout(30)
-                ->delete('/api/system/docker/image/prune')
-                ->json() ?? [];
-
-            if (empty($response) || $response['ImagesDeleted'] === null) {
-                $this->warn("Node {$node->id}: No images to clean up.");
-
-                return;
-            }
-
-            $count = count($response['ImagesDeleted']);
-
-            $useBinaryPrefix = config('panel.use_binary_prefix');
-            $space = round($useBinaryPrefix ? $response['SpaceReclaimed'] / 1024 / 1024 : $response['SpaceReclaimed'] / 1000 / 1000, 2) . ($useBinaryPrefix ? ' MiB' : ' MB');
-
-            $this->info("Node {$node->id}: Cleaned up {$count} dangling docker images. ({$space})");
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-        }
-    }
-}
--- a/app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php
+++ b/app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php
@@ -1,11 +1,10 @@
 <?php

-namespace App\Console\Commands\Maintenance;
+namespace Pterodactyl\Console\Commands\Maintenance;

-use App\Models\Backup;
 use Carbon\CarbonImmutable;
 use Illuminate\Console\Command;
-use InvalidArgumentException;
+use Pterodactyl\Repositories\Eloquent\BackupRepository;

 class PruneOrphanedBackupsCommand extends Command
 {
@@ -13,14 +12,22 @@ class PruneOrphanedBackupsCommand extends Command

    protected $description = 'Marks all backups older than "n" minutes that have not yet completed as being failed.';

-    public function handle(): void
+    /**
+     * PruneOrphanedBackupsCommand constructor.
+     */
+    public function __construct(private BackupRepository $backupRepository)
+    {
+        parent::__construct();
+    }
+
+    public function handle()
    {
        $since = $this->option('prune-age') ?? config('backups.prune_age', 360);
        if (!$since || !is_digit($since)) {
-            throw new InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
+            throw new \InvalidArgumentException('The "--prune-age" argument must be a value greater than 0.');
        }

-        $query = Backup::query()
+        $query = $this->backupRepository->getBuilder()
            ->whereNull('completed_at')
            ->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());

--- a/app/Console/Commands/Node/MakeNodeCommand.php
+++ b/app/Console/Commands/Node/MakeNodeCommand.php
@@ -1,10 +1,9 @@
 <?php

-namespace App\Console\Commands\Node;
+namespace Pterodactyl\Console\Commands\Node;

-use App\Exceptions\Model\DataValidationException;
-use App\Models\Node;
 use Illuminate\Console\Command;
+use Pterodactyl\Services\Nodes\NodeCreationService;

 class MakeNodeCommand extends Command
 {
@@ -21,50 +20,50 @@ class MakeNodeCommand extends Command
                            {--overallocateMemory= : Enter the amount of ram to overallocate (% or -1 to overallocate the maximum).}
                            {--maxDisk= : Set the max disk amount.}
                            {--overallocateDisk= : Enter the amount of disk to overallocate (% or -1 to overallocate the maximum).}
-                            {--maxCpu= : Set the max cpu amount.}
-                            {--overallocateCpu= : Enter the amount of cpu to overallocate (% or -1 to overallocate the maximum).}
                            {--uploadSize= : Enter the maximum upload filesize.}
-                            {--daemonListeningPort= : Enter the daemon listening port.}
-                            {--daemonConnectingPort= : Enter the daemon connecting port.}
-                            {--daemonSFTPPort= : Enter the daemon SFTP listening port.}
-                            {--daemonSFTPAlias= : Enter the daemon SFTP alias.}
+                            {--daemonListeningPort= : Enter the wings listening port.}
+                            {--daemonSFTPPort= : Enter the wings SFTP listening port.}
                            {--daemonBase= : Enter the base folder.}';

    protected $description = 'Creates a new node on the system via the CLI.';

+    /**
+     * MakeNodeCommand constructor.
+     */
+    public function __construct(private NodeCreationService $creationService)
+    {
+        parent::__construct();
+    }
+
    /**
     * Handle the command execution process.
     *
-     * @throws DataValidationException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     */
-    public function handle(): void
+    public function handle()
    {
-        $data['name'] = $this->option('name') ?? $this->ask(trans('commands.make_node.name'));
-        $data['description'] = $this->option('description') ?? $this->ask(trans('commands.make_node.description'));
+        $data['name'] = $this->option('name') ?? $this->ask('Enter a short identifier used to distinguish this node from others');
+        $data['description'] = $this->option('description') ?? $this->ask('Enter a description to identify the node');
+        $data['location_id'] = $this->option('locationId') ?? $this->ask('Enter a valid location id');
        $data['scheme'] = $this->option('scheme') ?? $this->anticipate(
-            trans('commands.make_node.scheme'),
+            'Please either enter https for SSL or http for a non-ssl connection',
            ['https', 'http'],
            'https'
        );
+        $data['fqdn'] = $this->option('fqdn') ?? $this->ask('Enter a domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node');
+        $data['public'] = $this->option('public') ?? $this->confirm('Should this node be public? As a note, setting a node to private you will be denying the ability to auto-deploy to this node.', true);
+        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm('Is your FQDN behind a proxy?');
+        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm('Should maintenance mode be enabled?');
+        $data['memory'] = $this->option('maxMemory') ?? $this->ask('Enter the maximum amount of memory');
+        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new servers');
+        $data['disk'] = $this->option('maxDisk') ?? $this->ask('Enter the maximum amount of disk space');
+        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new server');
+        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Enter the maximum filesize upload', '100');
+        $data['daemonListen'] = $this->option('daemonListeningPort') ?? $this->ask('Enter the wings listening port', '8080');
+        $data['daemonSFTP'] = $this->option('daemonSFTPPort') ?? $this->ask('Enter the wings SFTP listening port', '2022');
+        $data['daemonBase'] = $this->option('daemonBase') ?? $this->ask('Enter the base folder', '/var/lib/pterodactyl/volumes');

-        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(trans('commands.make_node.fqdn'));
-        $data['public'] = $this->option('public') ?? $this->confirm(trans('commands.make_node.public'), true);
-        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(trans('commands.make_node.behind_proxy'));
-        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(trans('commands.make_node.maintenance_mode'));
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask(trans('commands.make_node.memory'), '0');
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(trans('commands.make_node.memory_overallocate'), '-1');
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask(trans('commands.make_node.disk'), '0');
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(trans('commands.make_node.disk_overallocate'), '-1');
-        $data['cpu'] = $this->option('maxCpu') ?? $this->ask(trans('commands.make_node.cpu'), '0');
-        $data['cpu_overallocate'] = $this->option('overallocateCpu') ?? $this->ask(trans('commands.make_node.cpu_overallocate'), '-1');
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(trans('commands.make_node.upload_size'), '256');
-        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(trans('commands.make_node.daemonListen'), '8080');
-        $data['daemon_connect'] = $this->option('daemonConnectingPort') ?? $this->ask(trans('commands.make_node.daemonConnect'), '8080');
-        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(trans('commands.make_node.daemonSFTP'), '2022');
-        $data['daemon_sftp_alias'] = $this->option('daemonSFTPAlias') ?? $this->ask(trans('commands.make_node.daemonSFTPAlias'), '');
-        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(trans('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
-
-        $node = Node::create($data);
-        $this->line(trans('commands.make_node.success', ['name' => $data['name'], 'id' => $node->id]));
+        $node = $this->creationService->handle($data);
+        $this->line('Successfully created a new node on the location ' . $data['location_id'] . ' with the name ' . $data['name'] . ' and has an id of ' . $node->id . '.');
    }
 }
--- a/app/Console/Commands/Node/NodeConfigurationCommand.php
+++ b/app/Console/Commands/Node/NodeConfigurationCommand.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Console\Commands\Node;
+namespace Pterodactyl\Console\Commands\Node;

-use App\Models\Node;
+use Pterodactyl\Models\Node;
 use Illuminate\Console\Command;

 class NodeConfigurationCommand extends Command
@@ -17,16 +17,16 @@ class NodeConfigurationCommand extends Command
    {
        $column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';

-        /** @var Node $node */
+        /** @var \Pterodactyl\Models\Node $node */
        $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
-            $this->error(trans('commands.node_config.error_not_exist'));
+            $this->error('The selected node does not exist.');

            exit(1);
        });

        $format = $this->option('format');
        if (!in_array($format, ['yaml', 'yml', 'json'])) {
-            $this->error(trans('commands.node_config.error_invalid_format'));
+            $this->error('Invalid format specified. Valid options are "yaml" and "json".');

            return 1;
        }
--- a/app/Console/Commands/Node/NodeListCommand.php
+++ b/app/Console/Commands/Node/NodeListCommand.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Console\Commands\Node;
+namespace Pterodactyl\Console\Commands\Node;

-use App\Models\Node;
+use Pterodactyl\Models\Node;
 use Illuminate\Console\Command;

 class NodeListCommand extends Command
@@ -11,11 +11,12 @@ class NodeListCommand extends Command

    public function handle(): int
    {
-        $nodes = Node::query()->get()->map(function (Node $node) {
+        $nodes = Node::query()->with('location')->get()->map(function (Node $node) {
            return [
                'id' => $node->id,
                'uuid' => $node->uuid,
                'name' => $node->name,
+                'location' => $node->location->short,
                'host' => $node->getConnectionAddress(),
            ];
        });
@@ -23,7 +24,7 @@ class NodeListCommand extends Command
        if ($this->option('format') === 'json') {
            $this->output->write($nodes->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
        } else {
-            $this->table(['ID', 'UUID', 'Name', 'Host'], $nodes->toArray());
+            $this->table(['ID', 'UUID', 'Name', 'Location', 'Host'], $nodes->toArray());
        }

        $this->output->newLine();
--- a/app/Console/Commands/Overrides/KeyGenerateCommand.php
+++ b/app/Console/Commands/Overrides/KeyGenerateCommand.php
@@ -1,6 +1,6 @@
 <?php

-namespace App\Console\Commands\Overrides;
+namespace Pterodactyl\Console\Commands\Overrides;

 use Illuminate\Foundation\Console\KeyGenerateCommand as BaseKeyGenerateCommand;

@@ -10,15 +10,15 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
     * Override the default Laravel key generation command to throw a warning to the user
     * if it appears that they have already generated an application encryption key.
     */
-    public function handle(): void
+    public function handle()
    {
        if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning(trans('commands.key_generate.error_already_exist'));
-            if (!$this->confirm(trans('commands.key_generate.understand'))) {
+            $this->output->warning('It appears you have already configured an application encryption key. Continuing with this process with overwrite that key and cause data corruption for any existing encrypted data. DO NOT CONTINUE UNLESS YOU KNOW WHAT YOU ARE DOING.');
+            if (!$this->confirm('I understand the consequences of performing this command and accept all responsibility for the loss of encrypted data.')) {
                return;
            }

-            if (!$this->confirm(trans('commands.key_generate.continue'))) {
+            if (!$this->confirm('Are you sure you wish to continue? Changing the application encryption key WILL CAUSE DATA LOSS.')) {
                return;
            }
        }
--- a/app/Console/Commands/Overrides/SeedCommand.php
+++ b/app/Console/Commands/Overrides/SeedCommand.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Console\Commands\Overrides;
+namespace Pterodactyl\Console\Commands\Overrides;

-use App\Traits\Commands\RequiresDatabaseMigrations;
+use Pterodactyl\Console\RequiresDatabaseMigrations;
 use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;

 class SeedCommand extends BaseSeedCommand
--- a/app/Console/Commands/Overrides/UpCommand.php
+++ b/app/Console/Commands/Overrides/UpCommand.php
@@ -1,8 +1,8 @@
 <?php

-namespace App\Console\Commands\Overrides;
+namespace Pterodactyl\Console\Commands\Overrides;

-use App\Traits\Commands\RequiresDatabaseMigrations;
+use Pterodactyl\Console\RequiresDatabaseMigrations;
 use Illuminate\Foundation\Console\UpCommand as BaseUpCommand;

 class UpCommand extends BaseUpCommand
@@ -21,6 +21,6 @@ class UpCommand extends BaseUpCommand
            return 1;
        }

-        return parent::handle();
+        return parent::handle() ?? 0;
    }
 }
--- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php
+++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php
@@ -1,12 +1,13 @@
 <?php

-namespace App\Console\Commands\Schedule;
+namespace Pterodactyl\Console\Commands\Schedule;

-use App\Models\Schedule;
-use App\Services\Schedules\ProcessScheduleService;
+use Exception;
 use Illuminate\Console\Command;
+use Pterodactyl\Models\Schedule;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Database\Eloquent\Builder;
-use Throwable;
+use Pterodactyl\Services\Schedules\ProcessScheduleService;

 class ProcessRunnableCommand extends Command
 {
@@ -14,18 +15,21 @@ class ProcessRunnableCommand extends Command

    protected $description = 'Process schedules in the database and determine which are ready to run.';

-    public function handle(ProcessScheduleService $processScheduleService): int
+    /**
+     * Handle command execution.
+     */
+    public function handle(): int
    {
        $schedules = Schedule::query()
            ->with('tasks')
            ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
            ->where('is_active', true)
            ->where('is_processing', false)
-            ->where('next_run_at', '<=', now('UTC')->toDateTimeString())
+            ->whereRaw('next_run_at <= NOW()')
            ->get();

        if ($schedules->count() < 1) {
-            $this->line(trans('commands.schedule.process.no_tasks'));
+            $this->line('There are no scheduled tasks for servers that need to be run.');

            return 0;
        }
@@ -33,7 +37,7 @@ class ProcessRunnableCommand extends Command
        $bar = $this->output->createProgressBar(count($schedules));
        foreach ($schedules as $schedule) {
            $bar->clear();
-            $this->processSchedule($processScheduleService, $schedule);
+            $this->processSchedule($schedule);
            $bar->advance();
            $bar->display();
        }
@@ -47,24 +51,26 @@ class ProcessRunnableCommand extends Command
     * Processes a given schedule and logs and errors encountered the console output. This should
     * never throw an exception out, otherwise you'll end up killing the entire run group causing
     * any other schedules to not process correctly.
+     *
+     * @see https://github.com/pterodactyl/panel/issues/2609
     */
-    protected function processSchedule(ProcessScheduleService $processScheduleService, Schedule $schedule): void
+    protected function processSchedule(Schedule $schedule)
    {
        if ($schedule->tasks->isEmpty()) {
            return;
        }

        try {
-            $processScheduleService->handle($schedule);
+            $this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);

            $this->line(trans('command/messages.schedule.output_line', [
                'schedule' => $schedule->name,
-                'id' => $schedule->id,
+                'hash' => $schedule->hashid,
            ]));
-        } catch (Throwable $exception) {
-            logger()->error($exception, ['schedule_id' => $schedule->id]);
+        } catch (\Throwable|\Exception $exception) {
+            Log::error($exception, ['schedule_id' => $schedule->id]);

-            $this->error(trans('commands.schedule.process.error_message', ['schedules' => " #$schedule->id: " . $exception->getMessage()]));
+            $this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage());
        }
    }
 }
--- a/app/Console/Commands/Server/BulkPowerActionCommand.php
+++ b/app/Console/Commands/Server/BulkPowerActionCommand.php
@@ -1,14 +1,14 @@
 <?php

-namespace App\Console\Commands\Server;
+namespace Pterodactyl\Console\Commands\Server;

-use App\Models\Server;
-use App\Repositories\Daemon\DaemonServerRepository;
-use Exception;
+use Pterodactyl\Models\Server;
 use Illuminate\Console\Command;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Validation\Factory as ValidatorFactory;
 use Illuminate\Validation\ValidationException;
+use Illuminate\Validation\Factory as ValidatorFactory;
+use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
+use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;

 class BulkPowerActionCommand extends Command
 {
@@ -19,13 +19,26 @@ class BulkPowerActionCommand extends Command

    protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';

-    public function handle(DaemonServerRepository $serverRepository, ValidatorFactory $validator): void
+    /**
+     * BulkPowerActionCommand constructor.
+     */
+    public function __construct(private DaemonPowerRepository $powerRepository, private ValidatorFactory $validator)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle the bulk power request.
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function handle()
    {
        $action = $this->argument('action');
        $nodes = empty($this->option('nodes')) ? [] : explode(',', $this->option('nodes'));
        $servers = empty($this->option('servers')) ? [] : explode(',', $this->option('servers'));

-        $validator = $validator->make([
+        $validator = $this->validator->make([
            'action' => $action,
            'nodes' => $nodes,
            'servers' => $servers,
@@ -51,17 +64,13 @@ class BulkPowerActionCommand extends Command
        }

        $bar = $this->output->createProgressBar($count);
-
-        $this->getQueryBuilder($servers, $nodes)->get()->each(function ($server, int $index) use ($action, $serverRepository, &$bar): mixed {
+        $powerRepository = $this->powerRepository;
+        $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
            $bar->clear();

-            if (!$server instanceof Server) {
-                return null;
-            }
-
            try {
-                $serverRepository->setServer($server)->power($action);
-            } catch (Exception $exception) {
+                $powerRepository->setServer($server)->send($action);
+            } catch (DaemonConnectionException $exception) {
                $this->output->error(trans('command/messages.server.power.action_failed', [
                    'name' => $server->name,
                    'id' => $server->id,
@@ -72,8 +81,6 @@ class BulkPowerActionCommand extends Command

            $bar->advance();
            $bar->display();
-
-            return null;
        });

        $this->line('');
@@ -81,9 +88,6 @@ class BulkPowerActionCommand extends Command

    /**
     * Returns the query builder instance that will return the servers that should be affected.
-     *
-     * @param  string[]|int[]  $servers
-     * @param  string[]|int[]  $nodes
     */
    protected function getQueryBuilder(array $servers, array $nodes): Builder
    {
@@ -93,7 +97,7 @@ class BulkPowerActionCommand extends Command
            $instance->whereIn('id', $servers)->orWhereIn('node_id', $nodes);
        } elseif (empty($nodes) && !empty($servers)) {
            $instance->whereIn('id', $servers);
-        } elseif (!empty($nodes)) {
+        } elseif (!empty($nodes) && empty($servers)) {
            $instance->whereIn('node_id', $nodes);
        }

--- a/app/Console/Commands/TelemetryCommand.php
+++ b/app/Console/Commands/TelemetryCommand.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Pterodactyl\Console\Commands;
+
+use Illuminate\Console\Command;
+use Symfony\Component\VarDumper\VarDumper;
+use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
+
+class TelemetryCommand extends Command
+{
+    protected $description = 'Displays all the data that would be sent to the Pterodactyl Telemetry Service if telemetry collection is enabled.';
+
+    protected $signature = 'p:telemetry';
+
+    /**
+     * TelemetryCommand constructor.
+     */
+    public function __construct(private TelemetryCollectionService $telemetryCollectionService)
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Handle execution of command.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function handle()
+    {
+        $this->output->info('Collecting telemetry data, this may take a while...');
+
+        VarDumper::dump($this->telemetryCollectionService->collect());
+    }
+}
--- a/app/Console/Commands/UpgradeCommand.php
+++ b/app/Console/Commands/UpgradeCommand.php
@@ -1,62 +1,62 @@
 <?php

-namespace App\Console\Commands;
+namespace Pterodactyl\Console\Commands;

-use App\Console\Kernel;
-use Closure;
-use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Foundation\Application;
-use Symfony\Component\Console\Helper\ProgressBar;
+use Pterodactyl\Console\Kernel;
 use Symfony\Component\Process\Process;
+use Symfony\Component\Console\Helper\ProgressBar;

 class UpgradeCommand extends Command
 {
-    protected const DEFAULT_URL = 'https://github.com/pelican-dev/panel/releases/%s/panel.tar.gz';
+    protected const DEFAULT_URL = 'https://github.com/pterodactyl/panel/releases/%s/panel.tar.gz';

    protected $signature = 'p:upgrade
        {--user= : The user that PHP runs under. All files will be owned by this user.}
        {--group= : The group that PHP runs under. All files will be owned by this group.}
        {--url= : The specific archive to download.}
-        {--release= : A specific version to download from GitHub. Leave blank to use latest.}
+        {--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
        {--skip-download : If set no archive will be downloaded.}';

-    protected $description = 'Downloads a new archive from GitHub and then executes the normal upgrade commands.';
+    protected $description = 'Downloads a new archive for Pterodactyl from GitHub and then executes the normal upgrade commands.';

    /**
     * Executes an upgrade command which will run through all of our standard
-     * Panel commands and enable users to basically just download
+     * commands for Pterodactyl and enable users to basically just download
     * the archive and execute this and be done.
     *
     * This places the application in maintenance mode as well while the commands
     * are being executed.
     *
-     * @throws Exception
+     * @throws \Exception
     */
-    public function handle(): void
+    public function handle()
    {
        $skipDownload = $this->option('skip-download');
        if (!$skipDownload) {
-            $this->output->warning(trans('commands.upgrade.integrity'));
-            $this->output->comment(trans('commands.upgrade.source_url'));
+            $this->output->warning('This command does not verify the integrity of downloaded assets. Please ensure that you trust the download source before continuing. If you do not wish to download an archive, please indicate that using the --skip-download flag, or answering "no" to the question below.');
+            $this->output->comment('Download Source (set with --url=):');
            $this->line($this->getUrl());
        }

+        if (version_compare(PHP_VERSION, '7.4.0') < 0) {
+            $this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 7.4.0, you have [' . PHP_VERSION . '].');
+        }
+
        $user = 'www-data';
        $group = 'www-data';
        if ($this->input->isInteractive()) {
            if (!$skipDownload) {
-                $skipDownload = !$this->confirm(trans('commands.upgrade.skipDownload'), true);
+                $skipDownload = !$this->confirm('Would you like to download and unpack the archive files for the latest version?', true);
            }

            if (is_null($this->option('user'))) {
-                $userDetails = function_exists('posix_getpwuid') ? posix_getpwuid(fileowner('public')) : [];
+                $userDetails = posix_getpwuid(fileowner('public'));
                $user = $userDetails['name'] ?? 'www-data';

-                $message = trans('commands.upgrade.webserver_user', ['user' => $user]);
-                if (!$this->confirm($message, true)) {
+                if (!$this->confirm("Your webserver user has been detected as <fg=blue>[{$user}]:</> is this correct?", true)) {
                    $user = $this->anticipate(
-                        trans('commands.upgrade.name_webserver'),
+                        'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
                        [
                            'www-data',
                            'nginx',
@@ -67,13 +67,12 @@ class UpgradeCommand extends Command
            }

            if (is_null($this->option('group'))) {
-                $groupDetails = function_exists('posix_getgrgid') ? posix_getgrgid(filegroup('public')) : [];
+                $groupDetails = posix_getgrgid(filegroup('public'));
                $group = $groupDetails['name'] ?? 'www-data';

-                $message = trans('commands.upgrade.group_webserver', ['group' => $user]);
-                if (!$this->confirm($message, true)) {
+                if (!$this->confirm("Your webserver group has been detected as <fg=blue>[{$group}]:</> is this correct?", true)) {
                    $group = $this->anticipate(
-                        trans('commands.upgrade.group_webserver_question'),
+                        'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
                        [
                            'www-data',
                            'nginx',
@@ -83,8 +82,8 @@ class UpgradeCommand extends Command
                }
            }

-            if (!$this->confirm(trans('commands.upgrade.are_your_sure'))) {
-                $this->warn(trans('commands.upgrade.terminated'));
+            if (!$this->confirm('Are you sure you want to run the upgrade process for your Panel?')) {
+                $this->warn('Upgrade process terminated by user.');

                return;
            }
@@ -132,9 +131,9 @@ class UpgradeCommand extends Command
            });
        });

-        /** @var Application $app */
+        /** @var \Illuminate\Foundation\Application $app */
        $app = require __DIR__ . '/../../../bootstrap/app.php';
-        /** @var Kernel $kernel */
+        /** @var \Pterodactyl\Console\Kernel $kernel */
        $kernel = $app->make(Kernel::class);
        $kernel->bootstrap();
        $this->setLaravel($app);
@@ -174,10 +173,10 @@ class UpgradeCommand extends Command
        });

        $this->newLine(2);
-        $this->info(trans('commands.upgrade.success'));
+        $this->info('Panel has been successfully upgraded. Please ensure you also update any Wings instances: https://pterodactyl.io/wings/1.0/upgrading.html');
    }

-    protected function withProgress(ProgressBar $bar, Closure $callback): void
+    protected function withProgress(ProgressBar $bar, \Closure $callback)
    {
        $bar->clear();
        $callback();
--- a/app/Console/Commands/User/DeleteUserCommand.php
+++ b/app/Console/Commands/User/DeleteUserCommand.php
@@ -1,10 +1,11 @@
 <?php

-namespace App\Console\Commands\User;
+namespace Pterodactyl\Console\Commands\User;

-use App\Models\User;
-use Illuminate\Console\Command;
+use Pterodactyl\Models\User;
 use Webmozart\Assert\Assert;
+use Illuminate\Console\Command;
+use Pterodactyl\Services\Users\UserDeletionService;

 class DeleteUserCommand extends Command
 {
@@ -12,10 +13,18 @@ class DeleteUserCommand extends Command

    protected $signature = 'p:user:delete {--user=}';

+    /**
+     * DeleteUserCommand constructor.
+     */
+    public function __construct(private UserDeletionService $deletionService)
+    {
+        parent::__construct();
+    }
+
    public function handle(): int
    {
        $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
-        Assert::notEmpty($search, 'Search term should not be empty.');
+        Assert::notEmpty($search, 'Search term should be an email address, got: %s.');

        $results = User::query()
            ->where('id', 'LIKE', "$search%")
@@ -42,8 +51,6 @@ class DeleteUserCommand extends Command
            if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                return $this->handle();
            }
-
-            $deleteUser = User::query()->findOrFail($deleteUser);
        } else {
            if (count($results) > 1) {
                $this->error(trans('command/messages.user.multiple_found'));
@@ -55,8 +62,7 @@ class DeleteUserCommand extends Command
        }

        if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
-            $deleteUser->delete();
-
+            $this->deletionService->handle($deleteUser);
            $this->info(trans('command/messages.user.deleted'));
        }

--- a/app/Console/Commands/User/DisableTwoFactorCommand.php
+++ b/app/Console/Commands/User/DisableTwoFactorCommand.php
@@ -1,10 +1,9 @@
 <?php

-namespace App\Console\Commands\User;
+namespace Pterodactyl\Console\Commands\User;

-use App\Exceptions\Model\DataValidationException;
-use App\Models\User;
 use Illuminate\Console\Command;
+use Pterodactyl\Contracts\Repository\UserRepositoryInterface;

 class DisableTwoFactorCommand extends Command
 {
@@ -12,26 +11,33 @@ class DisableTwoFactorCommand extends Command

    protected $signature = 'p:user:disable2fa {--email= : The email of the user to disable 2-Factor for.}';

+    /**
+     * DisableTwoFactorCommand constructor.
+     */
+    public function __construct(private UserRepositoryInterface $repository)
+    {
+        parent::__construct();
+    }
+
    /**
     * Handle command execution process.
     *
-     * @throws DataValidationException
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
     */
-    public function handle(): void
+    public function handle()
    {
        if ($this->input->isInteractive()) {
            $this->output->warning(trans('command/messages.user.2fa_help_text'));
        }

        $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
+        $user = $this->repository->setColumns(['id', 'email'])->findFirstWhere([['email', '=', $email]]);

-        $user = User::where('email', $email)->firstOrFail();
-        $user->update([
-            'mfa_app_secret' => null,
-            'mfa_app_recovery_codes' => null,
-            'mfa_email_enabled' => false,
+        $this->repository->withoutFreshModel()->update($user->id, [
+            'use_totp' => false,
+            'totp_secret' => null,
        ]);
-
        $this->info(trans('command/messages.user.2fa_disabled', ['email' => $user->email]));
    }
 }
--- a/app/Console/Commands/User/MakeUserCommand.php
+++ b/app/Console/Commands/User/MakeUserCommand.php
@@ -1,18 +1,15 @@
 <?php

-namespace App\Console\Commands\User;
+namespace Pterodactyl\Console\Commands\User;

-use App\Exceptions\Model\DataValidationException;
-use App\Services\Users\UserCreationService;
-use Exception;
 use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
+use Pterodactyl\Services\Users\UserCreationService;

 class MakeUserCommand extends Command
 {
    protected $description = 'Creates a user on the system via the CLI.';

-    protected $signature = 'p:user:make {--email=} {--username=} {--password=} {--admin=} {--no-password}';
+    protected $signature = 'p:user:make {--email=} {--username=} {--name-first=} {--name-last=} {--password=} {--admin=} {--no-password}';

    /**
     * MakeUserCommand constructor.
@@ -25,22 +22,16 @@ class MakeUserCommand extends Command
    /**
     * Handle command request to create a new user.
     *
-     * @throws Exception
-     * @throws DataValidationException
+     * @throws \Exception
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
     */
-    public function handle(): int
+    public function handle()
    {
-        try {
-            DB::connection()->getPdo();
-        } catch (Exception $exception) {
-            $this->error($exception->getMessage());
-
-            return 1;
-        }
-
        $root_admin = $this->option('admin') ?? $this->confirm(trans('command/messages.user.ask_admin'));
        $email = $this->option('email') ?? $this->ask(trans('command/messages.user.ask_email'));
        $username = $this->option('username') ?? $this->ask(trans('command/messages.user.ask_username'));
+        $name_first = $this->option('name-first') ?? $this->ask(trans('command/messages.user.ask_name_first'));
+        $name_last = $this->option('name-last') ?? $this->ask(trans('command/messages.user.ask_name_last'));

        if (is_null($password = $this->option('password')) && !$this->option('no-password')) {
            $this->warn(trans('command/messages.user.ask_password_help'));
@@ -48,14 +39,13 @@ class MakeUserCommand extends Command
            $password = $this->secret(trans('command/messages.user.ask_password'));
        }

-        $user = $this->creationService->handle(compact('email', 'username', 'password', 'root_admin'));
+        $user = $this->creationService->handle(compact('email', 'username', 'name_first', 'name_last', 'password', 'root_admin'));
        $this->table(['Field', 'Value'], [
            ['UUID', $user->uuid],
            ['Email', $user->email],
            ['Username', $user->username],
-            ['Admin', $user->isRootAdmin() ? 'Yes' : 'No'],
+            ['Name', $user->name],
+            ['Admin', $user->root_admin ? 'Yes' : 'No'],
        ]);
-
-        return 0;
    }
 }
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -1,20 +1,17 @@
 <?php

-namespace App\Console;
+namespace Pterodactyl\Console;

-use App\Console\Commands\Egg\CheckEggUpdatesCommand;
-use App\Console\Commands\Egg\UpdateEggIndexCommand;
-use App\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;
-use App\Console\Commands\Maintenance\PruneImagesCommand;
-use App\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
-use App\Console\Commands\Schedule\ProcessRunnableCommand;
-use App\Models\ActivityLog;
-use App\Models\Webhook;
+use Ramsey\Uuid\Uuid;
+use Pterodactyl\Models\ActivityLog;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Database\Console\PruneCommand;
+use Pterodactyl\Repositories\Eloquent\SettingsRepository;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
-use Spatie\Health\Commands\RunHealthChecksCommand;
-use Spatie\Health\Commands\ScheduleCheckHeartbeatCommand;
+use Pterodactyl\Services\Telemetry\TelemetryCollectionService;
+use Pterodactyl\Console\Commands\Schedule\ProcessRunnableCommand;
+use Pterodactyl\Console\Commands\Maintenance\PruneOrphanedBackupsCommand;
+use Pterodactyl\Console\Commands\Maintenance\CleanServiceBackupFilesCommand;

 class Kernel extends ConsoleKernel
 {
@@ -31,20 +28,12 @@ class Kernel extends ConsoleKernel
     */
    protected function schedule(Schedule $schedule): void
    {
-        if (config('cache.default') === 'redis') {
-            // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
-            // This only needs to run when using redis. anything else throws an error.
-            $schedule->command('cache:prune-stale-tags')->hourly();
-        }
+        // https://laravel.com/docs/10.x/upgrade#redis-cache-tags
+        $schedule->command('cache:prune-stale-tags')->hourly();

        // Execute scheduled commands for servers every minute, as if there was a normal cron running.
        $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
-
        $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
-        $schedule->command(PruneImagesCommand::class)->daily();
-
-        $schedule->command(CheckEggUpdatesCommand::class)->daily();
-        $schedule->command(UpdateEggIndexCommand::class)->daily();

        if (config('backups.prune_age')) {
            // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
@@ -55,11 +44,33 @@ class Kernel extends ConsoleKernel
            $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::class]])->daily();
        }

-        if (config('panel.webhook.prune_days')) {
-            $schedule->command(PruneCommand::class, ['--model' => [Webhook::class]])->daily();
+        if (config('pterodactyl.telemetry.enabled')) {
+            $this->registerTelemetry($schedule);
+        }
+    }
+
+    /**
+     * I wonder what this does.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Illuminate\Contracts\Container\BindingResolutionException
+     */
+    private function registerTelemetry(Schedule $schedule): void
+    {
+        $settingsRepository = app()->make(SettingsRepository::class);
+
+        $uuid = $settingsRepository->get('app:telemetry:uuid');
+        if (is_null($uuid)) {
+            $uuid = Uuid::uuid4()->toString();
+            $settingsRepository->set('app:telemetry:uuid', $uuid);
        }

-        $schedule->command(ScheduleCheckHeartbeatCommand::class)->everyMinute();
-        $schedule->command(RunHealthChecksCommand::class)->everyFiveMinutes();
+        // Calculate a fixed time to run the data push at, this will be the same time every day.
+        $time = hexdec(str_replace('-', '', substr($uuid, 27))) % 1440;
+        $hour = floor($time / 60);
+        $minute = $time % 60;
+
+        // Run the telemetry collector.
+        $schedule->call(app()->make(TelemetryCollectionService::class))->description('Collect Telemetry')->dailyAt("$hour:$minute");
    }
 }
--- a/app/Traits/Commands/RequiresDatabaseMigrations.php
+++ b/app/Traits/Commands/RequiresDatabaseMigrations.php
@@ -1,20 +1,36 @@
 <?php

-namespace App\Traits\Commands;
-
-use App\Traits\CheckMigrationsTrait;
-use Illuminate\Console\Command;
+namespace Pterodactyl\Console;

 /**
- * @mixin Command
+ * @mixin \Illuminate\Console\Command
 */
 trait RequiresDatabaseMigrations
 {
-    use CheckMigrationsTrait;
+    /**
+     * Checks if the migrations have finished running by comparing the last migration file.
+     */
+    protected function hasCompletedMigrations(): bool
+    {
+        /** @var \Illuminate\Database\Migrations\Migrator $migrator */
+        $migrator = $this->getLaravel()->make('migrator');
+
+        $files = $migrator->getMigrationFiles(database_path('migrations'));
+
+        if (!$migrator->repositoryExists()) {
+            return false;
+        }
+
+        if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
+            return false;
+        }
+
+        return true;
+    }

    /**
     * Throw a massive error into the console to hopefully catch the users attention and get
-     * them to properly run the migrations rather than ignoring  other previous
+     * them to properly run the migrations rather than ignoring all of the other previous
     * errors...
     */
    protected function showMigrationWarning(): void
@@ -30,7 +46,7 @@ You must run the following command to finish migrating your database:

  <fg=green;options=bold>php artisan migrate --step --force</>

-You will not be able to use the Panel as expected without fixing your
+You will not be able to use Pterodactyl Panel as expected without fixing your
 database state by running the command above.
 ');

--- a/app/Contracts/Core/ReceivesEvents.php
+++ b/app/Contracts/Core/ReceivesEvents.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Contracts\Core;
+
+use Pterodactyl\Events\Event;
+
+interface ReceivesEvents
+{
+    /**
+     * Handles receiving an event from the application.
+     */
+    public function handle(Event $notification): void;
+}
--- a/app/Contracts/Criteria/CriteriaInterface.php
+++ b/app/Contracts/Criteria/CriteriaInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Pterodactyl\Contracts\Criteria;
+
+use Illuminate\Database\Eloquent\Model;
+use Pterodactyl\Repositories\Repository;
+
+interface CriteriaInterface
+{
+    /**
+     * Apply selected criteria to a repository call.
+     */
+    public function apply(Model $model, Repository $repository): mixed;
+}
--- a/app/Contracts/Extensions/HashidsInterface.php
+++ b/app/Contracts/Extensions/HashidsInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Pterodactyl\Contracts\Extensions;
+
+use Hashids\HashidsInterface as VendorHashidsInterface;
+
+interface HashidsInterface extends VendorHashidsInterface
+{
+    /**
+     * Decode an encoded hashid and return the first result.
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function decodeFirst(string $encoded, string $default = null): mixed;
+}
--- a/app/Contracts/Http/ClientPermissionsRequest.php
+++ b/app/Contracts/Http/ClientPermissionsRequest.php
@@ -1,6 +1,6 @@
 <?php

-namespace App\Contracts\Http;
+namespace Pterodactyl\Contracts\Http;

 interface ClientPermissionsRequest
 {
--- a/app/Contracts/Repository/AllocationRepositoryInterface.php
+++ b/app/Contracts/Repository/AllocationRepositoryInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Allocation;
+
+interface AllocationRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return all the allocations that exist for a node that are not currently
+     * allocated.
+     */
+    public function getUnassignedAllocationIds(int $node): array;
+
+    /**
+     * Return a single allocation from those meeting the requirements.
+     */
+    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false): ?Allocation;
+}
--- a/app/Contracts/Repository/ApiKeyRepositoryInterface.php
+++ b/app/Contracts/Repository/ApiKeyRepositoryInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\User;
+use Illuminate\Support\Collection;
+
+interface ApiKeyRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Get all the account API keys that exist for a specific user.
+     */
+    public function getAccountKeys(User $user): Collection;
+
+    /**
+     * Get all the application API keys that exist for a specific user.
+     */
+    public function getApplicationKeys(User $user): Collection;
+
+    /**
+     * Delete an account API key from the panel for a specific user.
+     */
+    public function deleteAccountKey(User $user, string $identifier): int;
+
+    /**
+     * Delete an application API key from the panel for a specific user.
+     */
+    public function deleteApplicationKey(User $user, string $identifier): int;
+}
--- a/app/Contracts/Repository/ApiPermissionRepositoryInterface.php
+++ b/app/Contracts/Repository/ApiPermissionRepositoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface ApiPermissionRepositoryInterface extends RepositoryInterface
+{
+}
--- a/app/Contracts/Repository/DatabaseHostRepositoryInterface.php
+++ b/app/Contracts/Repository/DatabaseHostRepositoryInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Illuminate\Support\Collection;
+
+interface DatabaseHostRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return database hosts with a count of databases and the node
+     * information for which it is attached.
+     */
+    public function getWithViewDetails(): Collection;
+}
--- a/app/Contracts/Repository/DatabaseRepositoryInterface.php
+++ b/app/Contracts/Repository/DatabaseRepositoryInterface.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+
+interface DatabaseRepositoryInterface extends RepositoryInterface
+{
+    public const DEFAULT_CONNECTION_NAME = 'dynamic';
+
+    /**
+     * Set the connection name to execute statements against.
+     */
+    public function setConnection(string $connection): self;
+
+    /**
+     * Return the connection to execute statements against.
+     */
+    public function getConnection(): string;
+
+    /**
+     * Return all the databases belonging to a server.
+     */
+    public function getDatabasesForServer(int $server): Collection;
+
+    /**
+     * Return all the databases for a given host with the server relationship loaded.
+     */
+    public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
+
+    /**
+     * Create a new database on a given connection.
+     */
+    public function createDatabase(string $database): bool;
+
+    /**
+     * Create a new database user on a given connection.
+     */
+    public function createUser(string $username, string $remote, string $password, ?int $max_connections): bool;
+
+    /**
+     * Give a specific user access to a given database.
+     */
+    public function assignUserToDatabase(string $database, string $username, string $remote): bool;
+
+    /**
+     * Flush the privileges for a given connection.
+     */
+    public function flush(): bool;
+
+    /**
+     * Drop a given database on a specific connection.
+     */
+    public function dropDatabase(string $database): bool;
+
+    /**
+     * Drop a given user on a specific connection.
+     */
+    public function dropUser(string $username, string $remote): bool;
+}
--- a/app/Contracts/Repository/EggRepositoryInterface.php
+++ b/app/Contracts/Repository/EggRepositoryInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Egg;
+use Illuminate\Database\Eloquent\Collection;
+
+interface EggRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return an egg with the variables relation attached.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithVariables(int $id): Egg;
+
+    /**
+     * Return all eggs and their relations to be used in the daemon API.
+     */
+    public function getAllWithCopyAttributes(): Collection;
+
+    /**
+     * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
+     */
+    public function getWithCopyAttributes(int|string $value, string $column = 'id'): Egg;
+
+    /**
+     * Return all the data needed to export a service.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithExportAttributes(int $id): Egg;
+
+    /**
+     * Confirm a copy script belongs to the same nest as the item trying to use it.
+     */
+    public function isCopyableScript(int $copyFromId, int $service): bool;
+}
--- a/app/Contracts/Repository/EggVariableRepositoryInterface.php
+++ b/app/Contracts/Repository/EggVariableRepositoryInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Illuminate\Support\Collection;
+
+interface EggVariableRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return editable variables for a given egg. Editable variables must be set to
+     * user viewable in order to be picked up by this function.
+     */
+    public function getEditableVariables(int $egg): Collection;
+}
--- a/app/Contracts/Repository/LocationRepositoryInterface.php
+++ b/app/Contracts/Repository/LocationRepositoryInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Location;
+use Illuminate\Support\Collection;
+
+interface LocationRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return locations with a count of nodes and servers attached to it.
+     */
+    public function getAllWithDetails(): Collection;
+
+    /**
+     * Return all the available locations with the nodes as a relationship.
+     */
+    public function getAllWithNodes(): Collection;
+
+    /**
+     * Return all the nodes and their respective count of servers for a location.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithNodes(int $id): Location;
+
+    /**
+     * Return a location and the count of nodes in that location.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithNodeCount(int $id): Location;
+}
--- a/app/Contracts/Repository/NestRepositoryInterface.php
+++ b/app/Contracts/Repository/NestRepositoryInterface.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Nest;
+use Illuminate\Database\Eloquent\Collection;
+
+interface NestRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return a nest or all nests with their associated eggs and variables.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggs(int $id = null): Collection|Nest;
+
+    /**
+     * Return a nest or all nests and the count of eggs and servers for that nest.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithCounts(int $id = null): Collection|Nest;
+
+    /**
+     * Return a nest along with its associated eggs and the servers relation on those eggs.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithEggServers(int $id): Nest;
+}
--- a/app/Contracts/Repository/NodeRepositoryInterface.php
+++ b/app/Contracts/Repository/NodeRepositoryInterface.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Node;
+use Illuminate\Support\Collection;
+
+interface NodeRepositoryInterface extends RepositoryInterface
+{
+    public const THRESHOLD_PERCENTAGE_LOW = 75;
+    public const THRESHOLD_PERCENTAGE_MEDIUM = 90;
+
+    /**
+     * Return the usage stats for a single node.
+     */
+    public function getUsageStats(Node $node): array;
+
+    /**
+     * Return the usage stats for a single node.
+     */
+    public function getUsageStatsRaw(Node $node): array;
+
+    /**
+     * Return a single node with location and server information.
+     */
+    public function loadLocationAndServerCount(Node $node, bool $refresh = false): Node;
+
+    /**
+     * Attach a paginated set of allocations to a node mode including
+     * any servers that are also attached to those allocations.
+     */
+    public function loadNodeAllocations(Node $node, bool $refresh = false): Node;
+
+    /**
+     * Return a collection of nodes for all locations to use in server creation UI.
+     */
+    public function getNodesForServerCreation(): Collection;
+}
--- a/app/Contracts/Repository/PermissionRepositoryInterface.php
+++ b/app/Contracts/Repository/PermissionRepositoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface PermissionRepositoryInterface extends RepositoryInterface
+{
+}
--- a/app/Contracts/Repository/RepositoryInterface.php
+++ b/app/Contracts/Repository/RepositoryInterface.php
@@ -0,0 +1,141 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Illuminate\Support\Collection;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+
+interface RepositoryInterface
+{
+    /**
+     * Return an identifier or Model object to be used by the repository.
+     */
+    public function model(): string;
+
+    /**
+     * Return the model being used for this repository instance.
+     */
+    public function getModel(): Model;
+
+    /**
+     * Returns an instance of a query builder.
+     */
+    public function getBuilder(): Builder;
+
+    /**
+     * Returns the columns to be selected or returned by the query.
+     */
+    public function getColumns(): array;
+
+    /**
+     * An array of columns to filter the response by.
+     */
+    public function setColumns(array|string $columns = ['*']): self;
+
+    /**
+     * Stop repository update functions from returning a fresh
+     * model when changes are committed.
+     */
+    public function withoutFreshModel(): self;
+
+    /**
+     * Return a fresh model with a repository updates a model.
+     */
+    public function withFreshModel(): self;
+
+    /**
+     * Set whether the repository should return a fresh model
+     * when changes are committed.
+     */
+    public function setFreshModel(bool $fresh = true): self;
+
+    /**
+     * Create a new model instance and persist it to the database.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function create(array $fields, bool $validate = true, bool $force = false): mixed;
+
+    /**
+     * Find a model that has the specific ID passed.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function find(int $id): mixed;
+
+    /**
+     * Find a model matching an array of where clauses.
+     */
+    public function findWhere(array $fields): Collection;
+
+    /**
+     * Find and return the first matching instance for the given fields.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function findFirstWhere(array $fields): mixed;
+
+    /**
+     * Return a count of records matching the passed arguments.
+     */
+    public function findCountWhere(array $fields): int;
+
+    /**
+     * Delete a given record from the database.
+     */
+    public function delete(int $id): int;
+
+    /**
+     * Delete records matching the given attributes.
+     */
+    public function deleteWhere(array $attributes): int;
+
+    /**
+     * Update a given ID with the passed array of fields.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function update(int $id, array $fields, bool $validate = true, bool $force = false): mixed;
+
+    /**
+     * Perform a mass update where matching records are updated using whereIn.
+     * This does not perform any model data validation.
+     */
+    public function updateWhereIn(string $column, array $values, array $fields): int;
+
+    /**
+     * Update a record if it exists in the database, otherwise create it.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false): mixed;
+
+    /**
+     * Return all records associated with the given model.
+     */
+    public function all(): Collection;
+
+    /**
+     * Return a paginated result set using a search term if set on the repository.
+     */
+    public function paginated(int $perPage): LengthAwarePaginator;
+
+    /**
+     * Insert a single or multiple records into the database at once skipping
+     * validation and mass assignment checking.
+     */
+    public function insert(array $data): bool;
+
+    /**
+     * Insert multiple records into the database and ignore duplicates.
+     */
+    public function insertIgnore(array $values): bool;
+
+    /**
+     * Get the amount of entries in the database.
+     */
+    public function count(): int;
+}
--- a/app/Contracts/Repository/ScheduleRepositoryInterface.php
+++ b/app/Contracts/Repository/ScheduleRepositoryInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Schedule;
+use Illuminate\Support\Collection;
+
+interface ScheduleRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return all the schedules for a given server.
+     */
+    public function findServerSchedules(int $server): Collection;
+
+    /**
+     * Return a schedule model with all the associated tasks as a relationship.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getScheduleWithTasks(int $schedule): Schedule;
+}
--- a/app/Contracts/Repository/ServerRepositoryInterface.php
+++ b/app/Contracts/Repository/ServerRepositoryInterface.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Server;
+use Illuminate\Support\Collection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+
+interface ServerRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Load the egg relations onto the server model.
+     */
+    public function loadEggRelations(Server $server, bool $refresh = false): Server;
+
+    /**
+     * Return a collection of servers with their associated data for rebuild operations.
+     */
+    public function getDataForRebuild(int $server = null, int $node = null): Collection;
+
+    /**
+     * Return a collection of servers with their associated data for reinstall operations.
+     */
+    public function getDataForReinstall(int $server = null, int $node = null): Collection;
+
+    /**
+     * Return a server model and all variables associated with the server.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function findWithVariables(int $id): Server;
+
+    /**
+     * Get the primary allocation for a given server. If a model is passed into
+     * the function, load the allocation relationship onto it. Otherwise, find and
+     * return the server from the database.
+     */
+    public function getPrimaryAllocation(Server $server, bool $refresh = false): Server;
+
+    /**
+     * Return enough data to be used for the creation of a server via the daemon.
+     */
+    public function getDataForCreation(Server $server, bool $refresh = false): Server;
+
+    /**
+     * Load associated databases onto the server model.
+     */
+    public function loadDatabaseRelations(Server $server, bool $refresh = false): Server;
+
+    /**
+     * Get data for use when updating a server on the Daemon. Returns an array of
+     * the egg which is used for build and rebuild. Only loads relations
+     * if they are missing, or refresh is set to true.
+     */
+    public function getDaemonServiceData(Server $server, bool $refresh = false): array;
+
+    /**
+     * Return a server by UUID.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getByUuid(string $uuid): Server;
+
+    /**
+     * Check if a given UUID and UUID-Short string are unique to a server.
+     */
+    public function isUniqueUuidCombo(string $uuid, string $short): bool;
+
+    /**
+     * Returns all the servers that exist for a given node in a paginated response.
+     */
+    public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
+}
--- a/app/Contracts/Repository/ServerVariableRepositoryInterface.php
+++ b/app/Contracts/Repository/ServerVariableRepositoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface ServerVariableRepositoryInterface extends RepositoryInterface
+{
+}
--- a/app/Contracts/Repository/SessionRepositoryInterface.php
+++ b/app/Contracts/Repository/SessionRepositoryInterface.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Illuminate\Support\Collection;
+
+interface SessionRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return all the active sessions for a user.
+     */
+    public function getUserSessions(int $user): Collection;
+
+    /**
+     * Delete a session for a given user.
+     */
+    public function deleteUserSession(int $user, string $session): ?int;
+}
--- a/app/Contracts/Repository/SettingsRepositoryInterface.php
+++ b/app/Contracts/Repository/SettingsRepositoryInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface SettingsRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Store a new persistent setting in the database.
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function set(string $key, string $value = null);
+
+    /**
+     * Retrieve a persistent setting from the database.
+     */
+    public function get(string $key, mixed $default): mixed;
+
+    /**
+     * Remove a key from the database cache.
+     */
+    public function forget(string $key);
+}
--- a/app/Contracts/Repository/SubuserRepositoryInterface.php
+++ b/app/Contracts/Repository/SubuserRepositoryInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Subuser;
+
+interface SubuserRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Return a subuser with the associated server relationship.
+     */
+    public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser;
+
+    /**
+     * Return a subuser with the associated permissions relationship.
+     */
+    public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser;
+
+    /**
+     * Return a subuser and associated permissions given a user_id and server_id.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getWithPermissionsUsingUserAndServer(int $user, int $server): Subuser;
+}
--- a/app/Contracts/Repository/TaskRepositoryInterface.php
+++ b/app/Contracts/Repository/TaskRepositoryInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+use Pterodactyl\Models\Task;
+
+interface TaskRepositoryInterface extends RepositoryInterface
+{
+    /**
+     * Get a task and the server relationship for that task.
+     *
+     * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
+     */
+    public function getTaskForJobProcess(int $id): Task;
+
+    /**
+     * Returns the next task in a schedule.
+     */
+    public function getNextTask(int $schedule, int $index): ?Task;
+}
--- a/app/Contracts/Repository/UserRepositoryInterface.php
+++ b/app/Contracts/Repository/UserRepositoryInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Pterodactyl\Contracts\Repository;
+
+interface UserRepositoryInterface extends RepositoryInterface
+{
+}
--- a/app/Contracts/Validatable.php
+++ b/app/Contracts/Validatable.php
@@ -1,22 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use Illuminate\Validation\Validator;
-
-interface Validatable
-{
-    public function getValidator(): Validator;
-
-    /**
-     * @return array<string, mixed>
-     */
-    public static function getRules(): array;
-
-    /**
-     * @return array<string, array<string, mixed>>
-     */
-    public static function getRulesForField(string $field): array;
-
-    public function validate(): void;
-}
--- a/app/Eloquent/BackupQueryBuilder.php
+++ b/app/Eloquent/BackupQueryBuilder.php
@@ -1,24 +0,0 @@
-<?php
-
-namespace App\Eloquent;
-
-use Illuminate\Database\Eloquent\Builder;
-
-/**
- * @template TModel of \Illuminate\Database\Eloquent\Model
- *
- * @extends Builder<TModel>
- */
-class BackupQueryBuilder extends Builder
-{
-    public function nonFailed(): self
-    {
-        $this->where(function (Builder $query) {
-            $query
-                ->whereNull('completed_at')
-                ->orWhere('is_successful', true);
-        });
-
-        return $this;
-    }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Penner	6dc85c731e	chore: update `SECURITY.md` ref; https://github.com/pterodactyl/panel/pull/5074 which targets the wrong branch	2024-04-16 15:17:36 -06:00
Matthew Penner	0dad4c5a48	ui(admin): better handling of manual HTML rendering	2024-04-11 10:47:00 -06:00
Matthew Penner	b1fa3927c1	api(remote): fix oops in BackupStatusController	2024-04-11 10:42:18 -06:00
Matthew Penner	f671046947	admin: tweaks to validation and rendering	2024-04-10 18:13:25 -06:00
Matthew Penner	319ca683f8	api(remote): ensure requesting node is checked	2024-04-10 17:38:09 -06:00
Matthew Penner	1172d71d31	app: improve `docker_image` validation	2024-04-10 17:22:29 -06:00
Matthew Penner	2497819ca7	Update README.md	2024-03-16 14:02:07 -06:00
Matthew Penner	787bf34a59	nix: update to php 8.2	2024-03-16 14:01:51 -06:00