feat: add license

Switch from `bin.ptdl.co` to `pteropaste.com`

.babel-plugin-macrosrc.js

@@ -1,11 +0,0 @@
-module.exports = {
-    twin: {
-        preset: 'styled-components',
-        autoCssProp: true,
-    },
-    styledComponents: {
-        pure: true,
-        displayName: false,
-        fileName: false,
-    },
-};

.editorconfig

@@ -1,15 +1,17 @@
 root = true
 
 [*]
-end_of_line = lf
-insert_final_newline = true
 indent_style = space
 indent_size = 4
+tab_width = 4
+end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
-
-[.*yml]
-indent_size = 2
+insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.{md,nix,yml,yaml}]
+indent_size = 2
+tab_width = 2

.env.ci

@@ -1,19 +0,0 @@
-APP_ENV=testing
-APP_DEBUG=true
-APP_KEY=SomeRandomString3232RandomString
-APP_THEME=pterodactyl
-APP_TIMEZONE=America/Los_Angeles
-APP_URL=http://localhost/
-
-TESTING_DB_HOST=127.0.0.1
-TESTING_DB_DATABASE=panel_test
-TESTING_DB_USERNAME=root
-TESTING_DB_PASSWORD=
-
-CACHE_DRIVER=array
-SESSION_DRIVER=array
-MAIL_DRIVER=array
-QUEUE_DRIVER=sync
-
-HASHIDS_SALT=test123
-APP_ENVIRONMENT_ONLY=true

.env.dusk

@@ -1,26 +0,0 @@
-APP_ENV=local
-APP_DEBUG=false
-APP_KEY=NDWgIKKi9ovNK1PXZpzfNVSBdfCXGb5i
-APP_JWT_KEY=test1234
-APP_TIMEZONE=America/Los_Angeles
-APP_URL=http://pterodactyl.local
-
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-
-HASHIDS_SALT=IqRr0g82tCTeuyxGs8RV
-HASHIDS_LENGTH=8
-
-MAIL_DRIVER=log
-MAIL_FROM=support@pterodactyl.io
-QUEUE_DRIVER=array
-
-APP_SERVICE_AUTHOR=testing@pterodactyl.io
-MAIL_FROM_NAME="Pterodactyl Panel"
-RECAPTCHA_ENABLED=false
-
-DB_CONNECTION=testing
-TESTING_DB_HOST=192.168.1.202
-TESTING_DB_DATABASE=panel_test
-TESTING_DB_USERNAME=panel_test
-TESTING_DB_PASSWORD=Test1234

.env.example

@@ -1,37 +1,43 @@
 APP_ENV=production
 APP_DEBUG=false
 APP_KEY=
-APP_THEME=pterodactyl
-APP_TIMEZONE=America/New_York
-APP_CLEAR_TASKLOG=720
-APP_DELETE_MINUTES=10
-APP_ENVIRONMENT_ONLY=true
-LOG_CHANNEL=daily
+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_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.example.com
 MAIL_PORT=25
 MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
-MAIL_FROM=no-reply@example.com
-MAILGUN_ENDPOINT=api.mailgun.net
+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
-# SERVER_NAME=panel.yourdomain.com
-
-QUEUE_HIGH=high
-QUEUE_STANDARD=standard
-QUEUE_LOW=low
+# MAIL_EHLO_DOMAIN=panel.example.com

.eslintignore

@@ -1,4 +1,6 @@
 public
 node_modules
 resources/views
+babel.config.js
+tailwind.config.js
 webpack.config.js

.eslintrc.js

@@ -0,0 +1,52 @@
+/** @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:react/jsx-runtime',
+        'plugin:@typescript-eslint/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,
+        'react/no-unknown-property': ['error', {ignore: ['css']}],
+        '@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' }],
+    },
+};

.eslintrc.yml

@@ -1,98 +0,0 @@
-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"
-  - "@typescript-eslint"
-extends:
-  - "standard"
-  - "plugin:react/recommended"
-  - "plugin:@typescript-eslint/recommended"
-rules:
-  quotes:
-    - warn
-    - single
-  indent:
-    - warn
-    - 4
-    - SwitchCase: 1
-  semi:
-    - warn
-    - always
-  comma-dangle:
-    - warn
-    - always-multiline
-  spaced-comment:
-    - warn
-  array-bracket-spacing:
-    - warn
-    - always
-  # Remove errors for not having newlines between operands of ternary expressions https://eslint.org/docs/rules/multiline-ternary
-  multiline-ternary: 0
-  "react-hooks/rules-of-hooks":
-    - error
-  "react-hooks/exhaustive-deps": 0
-  "@typescript-eslint/explicit-function-return-type": 0
-  "@typescript-eslint/explicit-member-accessibility": 0
-  "@typescript-eslint/ban-ts-ignore": 0
-  "@typescript-eslint/no-explicit-any": 0
-  "@typescript-eslint/no-non-null-assertion": 0
-  "@typescript-eslint/ban-ts-comment": 0
-  # This would be nice to have, but don't want to deal with the warning spam at the moment.
-  "@typescript-eslint/explicit-module-boundary-types": 0
-  no-restricted-imports:
-    - error
-    - paths:
-        - name: styled-components
-          message: Please import from styled-components/macro.
-      patterns:
-        - "!styled-components/macro"
-  # Not sure, this rule just doesn't work right and is protected by our use of Typescript anyways
-  # so I'm just not going to worry about it.
-  "react/prop-types": 0
-  "react/display-name": 0
-  "react/jsx-indent-props":
-    - warn
-    - 4
-  "react/jsx-boolean-value":
-    - warn
-    - never
-  "react/jsx-closing-bracket-location":
-    - 1
-    - "line-aligned"
-  "react/jsx-closing-tag-location": 1
-  # 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
-overrides:
-  - files:
-      - "**/*.tsx"
-    rules:
-      operator-linebreak:
-        - error
-        - before
-        - overrides:
-            "&&": "after"
-            "?": "ignore"
-            ":": "ignore"

.github/FUNDING.yml

@@ -1,2 +1 @@
-github: [DaneEveritt]
-custom: ["https://paypal.me/PterodactylSoftware"]
+github: [matthewpi]

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -7,14 +7,6 @@ body:
     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](https://discord.gg/pterodactyl).
 
-- type: checkboxes
-  attributes:
-    label: Is there an existing issue for this?
-    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
-
 - type: textarea      
   attributes:
     label: Current Behavior
@@ -32,7 +24,7 @@ body:
 - type: textarea      
   attributes:
     label: Steps to Reproduce
-    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will likely result in this issue being closed.
+    description: Please be as detailed as possible when providing steps to reproduce, failure to provide steps will result in this issue being closed.
   validations:
     required: true
 
@@ -53,6 +45,20 @@ body:
     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/pterodactyl/yolks:java_17
 
 - type: textarea
   id: panel-logs
@@ -62,8 +68,20 @@ body:
       Run the following command to collect logs on your system.
       
       Wings: `sudo wings diagnostics`
-      Panel: `tail -n 100 /var/www/pterodactyl/storage/logs/laravel-$(date +%F).log | nc bin.ptdl.co 99`
-    placeholder: "https://bin.ptdl.co/a1h6z"
+      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/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
+    - label: I have provided all relevant details, including the specific game and Docker images I am using if this issue is related to running a server.
+      required: true
+    - label: I have checked in the Discord server and believe this is a bug with the software, and not a configuration issue with my specific system.
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: Installation Help
     url: https://discord.gg/pterodactyl

.github/docker/Caddyfile

@@ -0,0 +1,21 @@
+:8080 {
+	root * /var/www/pterodactyl/public/
+	file_server
+
+	header {
+		-Server
+		-X-Powered-By
+		Referrer-Policy "same-origin"
+		X-Frame-Options "deny"
+		X-XSS-Protection "1; mode=block"
+		X-Content-Type-Options "nosniff"
+	}
+
+	encode gzip zstd
+
+	php_fastcgi 127.0.0.1:9000 {
+		trusted_proxies 172.20.0.0/16
+	}
+
+	try_files {path} {path}/ /index.php?{query}
+}

.github/docker/README.md

@@ -1,76 +0,0 @@
-# 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](docker-compose.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 `LETSENCRYPT_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      |
-| `LETSENCRYPT_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`    |

.github/docker/default.conf

@@ -1,51 +0,0 @@
-# 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;
-    }
-}

.github/docker/default_ssl.conf

@@ -1,70 +0,0 @@
-# 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;
-    }
-}

.github/docker/entrypoint.sh

@@ -1,76 +0,0 @@
-#!/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 /var/log/panel/logs/ /app/storage/logs/
-
-## 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
-
-## check for DB up before starting the panel
-echo "Checking database status."
-until nc -z -v -w30 $DB_HOST 3306
-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 "$@"

.github/docker/php-fpm.conf

@@ -0,0 +1,21 @@
+[global]
+error_log = /dev/stderr
+daemonize = no
+
+[www]
+user  = nobody
+group = nobody
+
+listen = 127.0.0.1:9000
+
+pm                      = dynamic
+pm.start_servers        = 4
+pm.min_spare_servers    = 4
+pm.max_spare_servers    = 16
+pm.max_children         = 64
+pm.max_requests         = 256
+
+clear_env = no
+catch_workers_output = yes
+
+decorate_workers_output = no

.github/docker/supervisord.conf

@@ -1,39 +1,57 @@
-[unix_http_server]
-file=/tmp/supervisor.sock                       ; path to your socket file
-
 [supervisord]
-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.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
+logfile=/dev/stdout
+logfile_maxbytes=0
+loglevel=info
+minfds=1024
+minprocs=200
+nodaemon=true
+pidfile=/dev/null
 
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+[unix_http_server]
+file=/tmp/supervisor.sock
 
 [supervisorctl]
-serverurl=unix:///tmp/supervisor.sock         ; use a unix:// URL  for a unix socket
+serverurl=unix:///tmp/supervisor.sock
 
-[program:php-fpm]
-command=/usr/local/sbin/php-fpm -F
-autostart=true
-autorestart=true
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
 
-[program:queue-worker]
-command=/usr/local/bin/php /app/artisan queue:work --queue=high,standard,low --sleep=3 --tries=3
-user=nginx
-autostart=true
-autorestart=true
-
-[program:nginx]
-command=/usr/sbin/nginx -g 'daemon off;'
+[program:caddy]
+command=/usr/local/bin/caddy run --config /etc/caddy/Caddyfile
 autostart=true
 autorestart=true
 priority=10
-stdout_events_enabled=true
-stderr_events_enabled=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+
+[program:php-fpm]
+command=/usr/sbin/php-fpm --nodaemonize
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+environment=LOG_CHANNEL="stderr"
+
+[program:queue-worker]
+command=/usr/bin/php /var/www/pterodactyl/artisan queue:work --queue=standard --sleep=3 --tries=3
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+environment=LOG_CHANNEL="stderr"
+
+[program:yacron]
+command=/usr/local/bin/yacron -c /etc/yacron.yaml
+autostart=true
+autorestart=true
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+environment=LOG_CHANNEL="stderr"

.github/docker/www.conf

@@ -1,16 +0,0 @@
-[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

.github/docker/yacron.yaml

@@ -0,0 +1,8 @@
+jobs:
+  - name: scheduler
+    command:
+      - /usr/bin/php
+      - /var/www/pterodactyl/artisan
+      - schedule:run
+    schedule: "* * * * *"
+    utc: true

.github/workflows/docker.yaml

@@ -0,0 +1,67 @@
+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-22.04
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Fetch metadata
+        id: metadata
+        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: ./Containerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
+          labels: ${{ steps.metadata.outputs.labels }}
+          tags: ${{ steps.metadata.outputs.tags }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/docker.yml

@@ -1,47 +0,0 @@
-name: Publish Docker Image
-on:
-  push:
-    branches:
-      - 'develop'
-    tags:
-      - 'v*'
-jobs:
-  push_to_registry:
-    name: Push Image to GitHub Packages
-    runs-on: ubuntu-latest
-    # Always run against a tag, even if the commit into the tag has [docker skip]
-    # within the commit message.
-    if: "!contains(github.ref, 'develop') || (!contains(github.event.head_commit.message, 'skip docker') && !contains(github.event.head_commit.message, 'docker skip'))"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: crazy-max/ghaction-docker-meta@v1
-        id: docker_meta
-        with:
-          images: ghcr.io/pterodactyl/panel
-      - uses: docker/setup-qemu-action@v1
-      - uses: docker/setup-buildx-action@v1
-      - uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-      - name: Bump Version
-        if: "!contains(github.ref, 'develop')"
-        env:
-          REF: ${{ github.ref }}
-        run: |
-          sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
-      - name: Release Production Build
-        uses: docker/build-push-action@v2
-        if: "!contains(github.ref, 'develop')"
-        with:
-          push: true
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
-      - name: Release Development Build
-        uses: docker/build-push-action@v2
-        if: "contains(github.ref, 'develop')"
-        with:
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/laravel.yaml

@@ -0,0 +1,210 @@
+name: Laravel
+
+on:
+  push:
+    branches:
+      - "develop"
+      - "1.0-develop"
+  pull_request:
+    branches:
+      - "develop"
+      - "1.0-develop"
+
+jobs:
+  analysis:
+    name: Static Analysis
+    runs-on: ubuntu-22.04
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "true"
+      APP_KEY: SomeRandomString3232RandomString
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
+
+      - name: Analyze
+        run: vendor/bin/phpstan analyse
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          # TODO: Update to 8.2 once php-cs-fixer supports it
+          php-version: 8.1
+          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-progress --no-suggest --prefer-dist
+
+      - name: PHP CS Fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff
+
+  mysql:
+    name: Tests
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.1, 8.2]
+        database: ["mariadb:10.2", "mariadb:10.9", "mysql:8"]
+    services:
+      database:
+        image: docker.io/library/${{ matrix.database }}
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: testing
+        ports:
+          - 3306/tcp
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "true"
+      APP_KEY: SomeRandomString3232RandomString
+      APP_THEME: pterodactyl
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      APP_ENVIRONMENT_ONLY: "true"
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+      HASHIDS_SALT: test123
+      DB_CONNECTION: mysql
+      DB_HOST: 127.0.0.1
+      DB_DATABASE: testing
+      DB_USERNAME: root
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v3
+        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, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
+
+      - name: Unit tests
+        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
+        env:
+          DB_HOST: UNIT_NO_DB
+
+      - name: Integration tests
+        run: vendor/bin/phpunit tests/Integration
+        env:
+          DB_PORT: ${{ job.services.database.ports[3306] }}
+
+  postgres:
+    name: Tests
+    runs-on: ubuntu-22.04
+    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
+    strategy:
+      fail-fast: false
+      matrix:
+        php: [8.1, 8.2]
+        database: ["postgres:13", "postgres:14", "postgres:15"]
+    services:
+      database:
+        image: docker.io/library/${{ matrix.database }}
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+          POSTGRES_DB: testing
+        ports:
+          - 5432/tcp
+        options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
+    env:
+      APP_ENV: testing
+      APP_DEBUG: "true"
+      APP_KEY: SomeRandomString3232RandomString
+      APP_THEME: pterodactyl
+      APP_TIMEZONE: UTC
+      APP_URL: http://localhost/
+      APP_ENVIRONMENT_ONLY: "true"
+      CACHE_DRIVER: array
+      MAIL_MAILER: array
+      SESSION_DRIVER: array
+      QUEUE_CONNECTION: sync
+      HASHIDS_SALT: test123
+      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@v3
+
+      - name: Get cache directory
+        id: composer-cache
+        run: |
+          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache
+        uses: actions/cache@v3
+        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, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        run: composer install --no-interaction --no-progress --no-suggest --prefer-dist
+
+      - name: Unit tests
+        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
+        env:
+          DB_HOST: UNIT_NO_DB
+
+      - name: Integration tests
+        run: vendor/bin/phpunit tests/Integration
+        env:
+          DB_PORT: ${{ job.services.database.ports[5432] }}

.github/workflows/release.yaml

@@ -1,16 +1,32 @@
-name: Create Release
+name: Release
+
 on:
   push:
     tags:
-      - 'v*'
+      - "v*"
+
 jobs:
   release:
-    runs-on: ubuntu-20.04
+    name: Release
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
         with:
-          node-version: '12'
+          node-version: 18
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm run build
 
       - name: Create release branch and bump version
         env:
@@ -23,26 +39,19 @@ jobs:
           git push -u origin $BRANCH
           sed -i "s/    'version' => 'canary',/    'version' => '${REF:11}',/" config/app.php
           git add config/app.php
-          git commit -m "bump version for release"
+          git commit -m "ci(release): bump version"
           git push
 
-      - name: Build assets
-        run: |
-          yarn install
-          yarn run build:production
-
       - name: Create release archive
         run: |
-          rm -rf node_modules/ test/ codecov.yml CODE_OF_CONDUCT.md CONTRIBUTING.md phpunit.dusk.xml phpunit.xml Vagrantfile
-          tar -czf panel.tar.gz * .env.example .babel-plugin-macrosrc.js
+          rm -rf node_modules tests CODE_OF_CONDUCT.md CONTRIBUTING.md flake.lock flake.nix phpstan.neon phpunit.xml shell.nix
+          tar -czf panel.tar.gz * .editorconfig .env.example .eslintignore .eslintrc.js .gitignore .prettierrc.json
 
       - name: Extract changelog
-        id: extract_changelog
         env:
           REF: ${{ github.ref }}
         run: |
           sed -n "/^## ${REF:10}/,/^## /{/^## /b;p}" CHANGELOG.md > ./RELEASE_CHANGELOG
-          echo ::set-output name=version_name::`sed -nr "s/^## (${REF:10} .*)$/\1/p" CHANGELOG.md`
 
       - name: Create checksum and add to changelog
         run: |
@@ -50,19 +59,17 @@ jobs:
           echo -e "\n#### SHA256 Checksum\n\n\`\`\`\n$SUM\n\`\`\`\n" >> ./RELEASE_CHANGELOG
           echo $SUM > checksum.txt
 
-      - name: Create Release
+      - name: Create release
         id: create_release
-        uses: actions/create-release@v1
+        uses: softprops/action-gh-release@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ steps.extract_changelog.outputs.version_name }}
-          body_path: ./RELEASE_CHANGELOG
           draft: true
-          prerelease: ${{ contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
+          prerelease: ${{ contains(github.ref, 'rc') || contains(github.ref, 'beta') || contains(github.ref, 'alpha') }}
+          body_path: ./RELEASE_CHANGELOG
 
-      - name: Upload binary
+      - name: Upload release archive
         id: upload-release-archive
         uses: actions/upload-release-asset@v1
         env:
@@ -73,7 +80,7 @@ jobs:
           asset_name: panel.tar.gz
           asset_content_type: application/gzip
 
-      - name: Upload checksum
+      - name: Upload release checksum
         id: upload-release-checksum
         uses: actions/upload-release-asset@v1
         env:

.github/workflows/tests.yml

@@ -1,59 +0,0 @@
-name: Run Tests
-on:
-  push:
-    branches:
-      - 'develop'
-      - 'v2'
-  pull_request:
-jobs:
-  tests:
-    runs-on: ubuntu-20.04
-    if: "!contains(github.event.head_commit.message, 'skip ci') && !contains(github.event.head_commit.message, 'ci skip')"
-    strategy:
-      fail-fast: false
-      matrix:
-        php: [ 7.4, 8.0 ]
-        database: [ 'mariadb:10.2', 'mysql:8' ]
-    services:
-      database:
-        image: ${{ matrix.database }}
-        env:
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
-          MYSQL_DATABASE: panel_test
-        ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
-    name: "php-${{ matrix.php }} (${{ matrix.database }})"
-    steps:
-      - uses: actions/checkout@v2
-      - name: get cache directory
-        id: composer-cache
-        run: |
-          echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v2
-        with:
-          path: |
-            ~/.php_cs.cache
-            ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-cache-${{ matrix.php }}-${{ hashFiles('**.composer.lock') }}
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          extensions: bcmath, cli, curl, gd, mbstring, mysql, openssl, pdo, tokenizer, xml, zip
-          tools: composer:v2
-          coverage: none
-      - run: cp .env.ci .env
-      - run: composer install --prefer-dist --no-interaction --no-progress
-      - run: vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config .php-cs-fixer.dist.php
-        continue-on-error: true
-      - name: execute unit tests
-        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
-        if: ${{ always() }}
-        env:
-          DB_CONNECTION: testing
-          TESTING_DB_HOST: UNIT_NO_DB
-      - name: execute integration tests
-        run: vendor/bin/phpunit tests/Integration
-        env:
-          TESTING_DB_PORT: ${{ job.services.database.ports[3306] }}
-          TESTING_DB_USERNAME: root

.github/workflows/ui.yaml

@@ -0,0 +1,63 @@
+name: UI
+
+on:
+  push:
+    branches:
+      - "develop"
+      - "1.0-develop"
+  pull_request:
+    branches:
+      - "develop"
+      - "1.0-develop"
+
+jobs:
+  lint:
+    name: Lint
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Lint
+        run: pnpm run lint
+
+  tests:
+    name: Tests
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        node: [16, 18]
+    steps:
+      - name: Code checkout
+        uses: actions/checkout@v3
+
+      - name: Install pnpm
+        uses: pnpm/action-setup@v2
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: pnpm
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm run build
+
+      - name: Tests
+        run: pnpm run test

.gitignore

@@ -1,7 +1,6 @@
 /vendor
 *.DS_Store*
 !.env.ci
-!.env.dusk
 !.env.example
 .env*
 .vagrant/*
@@ -9,32 +8,29 @@
 storage/framework/*
 /.idea
 /nbproject
+/.direnv
 
 node_modules
 *.log
 _ide_helper.php
 _ide_helper_models.php
 .phpstorm.meta.php
-.php_cs.cache
 .yarn
 public/assets/manifest.json
 
 # For local development with docker
 # Remove if we ever put the Dockerfile in the repo
 .dockerignore
-#Dockerfile
 docker-compose.yml
 
 # for image related files
 misc
-.phpstorm.meta.php
-.php_cs.cache
-
+.php-cs-fixer.cache
 coverage.xml
-
-# Vagrant
-*.log
 resources/lang/locales.js
-resources/assets/pterodactyl/scripts/helpers/ziggy.js
-resources/assets/scripts/helpers/ziggy.js
 .phpunit.result.cache
+
+/public/build
+/public/hot
+result
+docker-compose.yaml

.npmrc

@@ -0,0 +1 @@
+shamefully-hoist=true

.php-cs-fixer.dist.php

@@ -29,7 +29,7 @@ return (new Config())
         'no_unreachable_default_argument_value' => true,
         'no_useless_return' => true,
         'ordered_imports' => [
-            'sortAlgorithm' => 'length',
+            'sort_algorithm' => 'length',
         ],
         'phpdoc_align' => [
             'align' => 'left',

.prettierignore

@@ -0,0 +1,4 @@
+.github
+public
+node_modules
+resources/views

.prettierrc.json

@@ -0,0 +1,22 @@
+{
+	"printWidth": 120,
+	"tabWidth": 4,
+	"useTabs": false,
+	"semi": true,
+	"singleQuote": true,
+	"jsxSingleQuote": false,
+	"trailingComma": "all",
+	"bracketSpacing": true,
+	"arrowParens": "avoid",
+	"endOfLine": "lf",
+	"overrides": [
+		{
+			"files": ["**/*.md"],
+			"options": {
+				"tabWidth": 2,
+				"useTabs": false,
+				"singleQuote": false
+			}
+		}
+	]
+}

.yarnclean

@@ -1 +0,0 @@
-@types/react-native

BUILDING.md

@@ -1,63 +0,0 @@
-# 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 12
-* [Yarn](https://classic.yarnpkg.com/lang/en/) v1
-* [Go](https://golang.org/) 1.15.
-
-### 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.

CHANGELOG.md

@@ -3,6 +3,303 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v1.11.3
+### Changed
+* When updating a server's description through the client API, if no value is specified, the description will now remain unchanged.
+* When installing the Panel for the first time, the queue driver will now all default to `redis` instead of `sync`.
+
+### Fixed
+* `php artisan p:environment:mail` not correctly setting the right variable for `MAIL_FROM_ADDRESS`.
+* Fixed the conflict state rendering on the UI for a server showing `reinstall_failed` as `restoring_backup`.
+* Fixed the unknown column `uuid` error when jobs fail, causing them not to get stored correctly.
+* Fixed the server task endpoints in the client API not allowing `sequence_id` and `continue_on_failure` to be set.
+
+## v1.11.2
+### Changed
+* Telemetry no longer sends a map of Egg and Nest UUIDs to the number of servers using them.
+* Increased the timeout for the decompress files endpoint in the client API from 15 seconds to 15 minutes.
+
+### Fixed
+* Fixed Panel Docker image having a `v` prefix in the version displayed in the admin area.
+* Fixed emails using the wrong queue name, causing them to not be sent.
+* Fixed the settings keys used for configuring SMTP settings, causing settings to not save properly.
+* Fixed the `MAIL_EHLO_DOMAIN` environment variable not being properly backwards compatible with the old `SERVER_NAME` variable.
+
+## v1.11.1
+### Fixed
+* Fixed Panel Docker image showing `canary` as it's version.
+
+## v1.11.0
+### Changed (since 1.10.4)
+* Changed minimum PHP version requirement from `7.4` to `8.0`.
+* Upgraded from Laravel 8 to Laravel 9.
+* This release requires Wings v1.11.x in order for Server Transfers to work.
+* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
+* Server re-installation failures are tracked independently of the initial installation process.
+
+### Fixed (since 1.10.4)
+* Node maintenance mode now properly blocks access to servers.
+* Fixed the length validation on the Minecraft Forge egg.
+* Fixed the password in the JDBC string not being properly URL encoded.
+* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
+* Properly handle a missing `Content-Length` header in the response from the daemon.
+* Ensure activity log properties are always returned as an object instead of an empty array.
+
+### Added (since 1.10.4)
+* Added the `server:settings.description` activity log event for when a server description is changed.
+* Added the ability to cancel file uploads in the file manager for a server.
+* Added a telemetry service to collect anonymous metrics from the panel, this feature is *enabled* by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
+
+## v1.11.0-rc.2
+### Changed
+* `MB` byte suffixes are now displayed as `MiB` to more accurately reflect the actual value.
+* Server re-installation failures are tracked independently of the initial installation process.
+
+### Fixed
+* Properly handle a missing `Content-Length` header in the response from the daemon.
+* Ensure activity log properties are always returned as an object instead of an empty array.
+
+### Added
+* Added the `server:settings.description` activity log event for when a server description is changed.
+* Added the ability to cancel file uploads in the file manager for a server.
+* Added a telemetry service to collect anonymous metrics from the panel, this feature is disabled by default and can be toggled using the `PTERODACTYL_TELEMETRY_ENABLED` environment variable.
+
+## v1.11.0-rc.1
+### Changed
+* Changed minimum PHP version requirement from `7.4` to `8.0`.
+* Upgraded from Laravel 8 to Laravel 9.
+* This release requires Wings v1.11.x in order for Server Transfers to work.
+
+### Fixed
+* Node maintenance mode now properly blocks access to servers.
+* Fixed the length validation on the Minecraft Forge egg.
+* Fixed the password in the JDBC string not being properly URL encoded.
+* Fixed an issue where Wings would throw a validation error while attempting to upload activity logs.
+
+## v1.10.4
+### Fixed
+* Fixed an issue where subusers could be given permissions that are not actually registered or used.
+* Fixed an issue where node FQDNs could not just be IP addresses.
+
+### Changed
+* Change maximum number of API keys per user from `10` to `25`.
+* Change byte unit prefix from `B` to `iB` to better reflect our usage of base 2 (multiples of 1024).
+
+## v1.10.3
+### Fixed
+* S3 Backup driver now supports Cloudflare R2.
+* Node FQDNs can now be used with AAAA records with no A records present.
+* Server transfers can no longer be initiated if the server is being installed, transferred, or restoring a backup.
+* Fixed an issue relating to the use of arrays in the `config_files` field with eggs.
+* Fixed `oom_disabled` not being mapped in the Application API when creating a new server.
+
+### Added
+* File manager now supports selecting multiple files for upload (when using the upload button).
+* Added a configuration option for specifying the S3 storage class for backups.
+
+### Changed
+* Servers will now show the current uptime when the server is starting rather than only showing when the server is marked as online.
+
+## v1.10.2
+### Fixed
+* Fixes a rendering issue with egg descriptions in the admin area
+* Fixes the page title on the SSH Keys page
+
+### Changed
+* Additional validation rules will now show a toggle switch rather than an input when editing server variables
+* The eggs endpoint will now always return an empty JSON object for the `config_files` field, even if the field is completely empty
+
+### Added
+* Adds a `Force Outgoing IP` option for eggs that can be used to ensure servers making outgoing connections use their allocation IP rather than the node's primary ip
+* Adds options to configure sending of email (re)install notifications
+* Add an option to configure the part size for backups uploaded to S3
+
+## v1.10.1
+### Fixed
+* Fixes a surprise `clock()` function that was used for debugging and should not have made it into the release. This was causing activity events to not properly sync between the Panel and Wings.
+
+## v1.10.0
+### Fixed
+* Fixes improper cache key naming on the frontend causing server activity logs to be duplicated across server page views.
+* Fixes overflow issues on dialogs when the internal content is too long.
+* Fixes spinner overlay on console improperly taking up the entire page making it impossible to use navigation controls.
+* Fixes 2FA QR code background being too dark for some phones to properly scan.
+* File manager now properly displays an error message if a user attempts to upload a folder rather than files.
+* Fixes the "Create Directory" dialog persisting the previously entered value when it is re-opened.
+
+### Changed
+* IP addresses in activity logs are now always displayed to administrators, regardless of if they own the server or not.
+* Scroll down indicator on the console has been changed to a down arrow to be clearer.
+* Docker builds have been updated to use `PHP 8.1`.
+* Recaptcha validation domain is now configurable using the `RECAPTCHA_DOMAIN` environment variable.
+* Drag and drop overlay on the file manager has been tweaked to be slightly more consistent with the frontend style and be a little easier to read.
+
+### Added
+* Adds support for the `user_uuid` claim on all generated JWTs which allows Wings to properly identify the user performing each action.
+* Adds support for recieving external activity log events from Wings instances (power state, commands, SFTP, and uploads).
+* Adds support for tracking failed password-based SFTP logins.
+* Server name and description are now passed along to Wings making them available in egg variables for parsing and including.
+* Adds support for displaying all active file uploads in the file manager.
+
+## v1.9.2
+### Fixed
+* Fixes rouding in sidebar of CPU usage graph that was causing an excessive number of zeros to be rendered.
+* Fixes the Java Version selector modal having the wrong default value selected initially.
+* Fixes console rendering in Safari that was causing the console to resize excessively and graphs to overlay content.
+* Fixes missing "Starting"/"Stopping" status display in the server uptime block.
+* Fixes incorrect formatting of activity log when viewing certain file actions.
+
+### Changed
+* Updated the UI for the two-step authorization setup on accounts to use new Dialog UI and provide better clarity to new users.
+
+### Added
+* Added missing `<DOCTYPE html>` tag to template output to avoid entering quirks mode in browsers.
+* Added password requirement when enabling TOTP on an account.
+
+## v1.9.1
+### Fixed
+* Fixes missing "Click to Copy" for server address on the console data blocks.
+* Fixes data points on the graphs not being properly rounded to two decimal places.
+* Returns byte formatting logic to use `1024` as the base value, rather than `1000`.
+* Fixes permission error occurring when a server is marked as installing and an admin navigates to the console screen.
+* Fixes improper display of install/transfer warning on the server console page.
+* Fixes permission matching for the server settings page to correctly allow access when a user has _any_ of the needed permissions.
+
+### Changed
+* Moves the server data blocks to the right-hand side of the console, rather than the left.
+* Rather than defaulting graph values at `0` when resetting or refreshing the page, their values are now hidden entirely.
+* **[security]** Hides IP addresses from all activity log entries that are not directly associated with the currently signed in user.
+
+### Added
+* Adds the current resource limits for a server next to each data block on the console screen.
+
+## v1.9.0
+### Added
+* Added support for using Tailwind classes inside components using `className={}` rather than having to use `twin.macro` with the `css={}` prop.
+* Added HeadlessUI and Heroicons packages.
+* Added new `Tooltip.tsx` component to support displaying tooltips within the Panel.
+* Adds a new activity log view for both user accounts and individual servers. This builds upon data collected in previous releases.
+* Added a new column `api_key_id` to the `activity_logs` table to indicate if the user performed the action while using an API key.
+* Adds initial support for language translations on the front-end. The underlying implementation details are working, however work has not yet begun on actually translating all of the strings yet. Expect this to continue in future releases.
+* Improved accessibility for navigation icons by adding a tooltip on hover to indicate what each one does.
+* Adds logging for API keys that are blocked from performing an API action due to IP address limiting.
+* Adds support for `?filter[description]=foo` when querying servers on both the client and application API.
+
+### Changed
+* Updated how release assets are generated to perform more logical bundle splitting. This should help reduce the amount of data users have to download at once in order to render the UI.
+* Upgraded From TailwindCSS 2 to 3 — for most people this should have minimal if any impact.
+* Chart.js updated from v2 to v3.
+* Reduced the number of custom colors in use — by default we now use Tailwind's default color pallet, with the exception of a custom gray scheme.
+* **[deprecated]** The use of `neutral` and `primary` have been deprecated in class names, prefer `gray` and `blue` respectively.
+* Begins the process of dropping the use of Gravatars for user avatars and replaces them with dynamically generated SVG images.
+* Improved front-end route definitions to make it easier for external modifications to inject their routes and components into the codebase without having to modify as many core files.
+* Redesigned the server console screen to better display data users might be looking for, and increase the height of the console itself.
+* Merged the two network data graphs into a single dual-line graph to better display incoming and outgoing data volumes.
+* Updated all byte formatting logic to use `1000` as the divisor rather than `1024` to be more consistent with what users most likely expect.
+* Changed the underlying `eslint` rules applied to the front-end codebase to simplify them dramatically. We now utilize `prettier` in combination with some basic default rulesets to make it easier to understand the expected formatting.
+
+### Fixed
+* Fixes a bug causing a 404 error when attempting to delete a database from a server in the admin control panel.
+* Fixes console input auto-capitalizing and auto-correcting when entering text on some mobile devices.
+* Fixes SES service configuration using a hard-coded `us-east-1` region.
+* Fixes a bug causing a 404 error when attempting to delete an SSH key from your account when the SHA256 hash includes a slash.
+* Fixes mobile keyboards automatically attempting to capitalize and spellcheck typing on the server console.
+* Fixes improper support for IP address CIDR ranges when creating API keys for the client area.
+* Fixes a bug preventing additional included details from being returned from the application API when utilizing a client API key as an administrator.
+
+## v1.8.1
+### Fixed
+* Fixes a bug causing mounts to return a 404 error when adding them to a server.
+* Fixes a bug causing the Egg Image dropdown to not display properly when creating a new server.
+* Fixes a bug causing an error when attemping to create a new server via the API.
+
+## v1.8.0
+**Important:** this version updates the `version` field on generated Eggs to be `PTDL_v2` due to formatting changes. This
+should be completely seamless for most installations as the Panel is able to convert between the two. Custom solutions
+using these eggs should be updated to account for the new format.
+
+This release also changes API key behavior — "client" keys belonging to admin users can now be used to access
+the `/api/application` endpoints in their entirety. Existing "application" keys generated in the admin area should
+be considered deprecated, but will continue to work. Application keys _will not_ work with the client API.
+
+### Fixed
+* Schedules are no longer run when a server is suspended or marked as installing.
+* The remote field when creating a database is no longer limited to an IP address and `%` wildcard — all expected MySQL remote host values are allowed.
+* Allocations cannot be deleted from a server by a user if the server is configured with an `allocation_limit` set to `0`.
+* The Java Version modal no longer shows a dropdown and update option to users that do not have permission to make those changes.
+* The Java Version modal now correctly returns only the images available to the server's selected Egg.
+* Fixes leading and trailing spaces being removed from variable values on file manager endpoints, causing errors when trying to perform actions against certain files and folders.
+
+### Changed
+* Forces HTTPS on URLs when the `APP_URL` value is set and includes `https://` within the URL. This addresses proxy misconfiguration issues that would cause URLs to be generated incorrectly.
+* Lowers the default timeout values for requests to Wings instances from 10 seconds to 5 seconds.
+* Additional permissions (`CREATE TEMPORARY TABLES`, `CREATE VIEW`, `SHOW VIEW`, `EVENT`, and `TRIGGER`) are granted to users when creating new databases for servers.
+* development: removed Laravel Debugbar in favor of Clockwork for debugging.
+* The 2FA input field when logging in is now correctly identified as `one-time-password` to help browser autofill capabilities.
+* Changed API authentication mechanisms to make use of Laravel Sanctum to significantly clean up our internal handling of sessions.
+* API keys generated by the system now set a prefix to identify them as Pterodactyl API keys, and if they are client or application keys. This prefix looks like `ptlc_` for client keys, and `ptla_` for application keys. Existing API keys are unaffected by this change.
+
+### Added
+* Added support for PHP 8.1 in addition to PHP 8.0 and 7.4.
+* Adds more support for catching potential PID exhaustion errors in different games.
+* It is now possible to create a new node on the Panel using an artisan command.
+* A new cron cheatsheet has been added which appears when creating a schedule.
+* Adds support for filtering the `/api/application/nodes/:id/allocations` endpoint using `?filter[server_id]=0` to only return allocations that are not currently assigned to a server on that node.
+* Adds support for naming docker image values in an Egg to improve front-end display capabilities.
+* Adds command to return the configuration for a specific node in both YAML and JSON format (`php artisan p:node:configuration`).
+* Adds command to return a list of all nodes available on the Panel in both table and JSON format (`php artisan p:node:list`).
+* Adds server network (inbound/outbound) usage graphs to the console screen.
+* Adds support for configuring CORS on the API by setting the `APP_CORS_ALLOWED_ORIGINS=example.com,dashboard.example.com` environment variable. By default all instances are configured with this set to `*` which allows any origin.
+* Adds proper activity logging for the following areas of the Panel: authentication, user account modifications, server modification. This is an initial test implementation before further roll-out in the software. Events are logged into the database but are not currently exposed in the UI — they will be displayed in a future update.
+
+### Removed
+* Removes Google Analytics from the front end code.
+* Removes multiple middleware that were previously used for configuring API access and controlling model fetching. This has all been replaced with Laravel Sanctum and standard Laravel API tooling. This should make codebase discovery significantly more simple.
+* **DEPRECATED**: The use of `Pterodactyl\Models\AuditLog` is deprecated and all references to this model have been removed from the codebase. In the next major release this model and table will be fully dropped.
+
+## v1.7.0
+### Fixed
+* Fixes typo in message shown to user when deleting a database.
+* Fixes formatting of IPv6 addresses when displaying allocations to users.
+* Fixes an exception thrown while trying to return error messages from API endpoints that inproperly masked the true underlying error.
+* Fixes SSL certificate path generation for Let's Encrypt by ensuring they are always transformed to lowercase.
+* Removes duplicate entries when creating a nested folder in the file manager.
+* Fixes missing validation of Egg Author email addresses during the setup process that could cause unexpected failures later on.
+* Fixes font rendering issues of the console on Firefox due to an outdated version of xterm.js being used.
+* Fixes display overlap issues of the two-factor configuration form in a user's settings.
+* **[security]** When authenticating using an API key a user session is now only persisted for the duration of the request before being destroyed.
+
+### Changed
+* CPU graph changed to show the maximum amount of CPU available to a server to better match how the memory graph is displayed.
+
+### Added
+* Adds support for `DB_PORT` environment variable in the Docker enterpoint for the Panel image.
+* Adds suport for ARM environments in the Docker image.
+* Adds a new warning modal for Steam servers shown when an invalid Game Server Login Token (GSL Token) is detected.
+* Adds a new warning modal for Steam servers shown when the installation process runs out of available disk space.
+* Adds a new warning modal for Minecraft servers shown when a server exceeds the maximum number of child processes.
+* Adds support for displaying certain server variable fields as a checkbox when they're detected as using `boolean` or `in:0,1` validation rules.
+* Adds support for Pug and Jade in the file editor.
+* Adds an entry to the `robots.txt` file to correctly disallow all bot indexing.
+
+
+## v1.6.6
+### Fixed
+* **[security]** Fixes a CSRF vulnerability for both the administrative test email endpoint and node auto-deployment token generation endpoint. [GHSA-wwgq-9jhf-qgw6](https://github.com/pterodactyl/panel/security/advisories/GHSA-wwgq-9jhf-qgw6)
+
+### Changed
+* Updates Minecraft eggs to include latest Java 17 yolk by default.
+
+## v1.6.5
+### Fixed
+* Fixes broken application API endpoints due to changes introduced with session management in 1.6.4.
+
+## v1.6.4
+_This release should not be used, please use `1.6.5`. It has been pulled from our releases._
+
+### Fixed
+* Fixes a session management bug that would cause a user who signs out of one browser to be unintentionally logged out of other browser sessions when using the client API.
+
 ## v1.6.3
 ### Fixed
 * **[Security]** Changes logout endpoint to be a POST request with CSRF-token validation to prevent a malicious actor from triggering a user logout.

CONTRIBUTING.md

@@ -1,55 +1,31 @@
 # Contributing
-We're glad you want to help us out and make this panel the best that it can be! We have a few simple things to follow
-when making changes to files and adding new features.
 
-### Development Environment
-Please check the [`pterodactyl/development`](https://github.com/pterodactyl/development) repository for a Vagrant &
-Docker setup that should run on most macOS and Linux distributions. In the event that your platform is not supported
-you're welcome to open a PR, or just take a look at our setup scripts to see what you'll need to successfully develop
-with Pterodactyl.
+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.
 
-#### Building Assets
-Please see [`BUILDING.md`](https://github.com/pterodactyl/panel/blob/develop/BUILDING.md) for details on how to actually
-build and run the development server.
-
-### Project Branches
-This section mainly applies to those with read/write access to our repositories, but can be helpful for others.
-
-The `develop` branch should always be in a runnable state, and not contain any major breaking features. For the most
-part, this means you will need to create `feature/` branches in order to add new functionality or change how things
-work. When making a feature branch, if it is referencing something in the issue tracker, please title the branch
-`feature/PTDL-###` where `###` is the issue number.
-
-All new code should contain tests to ensure their functionality is not unintentionally changed down the road. This
-is especially important for any API actions or authentication based controls.
-
-### The CHANGELOG
-You should not make any changes to the `CHANGELOG.md` file during your code updates. This is updated by the maintainers
-at the time of deployment to include the relevant changes that were made.
-
-### Code Guidelines
-We are a `PSR-4` and `PSR-0` compliant project, so please follow those guidelines at a minimum. In addition we run
-`php-cs-fixer` on all PRs and releases to enforce a consistent code style. The following command executed on your machine
-should show any areas where the code style does not line up correctly.
-
-```
-vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config .php_cs.dist
-```
+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
+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 `dane åt pterodactyl døt io`.
+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
+
+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).

Containerfile

@@ -0,0 +1,77 @@
+# Stage 1 - Builder
+FROM        --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/nodejs-18-minimal AS builder
+
+USER        0
+RUN         npm install -g pnpm
+
+WORKDIR     /var/www/pterodactyl
+
+COPY        --chown=1001:0 public ./public
+COPY        --chown=1001:0 resources/scripts ./resources/scripts
+COPY        --chown=1001:0 .eslintignore .eslintrc.js .npmrc .prettierrc.json package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts .
+
+RUN         /opt/app-root/src/.npm-global/bin/pnpm install \
+                && /opt/app-root/src/.npm-global/bin/pnpm build \
+                && rm -rf resources/scripts .eslintignore .eslintrc.yml .npmrc package.json pnpm-lock.yaml tailwind.config.js tsconfig.json vite.config.ts node_modules
+
+USER        1001
+
+COPY        --chown=1001:0 app ./app
+COPY        --chown=1001:0 bootstrap ./bootstrap
+COPY        --chown=1001:0 config ./config
+COPY        --chown=1001:0 database ./database
+COPY        --chown=1001:0 resources/lang ./resources/lang
+COPY        --chown=1001:0 resources/views ./resources/views
+COPY        --chown=1001:0 routes ./routes
+COPY        --chown=1001:0 .env.example ./.env
+COPY        --chown=1001:0 artisan CHANGELOG.md composer.json composer.lock LICENSE.md README.md SECURITY.md .
+
+# Stage 2 - Final
+FROM        --platform=$TARGETOS/$TARGETARCH registry.access.redhat.com/ubi9/ubi-minimal
+
+RUN         microdnf update -y \
+                && rpm --install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm \
+                && rpm --install https://rpms.remirepo.net/enterprise/remi-release-9.rpm \
+                && microdnf update -y \
+                && microdnf install -y ca-certificates shadow-utils tar tzdata unzip wget \
+# ref; https://bugzilla.redhat.com/show_bug.cgi?id=1870814
+                && microdnf reinstall -y tzdata \
+                && microdnf module -y reset php \
+                && microdnf module -y enable php:remi-8.2 \
+                && microdnf install -y composer cronie php-{bcmath,cli,common,fpm,gd,gmp,intl,json,mbstring,mysqlnd,opcache,pdo,pecl-redis5,pecl-zip,phpiredis,pgsql,process,sodium,xml,zstd} supervisor \
+                && rm /etc/php-fpm.d/www.conf \
+                && useradd --home-dir /var/lib/caddy --create-home caddy \
+                && mkdir /etc/caddy \
+                && wget -O /usr/local/bin/yacron https://github.com/gjcarneiro/yacron/releases/download/0.17.0/yacron-0.17.0-x86_64-unknown-linux-gnu \
+                && chmod 755 /usr/local/bin/yacron \
+                && microdnf remove -y tar wget \
+                && microdnf clean all
+
+COPY        --chown=caddy:caddy --from=builder /var/www/pterodactyl /var/www/pterodactyl
+
+WORKDIR     /var/www/pterodactyl
+
+RUN         mkdir -p /tmp/pterodactyl/cache /tmp/pterodactyl/framework/{cache,sessions,views} storage/framework \
+                && rm -rf bootstrap/cache storage/framework/sessions storage/framework/views storage/framework/cache \
+                && ln -s /tmp/pterodactyl/cache /var/www/pterodactyl/bootstrap/cache \
+                && ln -s /tmp/pterodactyl/framework/cache /var/www/pterodactyl/storage/framework/cache \
+                && ln -s /tmp/pterodactyl/framework/sessions /var/www/pterodactyl/storage/framework/sessions \
+                && ln -s /tmp/pterodactyl/framework/views /var/www/pterodactyl/storage/framework/views \
+                && chmod -R 755 /var/www/pterodactyl/storage/* /tmp/pterodactyl/cache \
+                && chown -R caddy:caddy /var/www/pterodactyl /tmp/pterodactyl/{cache,framework}
+
+USER        caddy
+ENV         USER=caddy
+
+RUN         composer install --no-dev --optimize-autoloader \
+                && rm -rf bootstrap/cache/*.php \
+                && rm -rf .env storage/logs/*.log
+
+COPY        --from=docker.io/library/caddy:latest /usr/bin/caddy /usr/local/bin/caddy
+COPY        .github/docker/Caddyfile /etc/caddy/Caddyfile
+COPY        .github/docker/php-fpm.conf /etc/php-fpm.conf
+COPY        .github/docker/supervisord.conf /etc/supervisord.conf
+COPY        .github/docker/yacron.yaml /etc/yacron.yaml
+
+EXPOSE      8080
+CMD         ["/usr/bin/supervisord", "--configuration=/etc/supervisord.conf"]

Dockerfile

@@ -1,39 +0,0 @@
-# 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 mhart/alpine-node:14
-WORKDIR /app
-COPY . ./
-RUN yarn install --frozen-lockfile \
-    && yarn run build:production
-
-# Stage 1:
-# Build the actual container with all of the needed PHP dependencies that will run the application.
-FROM php:7.4-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 \
-    && 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 \
-    && chown -R nginx:nginx .
-
-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 \
-    && sed -i s/ssl_session_cache/#ssl_session_cache/g /etc/nginx/nginx.conf \
-    && mkdir -p /var/run/php /var/run/nginx
-
-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
-ENTRYPOINT ["/bin/ash", ".github/docker/entrypoint.sh"]
-CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 Skynet
+
+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.

LICENSE.md

@@ -1,7 +1,8 @@
 # The MIT License (MIT)
 
 ```
-Copyright (c) 2015 - 2021 Dane Everitt <dane@daneeveritt.com> and Contributors
+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

README.md

@@ -1,12 +1,13 @@
 [![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
 
-![GitHub Workflow Status](https://img.shields.io/github/workflow/status/pterodactyl/panel/tests?label=Tests&style=for-the-badge)
+![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/pterodactyl/panel/laravel.yaml?label=Tests&style=for-the-badge&branch=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 an open-source game server management panel built with PHP 7, React, and Go. Designed with security 
+
+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.
 
@@ -14,39 +15,34 @@ 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)
 
-## Sponsors
-I would like to extend my sincere thanks to the following sponsors for helping fund Pterodactyl's developement.
-[Interested in becoming a sponsor?](https://github.com/sponsors/DaneEveritt)
-
-| Company | About |
-| ------- | ----- |
-| [**WISP**](https://wisp.gg) | Extra features. |
-| [**MixmlHosting**](https://mixmlhosting.com) | MixmlHosting provides high quality Virtual Private Servers along with game servers, all at a affordable price. |
-| [**BisectHosting**](https://www.bisecthosting.com/) | BisectHosting provides Minecraft, Valheim and other server hosting services with the highest reliability and lightning fast support since 2012. |
-| [**Bloom.host**](https://bloom.host) | Bloom.host offers dedicated core VPS and Minecraft hosting with Ryzen 9 processors. With owned-hardware, we offer truly unbeatable prices on high-performance hosting. |
-| [**MineStrator**](https://minestrator.com/) | Looking for a French highend hosting company for you minecraft server? More than 14,000 members on our discord, trust us. |
-| [**DedicatedMC**](https://dedicatedmc.io/) | DedicatedMC provides Raw Power hosting at affordable pricing, making sure to never compromise on your performance and giving you the best performance money can buy. |
-| [**Skynode**](https://www.skynode.pro/) | Skynode provides blazing fast game servers along with a top-notch user experience. Whatever our clients are looking for, we're able to provide it! |
-| [**XCORE**](https://xcore-server.de/) | XCORE offers High-End Servers for hosting and gaming since 2012. Fast, excellent and well-known for eSports Gaming. |
-| [**RoyaleHosting**](https://royalehosting.net/) | Build your dreams and deploy them with RoyaleHosting’s reliable servers and network. Easy to use, provisioned in a couple of minutes. |
-| [**Spill Hosting**](https://spillhosting.no/) | Spill Hosting is a Norwegian hosting service, which aims for inexpensive services on quality servers. Premium i9-9900K processors will run your game like a dream. |
-| [**DeinServerHost**](https://deinserverhost.de/) | DeinServerHost offers Dedicated, vps and Gameservers for many popular Games like Minecraft and Rust in Germany since 2013. |
-| [**HostBend**](https://hostbend.com/) | HostBend offers a variety of solutions for developers, students, and others who have a tight budget but don't want to compromise quality and support. |
-| [**Capitol Hosting Solutions**](https://chs.gg/) | CHS is *the* budget friendly hosting company for Australian and American gamers, offering a variety of plans from Web Hosting to Game Servers; Custom Solutions too! |
-| [**ByteAnia**](https://byteania.com/?utm_source=pterodactyl) | ByteAnia offers the best performing and most affordable **Ryzen 5000 Series hosting** on the market for *unbeatable prices*! |
-| [**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. |
-| [**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.|
-| [**RocketNode**](https://rocketnode.net) | RocketNode is a VPS and Game Server provider that offers the best performing VPS and Game hosting Solutions at affordable prices! |
-
 ## 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                                                                                                                                                                                                 |
+|-----------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| [**WISP**](https://wisp.gg)                                           | Extra features.                                                                                                                                                                                       |
+| [**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.                                                       |
+| [**WemX**](https://wemx.net/)                                         | WemX helps automate your hosting company or SaaS business by automating billing, user management, authentication, and much more.                                                                      |
+| [**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. |
+| [**DutchIS**](https://dutchis.net?ref=pterodactyl)                    | DutchIS provides instant infrastructure such as pay per use VPS hosting. Start your game hosting journey on DutchIS.                                                                                  |
+| [**Skoali**](https://skoali.com/)                                     | Skoali is a French company that hosts game servers and other types of services (VPS, WEB, Dedicated servers, ...). We also have a free plan for Minecraft and Garry's Mod.                            |
+| [**Rabbit Computing**](https://www.rabbitcomputing.com/link.php?id=5) | Rabbit Computing offers powerful VPS servers, highly available game hosting, and fully unlimited web hosting. Use code README for 20% off your first three months!                                    |
+
 ### Supported Games
-We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to
-host your games across the world without having to bloat each physical machine with additional dependencies.
+
+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:
 
@@ -73,27 +69,7 @@ and there are plenty more games available provided by the community. Some of the
 * [and many more...](https://github.com/parkervcp/eggs)
 
 ## License
-```
-Copyright (c) 2015 - 2021 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:
+Pterodactyl® Copyright © 2015 - 2022 Dane Everitt and contributors.
 
-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.
-```
-
-Some Javascript and CSS used within the panel are licensed under a `MIT` or `Apache 2.0` license. Please check their
-respective header files for more information.
+Code released under the [MIT License](./LICENSE.md).

SECURITY.md

@@ -1,17 +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.6.x | wings@1.5.x  | :white_check_mark: |
-| 0.7.x | daemon@0.6.x | :x: |
+| Panel  | Daemon       | Supported          |
+|--------|--------------|--------------------|
+| 1.10.x | wings@1.7.x  | :white_check_mark: |
+| 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 send an email to `dane@pterodactyl.io`.
+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.
 

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -1,31 +1,22 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Environment;
 
-use DateTimeZone;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class AppSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
-    public const ALLOWED_CACHE_DRIVERS = [
+    public const CACHE_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'memcached' => 'Memcached',
         'file' => 'Filesystem',
     ];
 
-    public const ALLOWED_SESSION_DRIVERS = [
+    public const SESSION_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'memcached' => 'Memcached',
         'database' => 'MySQL Database',
@@ -33,30 +24,14 @@ class AppSettingsCommand extends Command
         'cookie' => 'Cookie',
     ];
 
-    public const ALLOWED_QUEUE_DRIVERS = [
+    public const QUEUE_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'database' => 'MySQL Database',
         'sync' => 'Sync',
     ];
 
-    /**
-     * @var \Illuminate\Contracts\Console\Kernel
-     */
-    protected $command;
-
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * @var string
-     */
     protected $description = 'Configure basic environment settings for the Panel.';
 
-    /**
-     * @var string
-     */
     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.}
@@ -68,22 +43,17 @@ class AppSettingsCommand extends Command
                             {--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.}';
+                            {--settings-ui= : Enable or disable the settings UI.}
+                            {--telemetry= : Enable or disable anonymous telemetry.}';
 
-    /**
-     * @var array
-     */
-    protected $variables = [];
+    protected array $variables = [];
 
     /**
      * AppSettingsCommand constructor.
      */
-    public function __construct(ConfigRepository $config, Kernel $command)
+    public function __construct(private Kernel $console)
     {
         parent::__construct();
-
-        $this->command = $command;
-        $this->config = $config;
     }
 
     /**
@@ -91,67 +61,81 @@ class AppSettingsCommand extends Command
      *
      * @throws \Pterodactyl\Exceptions\PterodactylException
      */
-    public function handle()
+    public function handle(): int
     {
-        if (empty($this->config->get('hashids.salt')) || $this->option('new-salt')) {
+        if (empty(config('hashids.salt')) || $this->option('new-salt')) {
             $this->variables['HASHIDS_SALT'] = str_random(20);
         }
 
-        $this->output->comment(trans('command/messages.environment.app.author_help'));
+        $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(
-            trans('command/messages.environment.app.author'),
-            $this->config->get('pterodactyl.service.author', 'unknown@unknown.com')
+            'Egg Author Email',
+            config('pterodactyl.service.author', 'unknown@unknown.com')
         );
 
-        $this->output->comment(trans('command/messages.environment.app.app_url_help'));
+        if (!filter_var($this->variables['APP_SERVICE_AUTHOR'], FILTER_VALIDATE_EMAIL)) {
+            $this->output->error('The service author email provided is invalid.');
+
+            return 1;
+        }
+
+        $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(
-            trans('command/messages.environment.app.app_url'),
-            $this->config->get('app.url', 'http://example.org')
+            'Application URL',
+            config('app.url', 'https://example.com')
         );
 
-        $this->output->comment(trans('command/messages.environment.app.timezone_help'));
+        $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(
-            trans('command/messages.environment.app.timezone'),
-            DateTimeZone::listIdentifiers(DateTimeZone::ALL),
-            $this->config->get('app.timezone')
+            'Application Timezone',
+            \DateTimeZone::listIdentifiers(),
+            config('app.timezone')
         );
 
-        $selected = $this->config->get('cache.default', 'redis');
+        $selected = config('cache.default', 'redis');
         $this->variables['CACHE_DRIVER'] = $this->option('cache') ?? $this->choice(
-            trans('command/messages.environment.app.cache_driver'),
-            self::ALLOWED_CACHE_DRIVERS,
-            array_key_exists($selected, self::ALLOWED_CACHE_DRIVERS) ? $selected : null
+            'Cache Driver',
+            self::CACHE_DRIVERS,
+            array_key_exists($selected, self::CACHE_DRIVERS) ? $selected : null
         );
 
-        $selected = $this->config->get('session.driver', 'redis');
+        $selected = config('session.driver', 'redis');
         $this->variables['SESSION_DRIVER'] = $this->option('session') ?? $this->choice(
-            trans('command/messages.environment.app.session_driver'),
-            self::ALLOWED_SESSION_DRIVERS,
-            array_key_exists($selected, self::ALLOWED_SESSION_DRIVERS) ? $selected : null
+            'Session Driver',
+            self::SESSION_DRIVERS,
+            array_key_exists($selected, self::SESSION_DRIVERS) ? $selected : null
         );
 
-        $selected = $this->config->get('queue.default', 'redis');
+        $selected = config('queue.default', 'redis');
         $this->variables['QUEUE_CONNECTION'] = $this->option('queue') ?? $this->choice(
-            trans('command/messages.environment.app.queue_driver'),
-            self::ALLOWED_QUEUE_DRIVERS,
-            array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null
+            '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(trans('command/messages.environment.app.settings'), true) ? 'false' : 'true';
+            $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 (strpos($this->variables['APP_URL'], 'https://') === 0) {
+        if (str_starts_with($this->variables['APP_URL'], 'https://')) {
             $this->variables['SESSION_SECURE_COOKIE'] = 'true';
         }
 
         $this->checkForRedis();
         $this->writeToEnvironment($this->variables);
 
-        $this->info($this->command->output());
+        $this->info($this->console->output());
+
+        return 0;
     }
 
     /**
@@ -168,22 +152,22 @@ class AppSettingsCommand extends Command
             return;
         }
 
-        $this->output->note(trans('command/messages.environment.app.using_redis'));
+        $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(
-            trans('command/messages.environment.app.redis_host'),
-            $this->config->get('database.redis.default.host')
+            'Redis Host',
+            config('database.redis.default.host')
         );
 
         $askForRedisPassword = true;
-        if (!empty($this->config->get('database.redis.default.password'))) {
-            $this->variables['REDIS_PASSWORD'] = $this->config->get('database.redis.default.password');
-            $askForRedisPassword = $this->confirm(trans('command/messages.environment.app.redis_pass_defined'));
+        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(trans('command/messages.environment.app.redis_pass_help'));
+            $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(
-                trans('command/messages.environment.app.redis_password')
+                'Redis Password'
             );
         }
 
@@ -192,8 +176,8 @@ class AppSettingsCommand extends Command
         }
 
         $this->variables['REDIS_PORT'] = $this->option('redis-port') ?? $this->ask(
-            trans('command/messages.environment.app.redis_port'),
-            $this->config->get('database.redis.default.port')
+            'Redis Port',
+            config('database.redis.default.port')
         );
     }
 }

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -1,48 +1,18 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Environment;
 
-use PDOException;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
 use Illuminate\Database\DatabaseManager;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
-use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class DatabaseSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * @var \Illuminate\Contracts\Console\Kernel
-     */
-    protected $console;
-
-    /**
-     * @var \Illuminate\Database\DatabaseManager
-     */
-    protected $database;
-
-    /**
-     * @var string
-     */
     protected $description = 'Configure database settings for the Panel.';
 
-    /**
-     * @var string
-     */
     protected $signature = 'p:environment:database
                             {--host= : The connection address for the MySQL server.}
                             {--port= : The connection port for the MySQL server.}
@@ -50,71 +20,62 @@ class DatabaseSettingsCommand extends Command
                             {--username= : Username to use when connecting.}
                             {--password= : Password to use for this database.}';
 
-    /**
-     * @var array
-     */
-    protected $variables = [];
+    protected array $variables = [];
 
     /**
      * DatabaseSettingsCommand constructor.
      */
-    public function __construct(ConfigRepository $config, DatabaseManager $database, Kernel $console)
+    public function __construct(private DatabaseManager $database, private Kernel $console)
     {
         parent::__construct();
-
-        $this->config = $config;
-        $this->console = $console;
-        $this->database = $database;
     }
 
     /**
      * Handle command execution.
      *
-     * @return int
-     *
      * @throws \Pterodactyl\Exceptions\PterodactylException
      */
-    public function handle()
+    public function handle(): int
     {
-        $this->output->note(trans('command/messages.environment.database.host_warning'));
+        $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(
-            trans('command/messages.environment.database.host'),
-            $this->config->get('database.connections.mysql.host', '127.0.0.1')
+            'Database Host',
+            config('database.connections.mysql.host', '127.0.0.1')
         );
 
         $this->variables['DB_PORT'] = $this->option('port') ?? $this->ask(
-            trans('command/messages.environment.database.port'),
-            $this->config->get('database.connections.mysql.port', 3306)
+            'Database Port',
+            config('database.connections.mysql.port', 3306)
         );
 
         $this->variables['DB_DATABASE'] = $this->option('database') ?? $this->ask(
-            trans('command/messages.environment.database.database'),
-            $this->config->get('database.connections.mysql.database', 'panel')
+            'Database Name',
+            config('database.connections.mysql.database', 'panel')
         );
 
-        $this->output->note(trans('command/messages.environment.database.username_warning'));
+        $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(
-            trans('command/messages.environment.database.username'),
-            $this->config->get('database.connections.mysql.username', 'pterodactyl')
+            'Database Username',
+            config('database.connections.mysql.username', 'pterodactyl')
         );
 
         $askForMySQLPassword = true;
-        if (!empty($this->config->get('database.connections.mysql.password')) && $this->input->isInteractive()) {
-            $this->variables['DB_PASSWORD'] = $this->config->get('database.connections.mysql.password');
-            $askForMySQLPassword = $this->confirm(trans('command/messages.environment.database.password_defined'));
+        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?');
         }
 
         if ($askForMySQLPassword) {
-            $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret(trans('command/messages.environment.database.password'));
+            $this->variables['DB_PASSWORD'] = $this->option('password') ?? $this->secret('Database Password');
         }
 
         try {
             $this->testMySQLConnection();
-        } catch (PDOException $exception) {
-            $this->output->error(trans('command/messages.environment.database.connection_error', ['error' => $exception->getMessage()]));
-            $this->output->error(trans('command/messages.environment.database.creds_not_saved'));
+        } 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(trans('command/messages.environment.database.try_again'))) {
+            if ($this->confirm('Go back and try again?')) {
                 $this->database->disconnect('_pterodactyl_command_test');
 
                 return $this->handle();
@@ -135,7 +96,7 @@ class DatabaseSettingsCommand extends Command
      */
     private function testMySQLConnection()
     {
-        $this->config->set('database.connections._pterodactyl_command_test', [
+        config()->set('database.connections._pterodactyl_command_test', [
             'driver' => 'mysql',
             'host' => $this->variables['DB_HOST'],
             'port' => $this->variables['DB_PORT'],

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Environment;
 
@@ -17,19 +10,8 @@ class EmailSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * @var string
-     */
     protected $description = 'Set or update the email sending configuration for the Panel.';
 
-    /**
-     * @var string
-     */
     protected $signature = 'p:environment:mail
                             {--driver= : The mail driver to use.}
                             {--email= : Email address that messages from the Panel will originate from.}
@@ -41,19 +23,14 @@ class EmailSettingsCommand extends Command
                             {--username=}
                             {--password=}';
 
-    /**
-     * @var array
-     */
-    protected $variables = [];
+    protected array $variables = [];
 
     /**
      * EmailSettingsCommand constructor.
      */
-    public function __construct(ConfigRepository $config)
+    public function __construct(private ConfigRepository $config)
     {
         parent::__construct();
-
-        $this->config = $config;
     }
 
     /**
@@ -67,12 +44,12 @@ class EmailSettingsCommand extends Command
             trans('command/messages.environment.mail.ask_driver'),
             [
                 'smtp' => 'SMTP Server',
-                'mail' => 'PHP\'s Internal Mail Function',
+                'sendmail' => 'sendmail Binary',
                 'mailgun' => 'Mailgun Transactional Email',
                 'mandrill' => 'Mandrill Transactional Email',
-                'postmark' => 'Postmarkapp Transactional Email',
+                'postmark' => 'Postmark Transactional Email',
             ],
-            $this->config->get('mail.driver', 'smtp')
+            $this->config->get('mail.default', 'smtp')
         );
 
         $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
@@ -80,7 +57,7 @@ class EmailSettingsCommand extends Command
             $this->{$method}();
         }
 
-        $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
+        $this->variables['MAIL_FROM_ADDRESS'] = $this->option('email') ?? $this->ask(
             trans('command/messages.environment.mail.ask_mail_from'),
             $this->config->get('mail.from.address')
         );
@@ -90,12 +67,6 @@ class EmailSettingsCommand extends Command
             $this->config->get('mail.from.name')
         );
 
-        $this->variables['MAIL_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
-            trans('command/messages.environment.mail.ask_encryption'),
-            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
-            $this->config->get('mail.encryption', 'tls')
-        );
-
         $this->writeToEnvironment($this->variables);
 
         $this->line('Updating stored environment configuration file.');
@@ -109,22 +80,28 @@ class EmailSettingsCommand extends Command
     {
         $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
             trans('command/messages.environment.mail.ask_smtp_host'),
-            $this->config->get('mail.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'),
-            $this->config->get('mail.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'),
-            $this->config->get('mail.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_ENCRYPTION'] = $this->option('encryption') ?? $this->choice(
+            trans('command/messages.environment.mail.ask_encryption'),
+            ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'],
+            $this->config->get('mail.mailers.smtp.encryption', 'tls')
+        );
     }
 
     /**

app/Console/Commands/InfoCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands;
 
@@ -15,35 +8,16 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class InfoCommand extends Command
 {
-    /**
-     * @var string
-     */
     protected $description = 'Displays the application, database, and email configurations along with the panel version.';
 
-    /**
-     * @var \Illuminate\Contracts\Config\Repository
-     */
-    protected $config;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:info';
 
-    /**
-     * @var \Pterodactyl\Services\Helpers\SoftwareVersionService
-     */
-    protected $versionService;
-
     /**
      * VersionCommand constructor.
      */
-    public function __construct(ConfigRepository $config, SoftwareVersionService $versionService)
+    public function __construct(private ConfigRepository $config, private SoftwareVersionService $softwareVersionService)
     {
         parent::__construct();
-
-        $this->config = $config;
-        $this->versionService = $versionService;
     }
 
     /**
@@ -53,9 +27,9 @@ class InfoCommand extends Command
     {
         $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')],
+            ['Panel Version', $this->softwareVersionService->getCurrentVersion()],
+            ['Latest Version', $this->softwareVersionService->getLatestPanel()],
+            ['Up-to-Date', $this->softwareVersionService->isLatestPanel() ? 'Yes' : $this->formatText('No', 'bg=red')],
             ['Unique Identifier', $this->config->get('pterodactyl.service.author')],
         ], 'compact');
 
@@ -78,33 +52,29 @@ class InfoCommand extends Command
         $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")],
+            ['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.driver')],
-            ['Host', $this->config->get('mail.host')],
-            ['Port', $this->config->get('mail.port')],
-            ['Username', $this->config->get('mail.username')],
+            ['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.encryption')],
+            ['Encryption', $this->config->get('mail.mailers.smtp.encryption')],
         ], 'compact');
     }
 
     /**
      * Format output in a Name: Value manner.
-     *
-     * @param string $value
-     * @param string $opts
-     *
-     * @return string
      */
-    private function formatText($value, $opts = '')
+    private function formatText(string $value, string $opts = ''): string
     {
         return sprintf('<%s>%s</>', $opts, $value);
     }

app/Console/Commands/Location/DeleteLocationCommand.php

@@ -1,56 +1,28 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 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
 {
-    /**
-     * @var \Pterodactyl\Services\Locations\LocationDeletionService
-     */
-    protected $deletionService;
-
-    /**
-     * @var string
-     */
     protected $description = 'Deletes a location from the Panel.';
 
-    /**
-     * @var \Illuminate\Support\Collection
-     */
-    protected $locations;
-
-    /**
-     * @var \Pterodactyl\Contracts\Repository\LocationRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:location:delete {--short= : The short code of the location to delete.}';
 
+    protected Collection $locations;
+
     /**
      * DeleteLocationCommand constructor.
      */
     public function __construct(
-        LocationDeletionService $deletionService,
-        LocationRepositoryInterface $repository
+        private LocationDeletionService $deletionService,
+        private LocationRepositoryInterface $repository
     ) {
         parent::__construct();
-
-        $this->deletionService = $deletionService;
-        $this->repository = $repository;
     }
 
     /**

app/Console/Commands/Location/MakeLocationCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\Location;
 
@@ -14,31 +7,18 @@ use Pterodactyl\Services\Locations\LocationCreationService;
 
 class MakeLocationCommand extends Command
 {
-    /**
-     * @var \Pterodactyl\Services\Locations\LocationCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:location:make
                             {--short= : The shortcode name of this location (ex. us1).}
                             {--long= : A longer description of this location.}';
 
-    /**
-     * @var string
-     */
     protected $description = 'Creates a new location on the system via the CLI.';
 
     /**
      * Create a new command instance.
      */
-    public function __construct(LocationCreationService $creationService)
+    public function __construct(private LocationCreationService $creationService)
     {
         parent::__construct();
-
-        $this->creationService = $creationService;
     }
 
     /**

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -2,30 +2,21 @@
 
 namespace Pterodactyl\Console\Commands\Maintenance;
 
-use SplFileInfo;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 
 class CleanServiceBackupFilesCommand extends Command
 {
     public const BACKUP_THRESHOLD_MINUTES = 5;
 
-    /**
-     * @var string
-     */
     protected $description = 'Clean orphaned .bak files created when modifying services.';
 
-    /**
-     * @var \Illuminate\Contracts\Filesystem\Filesystem
-     */
-    protected $disk;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:maintenance:clean-service-backups';
 
+    protected Filesystem $disk;
+
     /**
      * CleanServiceBackupFilesCommand constructor.
      */
@@ -43,7 +34,7 @@ class CleanServiceBackupFilesCommand extends Command
     {
         $files = $this->disk->files('services/.bak');
 
-        collect($files)->each(function (SplFileInfo $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());

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -3,30 +3,31 @@
 namespace Pterodactyl\Console\Commands\Maintenance;
 
 use Carbon\CarbonImmutable;
-use InvalidArgumentException;
 use Illuminate\Console\Command;
 use Pterodactyl\Repositories\Eloquent\BackupRepository;
 
 class PruneOrphanedBackupsCommand extends Command
 {
-    /**
-     * @var string
-     */
     protected $signature = 'p:maintenance:prune-backups {--prune-age=}';
 
-    /**
-     * @var string
-     */
-    protected $description = 'Marks all backups that have not completed in the last "n" minutes as being failed.';
+    protected $description = 'Marks all backups older than "n" minutes that have not yet completed as being failed.';
 
-    public function handle(BackupRepository $repository)
+    /**
+     * 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 = $repository->getBuilder()
+        $query = $this->backupRepository->getBuilder()
             ->whereNull('completed_at')
             ->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
 
@@ -37,7 +38,7 @@ class PruneOrphanedBackupsCommand extends Command
             return;
         }
 
-        $this->warn("Marking {$count} backups that have not been marked as completed in the last {$since} minutes as failed.");
+        $this->warn("Marking $count uncompleted backups that are older than $since minutes as failed.");
 
         $query->update([
             'is_successful' => false,

app/Console/Commands/Node/MakeNodeCommand.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Node;
+
+use Illuminate\Console\Command;
+use Pterodactyl\Services\Nodes\NodeCreationService;
+
+class MakeNodeCommand extends Command
+{
+    protected $signature = 'p:node:make
+                            {--name= : A name to identify the node.}
+                            {--description= : A description to identify the node.}
+                            {--locationId= : A valid locationId.}
+                            {--fqdn= : The 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.}
+                            {--public= : Should the node be public or private? (public=1 / private=0).}
+                            {--scheme= : Which scheme should be used? (Enable SSL=https / Disable SSL=http).}
+                            {--proxy= : Is the daemon behind a proxy? (Yes=1 / No=0).}
+                            {--maintenance= : Should maintenance mode be enabled? (Enable Maintenance mode=1 / Disable Maintenance mode=0).}
+                            {--maxMemory= : Set the max memory amount.}
+                            {--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).}
+                            {--uploadSize= : Enter the maximum upload filesize.}
+                            {--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 \Pterodactyl\Exceptions\Model\DataValidationException
+     */
+    public function handle()
+    {
+        $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(
+            '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');
+
+        $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 . '.');
+    }
+}

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Node;
+
+use Pterodactyl\Models\Node;
+use Illuminate\Console\Command;
+
+class NodeConfigurationCommand extends Command
+{
+    protected $signature = 'p:node:configuration
+                            {node : The ID or UUID of the node to return the configuration for.}
+                            {--format=yaml : The output format. Options are "yaml" and "json".}';
+
+    protected $description = 'Displays the configuration for the specified node.';
+
+    public function handle(): int
+    {
+        $column = ctype_digit((string) $this->argument('node')) ? 'id' : 'uuid';
+
+        /** @var \Pterodactyl\Models\Node $node */
+        $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
+            $this->error('The selected node does not exist.');
+
+            exit(1);
+        });
+
+        $format = $this->option('format');
+        if (!in_array($format, ['yaml', 'yml', 'json'])) {
+            $this->error('Invalid format specified. Valid options are "yaml" and "json".');
+
+            return 1;
+        }
+
+        if ($format === 'json') {
+            $this->output->write($node->getJsonConfiguration(true));
+        } else {
+            $this->output->write($node->getYamlConfiguration());
+        }
+
+        $this->output->newLine();
+
+        return 0;
+    }
+}

app/Console/Commands/Node/NodeListCommand.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Node;
+
+use Pterodactyl\Models\Node;
+use Illuminate\Console\Command;
+
+class NodeListCommand extends Command
+{
+    protected $signature = 'p:node:list {--format=text : The output format: "text" or "json". }';
+
+    public function handle(): int
+    {
+        $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(),
+            ];
+        });
+
+        if ($this->option('format') === 'json') {
+            $this->output->write($nodes->toJson(JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        } else {
+            $this->table(['ID', 'UUID', 'Name', 'Location', 'Host'], $nodes->toArray());
+        }
+
+        $this->output->newLine();
+
+        return 0;
+    }
+}

app/Console/Commands/Overrides/SeedCommand.php

@@ -13,14 +13,14 @@ class SeedCommand extends BaseSeedCommand
      * Block someone from running this seed command if they have not completed
      * the migration process.
      */
-    public function handle()
+    public function handle(): int
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return;
+            return 1;
         }
 
-        parent::handle();
+        return parent::handle();
     }
 }

app/Console/Commands/Overrides/UpCommand.php

@@ -13,14 +13,14 @@ class UpCommand extends BaseUpCommand
      * Block someone from running this up command if they have not completed
      * the migration process.
      */
-    public function handle()
+    public function handle(): int
     {
         if (!$this->hasCompletedMigrations()) {
             $this->showMigrationWarning();
 
-            return;
+            return 1;
         }
 
-        parent::handle();
+        return parent::handle();
     }
 }

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -3,30 +3,26 @@
 namespace Pterodactyl\Console\Commands\Schedule;
 
 use Exception;
-use Throwable;
 use Illuminate\Console\Command;
 use Pterodactyl\Models\Schedule;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Database\Eloquent\Builder;
 use Pterodactyl\Services\Schedules\ProcessScheduleService;
 
 class ProcessRunnableCommand extends Command
 {
-    /**
-     * @var string
-     */
     protected $signature = 'p:schedule:process';
 
-    /**
-     * @var string
-     */
     protected $description = 'Process schedules in the database and determine which are ready to run.';
 
     /**
      * Handle command execution.
      */
-    public function handle()
+    public function handle(): int
     {
-        $schedules = Schedule::query()->with('tasks')
+        $schedules = Schedule::query()
+            ->with('tasks')
+            ->whereRelation('server', fn (Builder $builder) => $builder->whereNull('status'))
             ->where('is_active', true)
             ->where('is_processing', false)
             ->whereRaw('next_run_at <= NOW()')
@@ -35,7 +31,7 @@ class ProcessRunnableCommand extends Command
         if ($schedules->count() < 1) {
             $this->line('There are no scheduled tasks for servers that need to be run.');
 
-            return;
+            return 0;
         }
 
         $bar = $this->output->createProgressBar(count($schedules));
@@ -47,6 +43,8 @@ class ProcessRunnableCommand extends Command
         }
 
         $this->line('');
+
+        return 0;
     }
 
     /**
@@ -69,10 +67,10 @@ class ProcessRunnableCommand extends Command
                 'schedule' => $schedule->name,
                 'hash' => $schedule->hashid,
             ]));
-        } catch (Throwable | Exception $exception) {
+        } catch (\Throwable|\Exception $exception) {
             Log::error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
+            $this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -4,6 +4,7 @@ namespace Pterodactyl\Console\Commands\Server;
 
 use Pterodactyl\Models\Server;
 use Illuminate\Console\Command;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory as ValidatorFactory;
 use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
@@ -11,31 +12,33 @@ use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
 
 class BulkPowerActionCommand extends Command
 {
-    /**
-     * @var string
-     */
     protected $signature = 'p:server:bulk-power
                             {action : The action to perform (start, stop, restart, kill)}
                             {--servers= : A comma separated list of servers.}
                             {--nodes= : A comma separated list of nodes.}';
 
-    /**
-     * @var string
-     */
     protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
 
+    /**
+     * 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(DaemonPowerRepository $powerRepository, ValidatorFactory $validator)
+    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,
@@ -61,6 +64,7 @@ class BulkPowerActionCommand extends Command
         }
 
         $bar = $this->output->createProgressBar($count);
+        $powerRepository = $this->powerRepository;
         $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
             $bar->clear();
 
@@ -84,10 +88,8 @@ class BulkPowerActionCommand extends Command
 
     /**
      * Returns the query builder instance that will return the servers that should be affected.
-     *
-     * @return \Illuminate\Database\Eloquent\Builder
      */
-    protected function getQueryBuilder(array $servers, array $nodes)
+    protected function getQueryBuilder(array $servers, array $nodes): Builder
     {
         $instance = Server::query()->whereNull('status');
 

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());
+    }
+}

app/Console/Commands/UpgradeCommand.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Console\Commands;
 
-use Closure;
 use Illuminate\Console\Command;
 use Pterodactyl\Console\Kernel;
 use Symfony\Component\Process\Process;
@@ -12,7 +11,6 @@ class UpgradeCommand extends Command
 {
     protected const DEFAULT_URL = 'https://github.com/pterodactyl/panel/releases/%s/panel.tar.gz';
 
-    /** @var string */
     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.}
@@ -20,7 +18,6 @@ class UpgradeCommand extends Command
         {--release= : A specific Pterodactyl version to download from GitHub. Leave blank to use latest.}
         {--skip-download : If set no archive will be downloaded.}';
 
-    /** @var string */
     protected $description = 'Downloads a new archive for Pterodactyl from GitHub and then executes the normal upgrade commands.';
 
     /**
@@ -87,11 +84,12 @@ class UpgradeCommand extends Command
 
             if (!$this->confirm('Are you sure you want to run the upgrade process for your Panel?')) {
                 $this->warn('Upgrade process terminated by user.');
+
                 return;
             }
         }
 
-        ini_set('output_buffering', 0);
+        ini_set('output_buffering', '0');
         $bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
         $bar->start();
 
@@ -178,7 +176,7 @@ class UpgradeCommand extends Command
         $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)
+    protected function withProgress(ProgressBar $bar, \Closure $callback)
     {
         $bar->clear();
         $callback();

app/Console/Commands/User/DeleteUserCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\User;
 
@@ -16,42 +9,19 @@ use Pterodactyl\Services\Users\UserDeletionService;
 
 class DeleteUserCommand extends Command
 {
-    /**
-     * @var \Pterodactyl\Services\Users\UserDeletionService
-     */
-    protected $deletionService;
-
-    /**
-     * @var string
-     */
     protected $description = 'Deletes a user from the Panel if no servers are attached to their account.';
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:user:delete {--user=}';
 
     /**
      * DeleteUserCommand constructor.
      */
-    public function __construct(UserDeletionService $deletionService)
+    public function __construct(private UserDeletionService $deletionService)
     {
         parent::__construct();
-
-        $this->deletionService = $deletionService;
     }
 
-    /**
-     * @return bool
-     *
-     * @throws \Pterodactyl\Exceptions\DisplayException
-     */
-    public function handle()
+    public function handle(): int
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
         Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
@@ -68,16 +38,16 @@ class DeleteUserCommand extends Command
                 return $this->handle();
             }
 
-            return false;
+            return 1;
         }
 
         if ($this->input->isInteractive()) {
             $tableValues = [];
             foreach ($results as $user) {
-                $tableValues[] = [$user->id, $user->email, $user->name];
+                $tableValues[] = [$user->id, $user->email, $user->username];
             }
 
-            $this->table(['User ID', 'Email', 'Name'], $tableValues);
+            $this->table(['User ID', 'Email', 'Username'], $tableValues);
             if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                 return $this->handle();
             }
@@ -85,7 +55,7 @@ class DeleteUserCommand extends Command
             if (count($results) > 1) {
                 $this->error(trans('command/messages.user.multiple_found'));
 
-                return false;
+                return 1;
             }
 
             $deleteUser = $results->first();
@@ -95,5 +65,7 @@ class DeleteUserCommand extends Command
             $this->deletionService->handle($deleteUser);
             $this->info(trans('command/messages.user.deleted'));
         }
+
+        return 0;
     }
 }

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\User;
 
@@ -14,29 +7,16 @@ use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class DisableTwoFactorCommand extends Command
 {
-    /**
-     * @var string
-     */
     protected $description = 'Disable two-factor authentication for a specific user in the Panel.';
 
-    /**
-     * @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
-     */
-    protected $repository;
-
-    /**
-     * @var string
-     */
     protected $signature = 'p:user:disable2fa {--email= : The email of the user to disable 2-Factor for.}';
 
     /**
      * DisableTwoFactorCommand constructor.
      */
-    public function __construct(UserRepositoryInterface $repository)
+    public function __construct(private UserRepositoryInterface $repository)
     {
         parent::__construct();
-
-        $this->repository = $repository;
     }
 
     /**

app/Console/Commands/User/MakeUserCommand.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Console\Commands\User;
 
@@ -14,29 +7,16 @@ use Pterodactyl\Services\Users\UserCreationService;
 
 class MakeUserCommand extends Command
 {
-    /**
-     * @var \Pterodactyl\Services\Users\UserCreationService
-     */
-    protected $creationService;
-
-    /**
-     * @var string
-     */
     protected $description = 'Creates a user on the system via the CLI.';
 
-    /**
-     * @var string
-     */
     protected $signature = 'p:user:make {--email=} {--username=} {--name-first=} {--name-last=} {--password=} {--admin=} {--no-password}';
 
     /**
      * MakeUserCommand constructor.
      */
-    public function __construct(UserCreationService $creationService)
+    public function __construct(private UserCreationService $creationService)
     {
         parent::__construct();
-
-        $this->creationService = $creationService;
     }
 
     /**
@@ -50,8 +30,6 @@ class MakeUserCommand extends Command
         $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'));
@@ -59,12 +37,11 @@ class MakeUserCommand extends Command
             $password = $this->secret(trans('command/messages.user.ask_password'));
         }
 
-        $user = $this->creationService->handle(compact('email', 'username', 'name_first', 'name_last', 'password', 'root_admin'));
+        $user = $this->creationService->handle(compact('email', 'username', 'password', 'root_admin'));
         $this->table(['Field', 'Value'], [
             ['UUID', $user->uuid],
             ['Email', $user->email],
             ['Username', $user->username],
-            ['Name', $user->name],
             ['Admin', $user->root_admin ? 'Yes' : 'No'],
         ]);
     }

app/Console/Kernel.php

@@ -2,15 +2,23 @@
 
 namespace Pterodactyl\Console;
 
+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 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
 {
     /**
      * Register the commands for the application.
      */
-    protected function commands()
+    protected function commands(): void
     {
         $this->load(__DIR__ . '/Commands');
     }
@@ -18,17 +26,51 @@ class Kernel extends ConsoleKernel
     /**
      * Define the application's command schedule.
      */
-    protected function schedule(Schedule $schedule)
+    protected function schedule(Schedule $schedule): void
     {
+        // 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('p:schedule:process')->everyMinute()->withoutOverlapping();
+        $schedule->command(ProcessRunnableCommand::class)->everyMinute()->withoutOverlapping();
+        $schedule->command(CleanServiceBackupFilesCommand::class)->daily();
 
         if (config('backups.prune_age')) {
             // Every 30 minutes, run the backup pruning command so that any abandoned backups can be deleted.
-            $schedule->command('p:maintenance:prune-backups')->everyThirtyMinutes();
+            $schedule->command(PruneOrphanedBackupsCommand::class)->everyThirtyMinutes();
         }
 
-        // Every day cleanup any internal backups of service files.
-        $schedule->command('p:maintenance:clean-service-backups')->daily();
+        if (config('activity.prune_days')) {
+            $schedule->command(PruneCommand::class, ['--model' => [ActivityLog::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);
+        }
+
+        // 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");
     }
 }

app/Console/RequiresDatabaseMigrations.php

@@ -33,7 +33,7 @@ trait RequiresDatabaseMigrations
      * them to properly run the migrations rather than ignoring all of the other previous
      * errors...
      */
-    protected function showMigrationWarning()
+    protected function showMigrationWarning(): void
     {
         $this->getOutput()->writeln('<options=bold>
 | @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |

app/Contracts/Criteria/CriteriaInterface.php

@@ -1,24 +1,14 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Criteria;
 
+use Illuminate\Database\Eloquent\Model;
 use Pterodactyl\Repositories\Repository;
 
 interface CriteriaInterface
 {
     /**
      * Apply selected criteria to a repository call.
-     *
-     * @param \Illuminate\Database\Eloquent\Model $model
-     *
-     * @return mixed
      */
-    public function apply($model, Repository $repository);
+    public function apply(Model $model, Repository $repository): mixed;
 }

app/Contracts/Extensions/HashidsInterface.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Extensions;
 
@@ -16,12 +9,7 @@ interface HashidsInterface extends VendorHashidsInterface
     /**
      * Decode an encoded hashid and return the first result.
      *
-     * @param string $encoded
-     * @param null $default
-     *
-     * @return mixed
-     *
      * @throws \InvalidArgumentException
      */
-    public function decodeFirst($encoded, $default = null);
+    public function decodeFirst(string $encoded, string $default = null): mixed;
 }

app/Contracts/Http/ClientPermissionsRequest.php

@@ -6,7 +6,7 @@ interface ClientPermissionsRequest
 {
     /**
      * Returns the permissions string indicating which permission should be used to
-     * validate that the authenticated user has permission to perform this action aganist
+     * validate that the authenticated user has permission to perform this action against
      * the given resource (server).
      */
     public function permission(): string;

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -2,18 +2,18 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Pterodactyl\Models\Allocation;
+
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all of the allocations that exist for a node that are not currently
+     * 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.
-     *
-     * @return \Pterodactyl\Models\Allocation|null
      */
-    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false);
+    public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false): ?Allocation;
 }

app/Contracts/Repository/ApiKeyRepositoryInterface.php

@@ -8,12 +8,12 @@ use Illuminate\Support\Collection;
 interface ApiKeyRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Get all of the account API keys that exist for a specific user.
+     * Get all the account API keys that exist for a specific user.
      */
     public function getAccountKeys(User $user): Collection;
 
     /**
-     * Get all of the application API keys that exist for a specific user.
+     * Get all the application API keys that exist for a specific user.
      */
     public function getApplicationKeys(User $user): Collection;
 

app/Contracts/Repository/ApiPermissionRepositoryInterface.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -2,7 +2,6 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
-use Pterodactyl\Models\Database;
 use Illuminate\Support\Collection;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
@@ -12,10 +11,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Set the connection name to execute statements against.
-     *
-     * @return $this
      */
-    public function setConnection(string $connection);
+    public function setConnection(string $connection): self;
 
     /**
      * Return the connection to execute statements against.
@@ -23,12 +20,12 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
     public function getConnection(): string;
 
     /**
-     * Return all of the databases belonging to a server.
+     * Return all the databases belonging to a server.
      */
     public function getDatabasesForServer(int $server): Collection;
 
     /**
-     * Return all of the databases for a given host with the server relationship loaded.
+     * Return all the databases for a given host with the server relationship loaded.
      */
     public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
 
@@ -39,10 +36,8 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Create a new database user on a given connection.
-     *
-     * @param $max_connections
      */
-    public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
+    public function createUser(string $username, string $remote, string $password, ?int $max_connections): bool;
 
     /**
      * Give a specific user access to a given database.
@@ -61,8 +56,6 @@ interface DatabaseRepositoryInterface extends RepositoryInterface
 
     /**
      * Drop a given user on a specific connection.
-     *
-     * @return mixed
      */
     public function dropUser(string $username, string $remote): bool;
 }

app/Contracts/Repository/EggRepositoryInterface.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 
@@ -28,13 +21,11 @@ interface EggRepositoryInterface extends RepositoryInterface
 
     /**
      * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
-     *
-     * @param int|string $value
      */
-    public function getWithCopyAttributes($value, string $column = 'id'): Egg;
+    public function getWithCopyAttributes(int|string $value, string $column = 'id'): Egg;
 
     /**
-     * Return all of the data needed to export a service.
+     * Return all the data needed to export a service.
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Contracts/Repository/EggVariableRepositoryInterface.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 

app/Contracts/Repository/LocationRepositoryInterface.php

@@ -13,14 +13,12 @@ interface LocationRepositoryInterface extends RepositoryInterface
     public function getAllWithDetails(): Collection;
 
     /**
-     * Return all of the available locations with the nodes as a relationship.
+     * Return all the available locations with the nodes as a relationship.
      */
     public function getAllWithNodes(): Collection;
 
     /**
-     * Return all of the nodes and their respective count of servers for a location.
-     *
-     * @return mixed
+     * Return all the nodes and their respective count of servers for a location.
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
@@ -29,8 +27,6 @@ interface LocationRepositoryInterface extends RepositoryInterface
     /**
      * Return a location and the count of nodes in that location.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithNodeCount(int $id): Location;

app/Contracts/Repository/NestRepositoryInterface.php

@@ -1,37 +1,25 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 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.
      *
-     * @param int $id
-     *
-     * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithEggs(int $id = null);
+    public function getWithEggs(int $id = null): Collection|Nest;
 
     /**
      * Return a nest or all nests and the count of eggs and servers for that nest.
      *
-     * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function getWithCounts(int $id = null);
+    public function getWithCounts(int $id = null): Collection|Nest;
 
     /**
      * Return a nest along with its associated eggs and the servers relation on those eggs.

app/Contracts/Repository/PermissionRepositoryInterface.php

@@ -1,11 +1,4 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Contracts\Repository;
 

app/Contracts/Repository/RepositoryInterface.php

@@ -3,87 +3,67 @@
 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.
-     *
-     * @return string|\Closure|object
      */
-    public function model();
+    public function model(): string;
 
     /**
      * Return the model being used for this repository instance.
-     *
-     * @return mixed
      */
-    public function getModel();
+    public function getModel(): Model;
 
     /**
      * Returns an instance of a query builder.
-     *
-     * @return mixed
      */
-    public function getBuilder();
+    public function getBuilder(): Builder;
 
     /**
      * Returns the columns to be selected or returned by the query.
-     *
-     * @return mixed
      */
-    public function getColumns();
+    public function getColumns(): array;
 
     /**
      * An array of columns to filter the response by.
-     *
-     * @param array|string $columns
-     *
-     * @return $this
      */
-    public function setColumns($columns = ['*']);
+    public function setColumns(array|string $columns = ['*']): self;
 
     /**
      * Stop repository update functions from returning a fresh
      * model when changes are committed.
-     *
-     * @return $this
      */
-    public function withoutFreshModel();
+    public function withoutFreshModel(): self;
 
     /**
      * Return a fresh model with a repository updates a model.
-     *
-     * @return $this
      */
-    public function withFreshModel();
+    public function withFreshModel(): self;
 
     /**
-     * Set whether or not the repository should return a fresh model
+     * Set whether the repository should return a fresh model
      * when changes are committed.
-     *
-     * @return $this
      */
-    public function setFreshModel(bool $fresh = true);
+    public function setFreshModel(bool $fresh = true): self;
 
     /**
      * Create a new model instance and persist it to the database.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function create(array $fields, bool $validate = true, bool $force = false);
+    public function create(array $fields, bool $validate = true, bool $force = false): mixed;
 
     /**
      * Find a model that has the specific ID passed.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function find(int $id);
+    public function find(int $id): mixed;
 
     /**
      * Find a model matching an array of where clauses.
@@ -93,11 +73,9 @@ interface RepositoryInterface
     /**
      * Find and return the first matching instance for the given fields.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function findFirstWhere(array $fields);
+    public function findFirstWhere(array $fields): mixed;
 
     /**
      * Return a count of records matching the passed arguments.
@@ -117,14 +95,10 @@ interface RepositoryInterface
     /**
      * Update a given ID with the passed array of fields.
      *
-     * @param int $id
-     *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
-    public function update($id, array $fields, bool $validate = true, bool $force = false);
+    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.
@@ -135,11 +109,9 @@ interface RepositoryInterface
     /**
      * Update a record if it exists in the database, otherwise create it.
      *
-     * @return mixed
-     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      */
-    public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false);
+    public function updateOrCreate(array $where, array $fields, bool $validate = true, bool $force = false): mixed;
 
     /**
      * Return all records associated with the given model.

app/Contracts/Repository/ScheduleRepositoryInterface.php

@@ -8,12 +8,12 @@ use Illuminate\Support\Collection;
 interface ScheduleRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all of the schedules for a given server.
+     * Return all the schedules for a given server.
      */
     public function findServerSchedules(int $server): Collection;
 
     /**
-     * Return a schedule model with all of the associated tasks as a relationship.
+     * Return a schedule model with all the associated tasks as a relationship.
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -67,7 +67,7 @@ interface ServerRepositoryInterface extends RepositoryInterface
     public function isUniqueUuidCombo(string $uuid, string $short): bool;
 
     /**
-     * Returns all of the servers that exist for a given node in a paginated response.
+     * Returns all the servers that exist for a given node in a paginated response.
      */
     public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
 }

app/Contracts/Repository/SessionRepositoryInterface.php

@@ -7,14 +7,12 @@ use Illuminate\Support\Collection;
 interface SessionRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return all of the active sessions for a user.
+     * Return all the active sessions for a user.
      */
     public function getUserSessions(int $user): Collection;
 
     /**
      * Delete a session for a given user.
-     *
-     * @return int|null
      */
-    public function deleteUserSession(int $user, string $session);
+    public function deleteUserSession(int $user, string $session): ?int;
 }

app/Contracts/Repository/SettingsRepositoryInterface.php

@@ -14,12 +14,8 @@ interface SettingsRepositoryInterface extends RepositoryInterface
 
     /**
      * Retrieve a persistent setting from the database.
-     *
-     * @param mixed $default
-     *
-     * @return mixed
      */
-    public function get(string $key, $default);
+    public function get(string $key, mixed $default): mixed;
 
     /**
      * Remove a key from the database cache.

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -15,8 +15,6 @@ interface TaskRepositoryInterface extends RepositoryInterface
 
     /**
      * Returns the next task in a schedule.
-     *
-     * @return \Pterodactyl\Models\Task|null
      */
-    public function getNextTask(int $schedule, int $index);
+    public function getNextTask(int $schedule, int $index): ?Task;
 }

app/Events/ActivityLogged.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace Pterodactyl\Events;
+
+use Illuminate\Support\Str;
+use Pterodactyl\Models\ActivityLog;
+use Illuminate\Database\Eloquent\Model;
+
+class ActivityLogged extends Event
+{
+    public function __construct(public ActivityLog $model)
+    {
+    }
+
+    public function is(string $event): bool
+    {
+        return $this->model->event === $event;
+    }
+
+    public function actor(): ?Model
+    {
+        return $this->isSystem() ? null : $this->model->actor;
+    }
+
+    public function isServerEvent(): bool
+    {
+        return Str::startsWith($this->model->event, 'server:');
+    }
+
+    public function isSystem(): bool
+    {
+        return is_null($this->model->actor_id);
+    }
+}

app/Events/Auth/DirectLogin.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Events\Auth;
+
+use Pterodactyl\Models\User;
+use Pterodactyl\Events\Event;
+
+class DirectLogin extends Event
+{
+    public function __construct(public User $user, public bool $remember)
+    {
+    }
+}

app/Events/Auth/FailedCaptcha.php

@@ -1,43 +1,18 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Auth;
 
+use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class FailedCaptcha
+class FailedCaptcha extends Event
 {
     use SerializesModels;
 
-    /**
-     * The IP that the request originated from.
-     *
-     * @var string
-     */
-    public $ip;
-
-    /**
-     * The domain that was used to try to verify the request with recaptcha api.
-     *
-     * @var string
-     */
-    public $domain;
-
     /**
      * Create a new event instance.
-     *
-     * @param string $ip
-     * @param string $domain
      */
-    public function __construct($ip, $domain)
+    public function __construct(public string $ip, public string $domain)
     {
-        $this->ip = $ip;
-        $this->domain = $domain;
     }
 }

app/Events/Auth/FailedPasswordReset.php

@@ -1,43 +1,18 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Auth;
 
+use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class FailedPasswordReset
+class FailedPasswordReset extends Event
 {
     use SerializesModels;
 
-    /**
-     * The IP that the request originated from.
-     *
-     * @var string
-     */
-    public $ip;
-
-    /**
-     * The email address that was used when the reset request failed.
-     *
-     * @var string
-     */
-    public $email;
-
     /**
      * Create a new event instance.
-     *
-     * @param string $ip
-     * @param string $email
      */
-    public function __construct($ip, $email)
+    public function __construct(public string $ip, public string $email)
     {
-        $this->ip = $ip;
-        $this->email = $email;
     }
 }

app/Events/Auth/ProvidedAuthenticationToken.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pterodactyl\Events\Auth;
+
+use Pterodactyl\Models\User;
+use Pterodactyl\Events\Event;
+
+class ProvidedAuthenticationToken extends Event
+{
+    public function __construct(public User $user, public bool $recovery = false)
+    {
+    }
+}

app/Events/Server/Created.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Created
+class Created extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Creating.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Creating
+class Creating extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Deleted.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Deleted
+class Deleted extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Deleting.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Deleting
+class Deleting extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Installed.php

@@ -10,18 +10,10 @@ class Installed extends Event
 {
     use SerializesModels;
 
-    /**
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
-     *
-     * @var \Pterodactyl\Models\Server
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Saved.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Saved
+class Saved extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Saving.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Saving
+class Saving extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Updated.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Updated
+class Updated extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Server/Updating.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Server;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Server;
 use Illuminate\Queue\SerializesModels;
 
-class Updating
+class Updating extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Server
-     */
-    public $server;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Server $server)
+    public function __construct(public Server $server)
     {
-        $this->server = $server;
     }
 }

app/Events/Subuser/Created.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Subuser;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Created
+class Created extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Subuser
-     */
-    public $subuser;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Subuser $subuser)
+    public function __construct(public Subuser $subuser)
     {
-        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Creating.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Subuser;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Creating
+class Creating extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Subuser
-     */
-    public $subuser;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Subuser $subuser)
+    public function __construct(public Subuser $subuser)
     {
-        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Deleted.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Subuser;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Deleted
+class Deleted extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Subuser
-     */
-    public $subuser;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Subuser $subuser)
+    public function __construct(public Subuser $subuser)
     {
-        $this->subuser = $subuser;
     }
 }

app/Events/Subuser/Deleting.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\Subuser;
 
+use Pterodactyl\Events\Event;
 use Pterodactyl\Models\Subuser;
 use Illuminate\Queue\SerializesModels;
 
-class Deleting
+class Deleting extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\Subuser
-     */
-    public $subuser;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Subuser $subuser)
+    public function __construct(public Subuser $subuser)
     {
-        $this->subuser = $subuser;
     }
 }

app/Events/User/Created.php

@@ -1,33 +1,19 @@
 <?php
-/**
- * Pterodactyl - Panel
- * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
- *
- * This software is licensed under the terms of the MIT license.
- * https://opensource.org/licenses/MIT
- */
 
 namespace Pterodactyl\Events\User;
 
 use Pterodactyl\Models\User;
+use Pterodactyl\Events\Event;
 use Illuminate\Queue\SerializesModels;
 
-class Created
+class Created extends Event
 {
     use SerializesModels;
 
-    /**
-     * The Eloquent model of the server.
-     *
-     * @var \Pterodactyl\Models\User
-     */
-    public $user;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(User $user)
+    public function __construct(public User $user)
     {
-        $this->user = $user;
     }
 }