Hiding buttons and adding a message

.babel-plugin-macrosrc.js

@@ -2,6 +2,7 @@ module.exports = {
     twin: {
         preset: 'styled-components',
         autoCssProp: true,
+        config: './tailwind.config.js',
     },
     styledComponents: {
         pure: true,

.env.example

@@ -8,7 +8,6 @@ APP_DELETE_MINUTES=10
 APP_ENVIRONMENT_ONLY=true
 LOG_CHANNEL=daily
 APP_LOCALE=en
-APP_URL=http://panel.example.com
 
 DB_HOST=127.0.0.1
 DB_PORT=3306
@@ -20,18 +19,12 @@ HASHIDS_SALT=
 HASHIDS_LENGTH=8
 
 MAIL_DRIVER=smtp
-MAIL_HOST=smtp.example.com
-MAIL_PORT=25
+MAIL_HOST=mailtrap.io
+MAIL_PORT=2525
 MAIL_USERNAME=
 MAIL_PASSWORD=
 MAIL_ENCRYPTION=tls
 MAIL_FROM=no-reply@example.com
-MAILGUN_ENDPOINT=api.mailgun.net
-# 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.example.com
 
 QUEUE_HIGH=high
 QUEUE_STANDARD=standard

.eslintignore

@@ -1,4 +0,0 @@
-public
-node_modules
-resources/views
-webpack.config.js

.github/ISSUE_TEMPLATE/---bug-report.md

@@ -0,0 +1,35 @@
+---
+name: "\U0001F41B Bug Report"
+about: For reporting code or design bugs with the software. DO NOT REPORT APACHE/NGINX/PHP CONFIGURATION ISSUES.
+
+---
+
+DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER.
+
+For assistance installating this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
+
+You MUST complete all of the below information when reporting a bug, failure to do so will result in closure of your issue. PLEASE stop spamming our tracker with "bugs" that are not related to this project.
+
+**STOP: READ FIRST, AND THEN DELETE THE ABOVE LINES**
+
+**Background (please complete the following information):**
+* Panel or Daemon: 
+* Version of Panel/Daemon: 
+* Server's OS: 
+* Your Computer's OS & Browser: 
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+Please provide additional information too, depending on what you have issues with:
+Panel: `php -v` (the php version in use).
+Daemon: `uname -a` and `docker info` (your kernel version and information regarding docker)
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen. If applicable, add screenshots or a recording to help explain your problem.

.github/ISSUE_TEMPLATE/---feature-request.md

@@ -0,0 +1,17 @@
+---
+name: "\U0001F680 Feature Request"
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/--installation-help.md

@@ -0,0 +1,14 @@
+---
+name: "⛔ Installation Help"
+about: 'Visit our Discord for installation help: https://pterodactyl.io/discord'
+
+---
+
+We use GitHub issues only to discuss about Pterodactyl bugs and new features. For
+this kind of questions about using Pterodactyl, please visit our Discord for assistance: https://pterodactyl.io/discord
+
+DO NOT REPORT ISSUES CONFIGURING: SSL, PHP, APACHE, NGINX, YOUR MACHINE, SSH, SFTP, ETC. ON THIS GITHUB TRACKER.
+
+For assistance installating this software, as well as debugging issues with dependencies, please use our discord server: https://discord.gg/pterodactyl
+
+PLEASE stop spamming our tracker with "bugs" that are not related to this project.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -1,69 +0,0 @@
-name: Bug Report
-description: Something isn't working quite right in the software.
-labels: [not confirmed]
-body:
-- type: markdown
-  attributes:
-    value: |
-      Bug reports should only be used for reporting issues with how the software works. For assistance installing this software, as well as debugging issues with dependencies, please use our [Discord server](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
-    description: Please provide a clear & concise description of the issue.
-  validations:
-    required: true
-
-- type: textarea      
-  attributes:
-    label: Expected Behavior
-    description: Please describe what you expected to happen.
-  validations:
-    required: true
-
-- 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.
-  validations:
-    required: true
-
-- type: input
-  id: panel-version
-  attributes:
-    label: Panel Version
-    description: Version number of your Panel (latest is not a version)
-    placeholder: 1.4.0
-  validations:
-    required: true
-
-- type: input
-  id: wings-version
-  attributes:
-    label: Wings Version
-    description: Version number of your Wings (latest is not a version)
-    placeholder: 1.4.2
-  validations:
-    required: true
-
-- type: textarea
-  id: panel-logs
-  attributes:
-    label: Error Logs
-    description: |
-      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"
-    render: bash
-  validations:
-    required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Installation Help
-    url: https://discord.gg/pterodactyl
-    about: Please visit our Discord for help with your installation.
-  - name: General Question
-    url: https://discord.gg/pterodactyl
-    about: Please visit our Discord for general questions about Pterodactyl.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -1,32 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or improvement for the software.
-labels: [feature request]
-body:
-- type: checkboxes
-  attributes:
-    label: Is there an existing feature request for this?
-    description: Please [search here](https://github.com/pterodactyl/panel/issues?q=is%3Aissue) to see if someone else has already suggested this.
-    options:
-    - label: I have searched the existing issues before opening this feature request.
-      required: true
-
-- type: textarea
-  attributes:
-    label: Describe the feature you would like to see.
-    description: "A clear & concise description of the feature you'd like to have added, and what issues it would solve."
-  validations:
-    required: true
-
-- type: textarea
-  attributes:
-    label: Describe the solution you'd like.
-    description: "You must explain how you'd like to see this feature implemented. Technical implementation details are not necessary, rather an idea of how you'd like to see this feature used."
-  validations:
-    required: true
-
-- type: textarea
-  attributes:
-    label: Additional context to this request.
-    description: "Add any other context or screenshots about the feature request."
-  validations:
-    required: false

.github/workflows/docker.yml

@@ -1,49 +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
-          platforms: linux/amd64,linux/arm64
-          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' }}
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}

.github/workflows/release.yml

@@ -1,8 +1,10 @@
-name: Create Release
+name: "Release"
+
 on:
   push:
     tags:
       - 'v*'
+
 jobs:
   release:
     runs-on: ubuntu-20.04
@@ -34,7 +36,7 @@ jobs:
       - 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
+          tar -czf panel.tar.gz * .env.example
 
       - name: Extract changelog
         id: extract_changelog

.github/workflows/tests.yml

@@ -1,59 +1,67 @@
-name: Run Tests
+name: tests
 on:
   push:
-    branches:
-      - 'develop'
-      - 'v2'
+    branch-ignore:
+      - 'master'
+      - 'release/**'
   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' ]
+  integration_tests:
+    if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
+    runs-on: ubuntu-latest
     services:
-      database:
-        image: ${{ matrix.database }}
+      mysql:
+        image: mysql:5.7
         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 }})"
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.3, 7.4]
+    name: PHP ${{ matrix.php }}
     steps:
-      - uses: actions/checkout@v2
+      - name: checkout
+        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
+      - name: cache dependencies
+        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
+          restore-keys: |
+            ${{ runner.os }}-cache-${{ matrix.php }}-
+      - name: setup
+        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
+          extensions: cli, openssl, gd, mysql, pdo, mbstring, tokenizer, bcmath, xml, curl, zip
+          tools: composer:v1
           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
+      - name: configure
+        run: cp .env.ci .env
+      - name: install dependencies
+        run: composer install --prefer-dist --no-interaction --no-progress
+      - name: run cs-fixer
+        run: vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff
         continue-on-error: true
       - name: execute unit tests
-        run: vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit
+        run: vendor/bin/phpunit --bootstrap bootstrap/app.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
+        if: ${{ always() }}
         env:
-          TESTING_DB_PORT: ${{ job.services.database.ports[3306] }}
+          TESTING_DB_PORT: ${{ job.services.mysql.ports[3306] }}
           TESTING_DB_USERNAME: root

.gitignore

@@ -1,9 +1,6 @@
 /vendor
 *.DS_Store*
-!.env.ci
-!.env.dusk
-!.env.example
-.env*
+.env
 .vagrant/*
 .vscode/*
 storage/framework/*
@@ -13,10 +10,8 @@ storage/framework/*
 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

.php-cs-fixer.dist.php

@@ -1,52 +0,0 @@
-<?php
-
-use PhpCsFixer\Config;
-use PhpCsFixer\Finder;
-
-$finder = (new Finder())
-    ->in(__DIR__)
-    ->exclude([
-        'vendor',
-        'node_modules',
-        'storage',
-        'bootstrap/cache',
-    ])
-    ->notName(['_ide_helper*']);
-
-return (new Config())
-    ->setRiskyAllowed(true)
-    ->setFinder($finder)
-    ->setRules([
-        '@Symfony' => true,
-        '@PSR1' => true,
-        '@PSR2' => true,
-        '@PSR12' => true,
-        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
-        'combine_consecutive_unsets' => true,
-        'concat_space' => ['spacing' => 'one'],
-        'heredoc_to_nowdoc' => true,
-        'no_alias_functions' => true,
-        'no_unreachable_default_argument_value' => true,
-        'no_useless_return' => true,
-        'ordered_imports' => [
-            'sortAlgorithm' => 'length',
-        ],
-        'phpdoc_align' => [
-            'align' => 'left',
-            'tags' => [
-                'param',
-                'property',
-                'return',
-                'throws',
-                'type',
-                'var',
-            ],
-        ],
-        'random_api_migration' => true,
-        'ternary_to_null_coalescing' => true,
-        'yoda_style' => [
-            'equal' => false,
-            'identical' => false,
-            'less_and_greater' => false,
-        ],
-    ]);

.php_cs

@@ -0,0 +1,58 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in([
+        'app',
+        'bootstrap',
+        'config',
+        'database',
+        'resources/lang',
+        'routes',
+        'tests',
+    ]);
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@PSR1' => true,
+        '@PSR2' => true,
+        'align_multiline_comment' => ['comment_type' => 'phpdocs_like'],
+        'array_syntax' => ['syntax' => 'short'],
+        'blank_line_before_return' => true,
+        'blank_line_before_statement' => false,
+        'combine_consecutive_unsets' => true,
+        'concat_space' => ['spacing' => 'one'],
+        'declare_equal_normalize' => ['space' => 'single'],
+        'heredoc_to_nowdoc' => true,
+        'increment_style' => ['style' => 'post'],
+        'linebreak_after_opening_tag' => true,
+        'method_argument_space' => [
+            'ensure_fully_multiline' => false,
+            'keep_multiple_spaces_after_comma' => false,
+        ],
+        'new_with_braces' => false,
+        'no_alias_functions' => true,
+        'no_multiline_whitespace_before_semicolons' => true,
+        'no_superfluous_phpdoc_tags' => false,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_return' => true,
+        'not_operator_with_successor_space' => true,
+        'ordered_imports' => [
+            'sortAlgorithm' => 'length',
+        ],
+        'phpdoc_align' => false,
+        'phpdoc_separation' => false,
+        'protected_to_private' => false,
+        'psr0' => ['dir' => 'app'],
+        'psr4' => true,
+        'random_api_migration' => true,
+        'single_line_throw' => false,
+        'single_trait_insert_per_statement' => false,
+        'standardize_not_equals' => true,
+        'ternary_to_null_coalescing' => true,
+        'yoda_style' => [
+            'equal' => false,
+            'identical' => false,
+            'less_and_greater' => false,
+        ],
+    ])->setRiskyAllowed(true)->setFinder($finder);

.sami.php

@@ -0,0 +1,16 @@
+<?php
+
+use Sami\Sami;
+use Symfony\Component\Finder\Finder;
+
+$iterator = Finder::create()
+    ->files()
+    ->name('*.php')
+    ->in($dir = __DIR__ . '/app');
+
+return new Sami($iterator, array(
+    'title'                => 'Pterodactyl',
+    'build_dir'            => __DIR__ . '/.sami/build',
+    'cache_dir'            => __DIR__ . '/.sami/cache',
+    'default_opened_level' => 2,
+));

.styleci.yml

@@ -0,0 +1,7 @@
+preset: laravel
+risky: false
+disabled:
+  - concat_without_spaces
+enabled:
+  - concat_with_spaces
+  - no_unused_imports

.travis.yml

@@ -0,0 +1,36 @@
+language: php
+dist: trusty
+git:
+  depth: 3
+  quiet: true
+matrix:
+  fast_finish: true
+  allow_failures:
+    - env: TEST_SUITE=Coverage
+env:
+  matrix:
+    - TEST_SUITE=Unit
+    - TEST_SUITE=Coverage
+    - TEST_SUITE=Integration
+php:
+  - 7.4
+sudo: false
+cache:
+  directories:
+    - $HOME/.composer/cache
+services:
+  - mysql
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS travis;'
+before_script:
+  - echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
+  - cp .env.travis .env
+  - travis_retry composer install --no-interaction --prefer-dist --no-suggest
+script:
+  - if [ "$TEST_SUITE" = "Unit" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php tests/Unit; fi;
+  - if [ "$TEST_SUITE" = "Coverage" ]; then vendor/bin/phpunit --bootstrap vendor/autoload.php --coverage-clover coverage.xml tests/Unit; fi;
+  - if [ "$TEST_SUITE" = "Integration" ]; then vendor/bin/phpunit tests/Integration; fi;
+notifications:
+  email: false
+after_success:
+  - bash <(curl -s https://codecov.io/bash)

BUILDING.md

@@ -1,13 +1,10 @@
 # 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.
+Pterodactyl is now powered by Vuejs and Tailwindcss and uses 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.
+However, if you are interested in running custom themes or making modifications to the Vue files you'll need a build
+system in place to generate these compiled assets. To get your environment setup, you'll first need to install at least Nodejs
+`8`, and it is _highly_ recommended that you also install [Yarn](https://yarnpkg.com) to manage your `node_modules`.
 
 ### Install Dependencies
 ```bash
@@ -15,19 +12,17 @@ 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.
+simple as running the command below to generate assets while you're developing.
 
 ```bash
-# Build the compiled set of assets for development.
+# build the compiled 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.
+# build the assets automatically when files are modified
 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
@@ -42,22 +37,21 @@ is the `--host` flag, which is required and should point to the machine where th
 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.
+#### Vagrant
+If you want to use HMR with our Vagrant image, you can use `yarn run v:serve` as a shortcut for the correct parameters.
+In order to have proper file change detection you can use the [`vagrant-notify-forwarder`](https://github.com/mhallin/vagrant-notify-forwarder) to notify file events from the host to the VM.
+```sh
+vagrant plugin install vagrant-notify-forwarder
+vagrant reload
+```
 
 ### 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:
+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.
+This will generate a production ready `bundle.js` and `bundle.css` as well as a `manifest.json` and store them in
+the `/public/assets` directory where they can then be access by clients, and read by the Panel.

CHANGELOG.md

@@ -3,374 +3,6 @@ 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.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.
-* Fixes Wings receiving the wrong server suspension state when syncing servers.
-
-### Added
-* Adds additional throttling to login and password reset endpoints.
-* Adds server uptime display when viewing a server console.
-
-## v1.6.2
-### Fixed
-* **[Security]** Fixes an authentication bypass vulerability that could allow a malicious actor to login as another user in the Panel without knowing that user's email or password.
-
-## v1.6.1
-### Fixed
-* Fixes server build modifications not being properly persisted to the database when edited.
-* Correctly exposes the `oom_disabled` field in the `build` limits block for a server build so that Wings can pick it up.
-* 
-## v1.6.0
-### Fixed
-* Fixes array merging logic for server transfers that would cause a 500 error to occur in some scenarios.
-* Fixes user password updates not correctly logging the user out and returning a failure message even upon successful update.
-* Fixes the count of used backups when browsing a paginated backup list for a server.
-* Fixes an error being triggered when API endpoints are called with no `User-Agent` header and an audit log is generated for the action.
-* Fixes state management on the frontend not properly resetting the loading indicator when adding subusers to a server.
-* Fixes extraneous API calls being made to Wings for the server file listing when not on a file manager screen.
-
-### Added
-* Adds foreign key relationship on the `mount_node`, `mount_server` and `egg_mount` tables.
-* Adds environment variable `PER_SCHEDULE_TASK_LIMIT` to allow manual overrides for the number of tasks that can exist on a single schedule. This is currently defaulted to `10`.
-* OOM killer can now be configured at the time of server creation.
-
-### Changed
-* Server updates are not dependent on a successful call to Wings occurring — if the API call fails internally the error will be logged but the server update will still be persisted.
-
-### Removed
-* Removed `WingsServerRepository::update()` function — if you were previously using this to modify server elements on Wings please replace calls to it with `::sync()` after updating Wings.
-
-## v1.5.1
-### Fixed
-* Fixes Docker image 404ing instead of being able to access the Panel.
-* Fixes Java version feature being only loaded when the `eula` feature is specified.
-* Fixes `php artisan p:upgrade` not forcing and seeding while running migrations.
-* Fixes spinner overlays overlapping on the server console page.
-* Fixes Wings being unable to update backup statuses.
-
-## v1.5.0
-### Fixed
-* Fixes deleting a locked backup that has also been marked as failed to allow deletion rather than returning an error about being locked.
-* Fixes server creation process not correctly sending `start_on_completion` to Wings instance.
-* Fixes `z-index` on file mass delete modal so it is displayed on top of all elements, rather than hidden under some.
-* Supports re-sending requests to the Panel API for backups that are currently marked as failed, allowing a previously failed backup to be marked as successful.
-* Minor updates to multiple default eggs for improved error handling and more accurate field-level validation.
-
-### Updated
-* Updates help text for CPU limiting when creating a new server to properly indicate virtual threads are included, rather than only physical threads.
-* Updates all of the default eggs shipped with the Panel to reference new [`ghcr.io` yolks repository](https://github.com/pterodactyl/yolks).
-* When adding 2FA to an account the key used to generate the token is now displayed to the user allowing them to manually input into their app if necessary.
-
-### Added
-* Adds SSL/TLS options for MySQL and Redis in line with most recent Laravel updates.
-* New users created for server MySQL instances will now have the correct permissions for creating foreign keys on tables.
-* Adds new automatic popup feature to allow users to quickly update their Minecraft servers to the latest Java® eggs as necessary if unsupported versions are detected.
-
-### Removed
-* Removes legacy `userInteraction` key from eggs which was unused.
-
-## v1.4.2
-### Fixed
-* Fixes logic to disallow creating a backup schedule if the server's backup limit is set to 0.
-* Fixes bug preventing a database host from being updated if the linked node is set to "none".
-* Fixes files and menus under the "Mass Actions Bar" being unclickable when it is visible.
-* Fixes issues with the Teamspeak and Mumble eggs causing installs to fail.
-* Fixes automated query to avoid pruning backups that are still running unintentionally.
-* Fixes "Delete Server" confirmation modal on the admin screen to actually show up when deleting rather than immediately deleting the server.
-
-### Added
-* Adds support for locking individual server backups to prevent deletion by users or automated backup processes.
-* List of files to be deleted is now shown on the delete file confirmation modal.
-* Adds support for using `IF` statements in database queries when a database user is created through the Panel.
-* Adds support for using a custom mailgun API endpoint rather than only the US based endpoint.
-* Adds CPU limit display next to the current CPU usage to match disk and memory usage reporting.
-* Adds a "Scroll to Bottom" helper element to the server console when not scrolled to the bottom currently.
-* Adds support for querying the API for servers by using the `uuidShort` field rather than only the `uuid` field.
-
-### Changed
-* Updates codebase to use TypeScript 4.
-* **[security]**: removes the external dependency for loading QRCode images. They're now generated directly on the frontend using JavaScript.
-
-## v1.4.1
-### Added
-* Adds support for only running a schedule if the server is currently in an online state.
-* Adds support for ignoring errors during task execution and continuing on to the next item in the sequence. For example, continuing to a server restart even if sending a command beforehand failed.
-* Adds the ability to specify the group to use for file permissions when using the `p:upgrade` command.
-* Adds the ability to manually run a schedule even if it is currently disabled.
-
-## v1.4.0
-### Fixed
-* Removes the use of tagging when storing server resource usage in the cache. This addresses errors encountered when using the `file` driver.
-* Fixes Wings response handling if Wings returns an error response with a 200-level status code that would improperly be passed back to the client as a successful request.
-* Fixes use of JSON specific functions in SQL queries to better support MariaDB users.
-* Fixes a migration that could fail on some MySQL/MariaDB setups when trying to encrypt node token values.
-
-### Changed
-* Increases the maximum length allowed for a server name using the Rust egg.
-* Updated server resource utilization API call to Wings to use new API response format used by `Wings@1.4.0`.
-
-## v1.3.2
-### Fixed
-* Fixes self-upgrade incorrectly executing the command to un-tar downloaded archives.
-* Fixes the checkbox to delete all files when restoring a backup not actually passing that along in the API call. Files will now properly be deleted when restoring if selected.
-* Fixes some keybindings not working correctly in the server console on Windows machines.
-* Fixes mobile UI incorrectly squishing the Docker image selector on the server settings page.
-* Fixes recovery tokens not having a `created_at` value set on them properly when they are created.
-* Fixes flawed migration that would not correctly set the month value into schedule crons.
-* Fixes incorrect mounting for Docker compose file that would cause error logs to be missing.
-
-### Changed
-* Server resource lookups are now cached on the Panel for 20 seconds at a time to reduce the load from multiple clients requesting the same server's stats.
-* Bungeecord egg no longer force-enables the query listener.
-* Adds page to the dashboard URL to allow easy loading of a specific pagination page rather than resetting back to the first page when refreshing.
-* All application API endpoints now correctly support the `?per_page=N` query parameter to specify how many resources to return at once.
-
-## v1.3.1
-### Fixed
-* Fixes the Rust egg not properly seeding during the upgrade & installation process.
-* Fixes backups not being downloadable via the frontend.
-* Fixes backup listing showing the wrong number of existing backups based on the current page you're on.
-
-## v1.3.0
-### Fixed
-* Fixes administrator "Other Servers" toggle being persisted wrongly when signing out and signing into a non-administrator account on the server dashboard.
-* Fixes composer failing to run properly in local environments where there is no database connection available once configured.
-* Fixes SQL exception caused by the Panel attempting to store null values in the database.
-* Fixes validation errors caused by improper defaults when trying to edit system settings in the admin area.
-* Fixes console overflow when using smaller-than-default font sizes in Firefox.
-* Fixes console text input field having a white background when manually building new assets from the release build due to a missing `babel-macros` definition file.
-* Fixes database improperly using a signed `smallint` field rather than an unsigned field which restricted SFTP ports to 32767 or less.
-* Fixes server console resize handler to no longer encounter an exception at random that breaks the entire UI.
-* Fixes unhandled error caused by entering an invalid IP address or FQDN when creating a new node allocation.
-* Fixes unhandled error when Wings would fetch a server configuration from the Panel that uses an Egg with invalid JSON data for the configuration fields.
-* Fixes email not being sent to a user when their server is done installing.
-
-### Added
-* Adds support for automatically copying SFTP connection details when clicking into the text field.
-* Messaging about a node not having any allocations available for deployment has been adjusted to be more understandable by users.
-* Adds automated self-upgrade process for Pterodactyl Panel once this version is installed on servers. This allows users to update by using a single command.
-* Adds support for specifying a month when creating or modifying a server schedule.
-* Adds support for restoring backups (including those in S3 buckets) to a server and optionally deleting all existing files when doing so.
-* Adds underlying support for audit logging on servers. Currently this is only used by some internal functionality but will be slowly expanded as time permits to allow more robust logging.
-* Adds logic to automatically reset failed server states when Wings is rebooted. This will kick servers out of "installing" and "restoring from backup" states automatically.
-
-### Changed
-* Updated to `Laravel 8` and bumped minimum PHP version from `7.3` to `7.4` with PHP `8.0` being the recommended.
-* Server state is now stored in a single `status` column within the database rather than multiple different `tinyint` columns.
-
-## v1.2.2
-### Fixed
-* **[security]** Fixes authentication bypass allowing a user to take control of specific server actions such as executing schedules, rotating database passwords, and viewing or deleting a backup.
-
-## v1.2.1
-### Fixed
-* Fixes URL-encoding of filenames when working in the filemanager to fix issues when moving, renaming, or deleting files.
-* Fixes URL-encoding of email addresses when requesting a password reset.
-
-### Added
-* Adds the ability for users to select a base Java Docker image for most Minecraft specific eggs shipped as defaults.
-
-## v1.2.0
-### Fixed
-* Fixes newest backup being deleted when creating a new one using the schedule tasks, rather than the oldest backup.
-* Fixes multiple encoding issues when handling file names in the manager.
-* Fixes database password not properly being copied to the clipboard when clicked.
-* Fixes failed transfers unintentionally locking a server into a failed state and not properly releasing allocations that were reserved.
-* Fixes error box on server pages having an oval refresh button rather than a perfect circle.
-* Fixes a bunch of errors and usage issues relating to backups especially when uploading to S3-based systems.
-* Fixes HMR breaking navigation in development modes on the frontend.
-
-### Changed
-* Updated Paper egg to default to Java 11 as the base docker image.
-* Removes the file mode display from the File Manager row listing.
-* Updated input UI elements to have thicker borders and more consistent highlighting when active.
-* Changed searchbar toggle from `"k"` to `Cmd/Ctrl + "/"` to avoid accidental toggles and be more consistent with other sites.
-* Upgrades TailwindCSS to `v2`.
-
-### Added
-* Adds support for eggs to define multiple Docker images that can be selected by users (e.g. Java 8 & 11 images for a single egg).
-* Adds support for configuring the default interval for failed backups to be pruned from the system to avoid long running backups being incorrectly cleared.
-* Adds server transfer output logging to the server console allowing admins to see how a transfer is progressing directly in the UI.
-* Adds client API endpoint to download a file from a remote souce. This functionality is not currently expressed in the UI.
-
-## v1.1.3
-### Fixed
-* Server bulk power actions command will no longer attempt to run commands against installing or suspended servers.
-* Fixes the application API throwing an error when attempting to return variables for a server.
-* Fixes an error when attempting to install Panel dependencies without specifying an `.env` file due to an unset default timezone.
-* Fixes a null value flip in the database migrations.
-* Fixes password change endpoint for users allowing a blank value to be provided (even if nothing actually happened).
-* Fixes database IP addresses not allowing a `0` in the first octet field.
-* Fixes node information being impossible to update if there was a network error during the process. Any errors encountered communicating with Wings are now reported but will not block the actual saving of the changes.
-* **[Security]** When 2FA is required on an account the client API endpoints will now properly return an error and the UI will redirect the user to setup 2FA.
-* **[Security]** When changing the owner of a server the old owner's JWT is now properly invalidated on Wings.
-* Fixes a server error when requesting database information for a server as a subuser and the account is not granted `view_password` permissions.
-
-### Added
-* Adds support for basic backup rotation on a server when creating scheduled backup tasks.
-* Makes URLs present in the console clickable.
-* Adds `chmod` support to the file manager so that users can manually make modifications to file permissions as they need.
-
-### Changed
-* UI will no longer show a delete button to users when they're editing themselves.
-* Updated logic for bulk power actions to no longer run actions against suspended or installing servers.
-
-## v1.1.2
-### Fixed
-* Fixes an exception thrown while trying to validate IP access for the client API.
-* Fixes command history scrolling not putting the cursor at the end of the line.
-* Fixes file manager rows triggering a 404 when middle-clicked to open in a new tab.
-
-## v1.1.1
-### Fixed
-* Fixes allocation permissions checking on the frontend checking the wrong permission therefore leading to the item never showing up.
-* Fixes allocations not updating correctly when added or deleted and switching between pages.
-
-## v1.1.0
-This release **requires** `Wings@1.1.0` in order to work properly due to breaking internal API changes.
-
-### Fixed
-* Fixes subuser creation/edit modal not submitting correctly when attemping to make modifications.
-* Fixes a few remaining issues with multiple egg install scripts.
-* Removes the ability for a schedule to have a null name and replaces any existing null names with a randomly generated name.
-* Fixes schedules aborting the entire run process if a single schedule encountered an exception. This resolves batches of schedules never running correctly if they occur after a broken schedule.
-* Fixes schedules not properly resetting themselves if an exception was encountered during the run.
-* Fixes numerous N+1 query run-aways when loading multiple servers via the API.
-* Fixes numerous issues with displaying directory and file names in the file manager if they included special characters that could not be decoded properly.
-* Fixes CPU pinning not being properly passed along to Wings when updated (this also fixes memory/CPU/disk not passing along correctly as well).
-* Fixes spinner not displaying properly when displayed over a modal.
-
-### Added
-* Adds ability for users to generate their own additional server allocations via the frontend if enabled.
-* Adds the ability for a user to remove un-needed allocations from their server (as long as it is not the primary allocation).
-* Adds support for tracking the last 32 sent console commands for a server. Access the history by using the arrow keys when the command field is active.
-* Adds S3 specific environment variables allowing for backups to use any S3 compatiable system, not just AWS.
-* Adds support for copying a server allocation address to the clipboard when clicked.
-* Adds information about the next schedule run time when viewing an individual schedule.
-* Adds link to view a server in the admin control panel to the frontend server view when logged in as a root admin.
-* Adds support for egg-specific frontend/backend functionality. This is a beta feature meant for internal features at this time.
-* Adds back the EULA warning popup when starting a Minecraft server without an accepted EULA.
-* Adds missing descriptions for some user permissions on the frontend UI.
-
-### Changed
-* Adds Save/Invite button to top of subuser edit/creation modal to reduce the need for scrolling.
-* Updated language for server transfers and mounts to be less confusing.
-* Wings API endpoint for fetching all servers on a node is now properly paginated to reduce system load when returning hundreds or thousands of servers at once.
-* Removes unnecessary Wings API calls when adding/editing/deleting mounts.
-* Primary allocation for a server is now always returned, even if the subuser does not have permission to view all of the server allocations.
-* Google Analytics frontend code is now only loaded when a valid key is provided.
-
-## v1.0.3
-### Fixed
-* Fixes bug causing subusers to not be creatable or editable via the frontend for servers.
-* Fixes system timezone not being passed along properly to the MySQL connection causing scheduled tasks to run every minute when the MySQL instance and Panel timezone did not line up.
-* Fixes listing servers owned by a user in the admin area to actually list their servers.
-
-### Changed
-* Adds SameSite `lax` attribute for cookies generated by the Panel.
-* Adds better filtering for searching servers in the admin area to better key off name, uuid, or owner username/email.
-
-## v1.0.2
-### Added
-* Adds support for searching inside the file editor.
-* Adds support for manually executing a schedule regardless of if it is currently queued or not.
-* Adds an indicator to the schedule UI to show when a schedule is currently processing.
-* Adds support for setting the `backup_limit` of a server via the API.
-* **[Security]** Adds login throttling to the 2FA verification endpoint.
-
-### Fixed
-* Fixes subuser page title missing server name.
-* Fixes schedule task `sequence_id` not properly being reset when a schedule's task is deleted.
-* Fixes misc. UI bugs throughout the frontend when long text overflows its bounds.
-* Fixes user deletion command to properly handle email & ID searching.
-* Fixes color issues in the terminal causing certain text & background combinations to be illegible.
-* Fixes reCAPTCHA not properly resetting on login failure.
-* Fixes error messages not properly resetting between login screens.
-* Fixes a UI crash when attempting to create or view a directory or file that contained the `%` somewhere in the name.
-
-### Changed
-* Updated the search modal to close itself when the ESC key is pressed.
-* Updates the schedule view and editing UI to better display information to users.
-* Changed logic powering server searching on the frontend to return more accurate results and return all servers when executing the query as an admin.
-* Admin CP link no longer opens in a new tab.
-* Mounts will no longer allow a user to mount certain directory combinations. This blocks mounting one server's files into another server, and blocks using the server data directory as a mount destination.
-* Cleaned up assorted server build modification code.
-* Updates default eggs to have improved install scripts and more consistent container usage.
-
-## v1.0.1
-### Fixed
-* Fixes 500 error when mounting a mount to a server, and other related errors when handling mounts.
-* Ensures that `server_transfers` database is deleted if it already exists to avoid unnecessary error.
-* Fixes servers getting marked as "not installed" when modifying their startup arguments.
-* Fixes filemanager breadcrumbs being set incorrectly when navigating between files and folders.
-
-### Changed
-* Change the requests per minute from 240 to 720 for the client API to avoid unecessarily displaying
-"Too Many Requests" errors.
-* Added error output to certain commands that will output and terminate the command execution if the database
-migrations have not been run correctly for the instance.
-
-## v1.0.0
-Pterodactyl 1.0 represents the culmination of over two years of work, almost 2,000 commits, endless bug and feature requests, and a dream that
-has been in the making since 2013. 🎉
-
-Due to the sheer size and timeline of this release I've massively truncated the listing below. There are numerous smaller
-bug fixes and changes that would simply be too difficult to keep track of here. Please feel free to browse through the releases
-tab for this repository to see more specific changes that have been made.
-
-### Added
-* Adds a new client-facing API allowing a user to control all aspects of their individual servers, or servers
-which they have been granted access to as a subuser.
-* Adds the ability for backups to be created for a server both manually and via a scheduled task.
-* Adds the ability for users to modify their server allocations on the fly and include notes for each allocation.
-* Adds the ability for users to generate recovery tokens for 2FA protected logins which can be used in place of
-a code should their device be inaccessible.
-* Adds support for transfering servers between Nodes via the Panel.
-* Adds the ability to assign specific CPU cores to a server (CPU Pinning) process.
-* Server owners can now reinstall their assigned server egg automatically with a button on the frontend.
-
-### Changed
-* The entire user frontend has been replaced with a responsive, React backed design implemented using Tailwind CSS.
-* Replaces a large amount of complex daemon authentication logic by funneling most API calls through the Panel, and using
-JSON Web Tokens where necessary to handle one-time direct authentication with Wings.
-* Frontend server listing now includes a toggle to show or hide servers which an administrator has access to, rather
-than always showing all servers on the system when logged into an admin account.
-* We've replaced Ace Editor on the frontend with a better solution to allow lighter builds and more end-user functionality.
-* Server permissions have been overhauled to be both easier to understand in the codebase, and allows plugins to better
-hook into the permission system.
-
-### Removed
-* Removes large swaths of code complexity and confusing interface designs that caused a lot of pain to new developers
-trying to jump into the codebase. We've simplified this to stick to more established Laravel design standards to make
-it easy to parse through the project and make contributions.
-
-## v0.7.19 (Derelict Dermodactylus)
-### Fixed
-* **[Security]** Fixes XSS in the admin area's server owner selection.
-
-## v0.7.18 (Derelict Dermodactylus)
-### Fixed
-* **[Security]** Re-addressed missed endpoint that would not properly limit a user account to 5 API keys.
-* **[Security]** Addresses a Client API vulnerability that would allow a user to list all servers on the system ([`GHSA-6888-7f3w-92jx`](https://github.com/pterodactyl/panel/security/advisories/GHSA-6888-7f3w-92jx))
-
 ## v0.7.17 (Derelict Dermodactylus)
 ### Fixed
 * Limited accounts to 5 API keys at a time.
@@ -669,7 +301,7 @@ the response from the server `GET` endpoint.
 * Nest and Egg listings now show the associated ID in order to make API requests easier.
 * Added star indicators to user listing in Admin CP to indicate users who are set as a root admin.
 * Creating a new node will now requires a SSL connection if the Panel is configured to use SSL as well.
-* Socketio error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
+* Connector error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
 * File manager now supports mass deletion option for files and folders.
 * Support for CS:GO as a default service option selection.
 * Support for GMOD as a default service option selection.
@@ -799,7 +431,7 @@ the response from the server `GET` endpoint.
 * Changed 2FA login process to be more secure. Previously authentication checking happened on the 2FA post page, now it happens prior and is passed along to the 2FA page to avoid storing any credentials.
 
 ### Added
-* Socketio error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
+* Connector error messages due to permissions are now rendered correctly in the UI rather than causing a silent failure.
 
 ## v0.7.0-beta.1 (Derelict Dermodactylus)
 ### Added

CONTRIBUTING.md

@@ -1,55 +1,44 @@
 # 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.
-
-#### 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.
+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.
 
 ### 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.
+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.
+Moving forward all commits from contributors should be in the form of a PR, unless it is something we have previously discussed as being able to be pushed right into `develop`.
 
-### 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.
+All new code should contain unit tests at a minimum (where applicable). There is a lot of uncovered code currently, so as you are doing things please be looking for places that you can write tests.
+
+### Update the CHANGELOG
+When adding something that is new, fixed, changed, or security-related for the next release you should be adding a note to the CHANGELOG. If something is changing within the same version (i.e. fixing a bug introduced but not released) it should _not_ go into the CHANGELOG.
 
 ### 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.
+We are a `PSR-4` and `PSR-0` compliant project, so please follow those guidelines at a minimum. In addition, StyleCI runs on all of our code to ensure the formatting is standardized across everything. When a PR is made StyleCI will analyze your code and make a pull to that branch if necessary to fix any formatting issues. This project also ships with a PHP-CS configuration file and you are welcome to configure your local environment to make use of that.
 
-```
-vendor/bin/php-cs-fixer fix --dry-run --diff --diff-format=udiff --config .php_cs.dist
+All class variable declarations should be in alphabetical order, and constructor arguments should be in alphabetical order based on the classname. See the example below for how this should look, or check out any of the `app/Service` files for examples.
+
+```php
+class ProcessScheduleService
+{
+    protected $repository;
+    protected $runnerService;
+
+    public function __construct(RunTaskService $runnerService, ScheduleRepositoryInterface $repository)
+    {
+        $this->repository = $repository;
+        $this->runnerService = $runnerService;
+    }
 ```
 
 ### 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.
+This is a fairly in-depth project and makes use of a lot of parts. We strive to keep everything as secure as possible and welcome you to take a look at the code provided in this project yourself. We do ask that you be considerate of others who are using the software and not publicly disclose security issues without contacting us first by email.
 
-We'll make a deal with you: if you contact us by email and we fail to respond to you within a week you are welcome to
-publicly disclose whatever issue you have found. We understand how frustrating it is when you find something big and
-no one will respond to you. This holds us to a standard of providing prompt attention to any issues that arise and
-keeping this community safe.
+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 us at `support@pterodactyl.io`.
 
-### Contact Us
-You can find us in a couple places online. First and foremost, we're active right here on Github. If you encounter a
-bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
+### Where to find Us
+You can find us in a couple places online. First and foremost, we're active right here on Github. If you encounter a bug or other problems, open an issue on here for us to take a look at it. We also accept feature requests here as well.
 
-You can also find us on [Discord](https://discord.gg/pterodactyl).
+You can also find us on [Discord](https://pterodactyl.io/discord). In the event that you need to get in contact with us privately feel free to contact us at `support@pterodactyl.io`. Try not to email us with requests for support regarding the panel, we'll probably just direct you to our Discord.

CONTRIBUTORS.md

@@ -0,0 +1,14 @@
+# Pterodactyl Panel Contributors
+This panel would not be possible without the support of our wonderful community of
+developers who provide code enhancements, new features, and bug fixes to make this panel
+the best that is can be. You can view a full listing of contributors [here](https://github.com/Pterodactyl/Panel/graphs/contributors).
+
+Dane Everitt [@DaneEveritt](https://github.com/Pterodactyl/Panel/commits?author=DaneEveritt)
+
+Dylan Seidt [@DDynamic](https://github.com/Pterodactyl/Panel/commits?author=DDynamic)
+
+[@nikkiii](https://github.com/Pterodactyl/Panel/commits?author=nikkiii)
+
+# Get Involved
+See our `CONTRIBUTING.md` document for information on how to get started. Once you've submitted some code feel free to 
+modify this file and add your name to the list. Please follow the format above for your name and linking to your contributions.

Dockerfile

@@ -1,39 +1,36 @@
-# Stage 0:
-# Build the assets that are needed for the frontend. This build stage is then discarded
-# since we won't need NodeJS anymore in the future. This Docker image ships a final production
-# level distribution of Pterodactyl.
-FROM --platform=$TARGETOS/$TARGETARCH mhart/alpine-node:14
-WORKDIR /app
-COPY . ./
-RUN yarn install --frozen-lockfile \
-    && yarn run build:production
+FROM php:7.4-fpm-alpine
 
-# Stage 1:
-# Build the actual container with all of the needed PHP dependencies that will run the application.
-FROM --platform=$TARGETOS/$TARGETARCH php:7.4-fpm-alpine
 WORKDIR /app
+
+RUN apk add --no-cache --update ca-certificates dcron curl git supervisor tar unzip nginx libpng-dev libxml2-dev libzip-dev certbot yarn; \
+    docker-php-ext-install bcmath; \
+    docker-php-ext-install gd; \
+    docker-php-ext-install mbstring; \
+    docker-php-ext-install pdo; \
+    docker-php-ext-install pdo_mysql; \
+    docker-php-ext-install tokenizer; \
+    docker-php-ext-install xml; \
+    docker-php-ext-configure zip --with-libzip=/usr/include; \
+    docker-php-ext-install zip; \
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+
 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 \
+
+RUN cp .env.example .env \
  && composer install --no-dev --optimize-autoloader \
-    && rm -rf .env bootstrap/cache/*.php \
-    && chown -R nginx:nginx .
+ && rm .env \
+ && chown -R nginx:nginx . && chmod -R 777 storage/* bootstrap/cache 
 
-RUN rm /usr/local/etc/php-fpm.conf \
+RUN cp docker/default.conf /etc/nginx/conf.d/default.conf \
+ && cat docker/www.conf > /usr/local/etc/php-fpm.d/www.conf \
+ && rm /usr/local/etc/php-fpm.d/www.conf.default \
+ && cat docker/supervisord.conf > /etc/supervisord.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"]
+
+ENTRYPOINT ["/bin/ash", "docker/entrypoint.sh"]
+
 CMD [ "supervisord", "-n", "-c", "/etc/supervisord.conf" ]

LICENSE.md

@@ -1,7 +1,7 @@
 # The MIT License (MIT)
 
 ```
-Copyright (c) 2015 - 2021 Dane Everitt <dane@daneeveritt.com> and Contributors
+Copyright (c) 2015 - 2020 Dane Everitt <dane@daneeveritt.com>
 
 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,13 +1,12 @@
 [![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)
-![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)
+[![Build status](https://img.shields.io/travis/pterodactyl/panel/develop.svg?style=flat-square)](https://travis-ci.org/pterodactyl/panel)
+[![Codecov](https://img.shields.io/codecov/c/github/pterodactyl/panel/develop.svg?style=flat-square)](https://codecov.io/gh/Pterodactyl/Panel)
+[![Discord](https://img.shields.io/discord/122900397965705216.svg?style=flat-square&label=Discord)](https://pterodactyl.io/discord)
 
 # Pterodactyl Panel
 Pterodactyl is an open-source game server management panel built with PHP 7, React, and Go. Designed with security 
-in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive
+in mind, Pterodactyl runs all game servers in isolated Docker container while exposing a beautiful and intuitive
 UI to end users.
 
 Stop settling for less. Make game servers a first class citizen on your platform.
@@ -15,29 +14,17 @@ 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.
+I would like to extend my sincere thanks to the following sponsors for helping find 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. |
+| [**VersatileNode**](https://versatilenode.com/) | Looking to host a minecraft server, vps, or a website? VersatileNode is one of the most affordable hosting providers to provide quality yet cheap services with incredible support. |
 | [**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! |
-| [**HostEZ**](https://hostez.io) | Providing North America Valheim, Minecraft and other popular games with low latency, high uptime and maximum availability. EZ! |
+| [**XCORE-SERVER.de**](https://xcore-server.de/) | XCORE-SERVER.de offers High-End Servers for hosting and gaming since 2012. Fast, excellent and well-known for eSports Gaming. |
 
 ## Documentation
 * [Panel Documentation](https://pterodactyl.io/panel/1.0/getting_started.html)
@@ -68,6 +55,7 @@ and there are plenty more games available provided by the community. Some of the
 * San Andreas: MP
 * Pocketmine MP
 * Squad
+* FiveM
 * Xonotic
 * Starmade
 * Discord ATLBot, and most other Node.js/Python discord bots
@@ -75,7 +63,7 @@ and there are plenty more games available provided by the community. Some of the
 
 ## License
 ```
-Copyright (c) 2015 - 2021 Dane Everitt <dane@daneeveritt.com> and Contributors
+Copyright (c) 2015 - 2020 Dane Everitt <dane@daneeveritt.com> & 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

SECURITY.md

@@ -5,13 +5,14 @@ The following versions of Pterodactyl are receiving active support and maintenan
 
 | Panel | Daemon       | Supported          |
 | ----- | ------------ | ------------------ |
-| 1.6.x | wings@1.5.x  | :white_check_mark: |
-| 0.7.x | daemon@0.6.x | :x: |
-
+| 1.0.x | wings@1.0.x  | :white_check_mark: |
+| 0.7.x | daemon@0.6.x | :white_check_mark: |
+| 0.6.x | daemon@0.5.x | :x:                |
+| 0.5.x | daemon@0.4.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 send an email to `dane [ät] 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.
 

Vagrantfile

@@ -0,0 +1,17 @@
+Vagrant.configure("2") do |config|
+    config.vm.box = "bento/ubuntu-16.04"
+
+    config.vm.synced_folder "./", "/var/www/html/pterodactyl",
+        owner: "www-data", group: "www-data"
+
+    config.vm.provision :shell, path: ".dev/vagrant/provision.sh"
+
+    config.vm.network :private_network, ip: "192.168.50.2"
+    config.vm.network :forwarded_port, guest: 80, host: 50080
+    config.vm.network :forwarded_port, guest: 8025, host: 58025
+    config.vm.network :forwarded_port, guest: 3306, host: 53306
+
+    # Config for the vagrant-dns plugin (https://github.com/BerlinVagrant/vagrant-dns)
+    config.dns.tld = "test"
+    config.dns.patterns = [/^pterodactyl.test$/]
+end

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -12,7 +12,6 @@ namespace Pterodactyl\Console\Commands\Environment;
 use DateTimeZone;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\Kernel;
-use Illuminate\Validation\Factory as ValidatorFactory;
 use Pterodactyl\Traits\Commands\EnvironmentWriterTrait;
 use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
@@ -20,13 +19,13 @@ class AppSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
 
-    public const ALLOWED_CACHE_DRIVERS = [
+    const ALLOWED_CACHE_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'memcached' => 'Memcached',
         'file' => 'Filesystem',
     ];
 
-    public const ALLOWED_SESSION_DRIVERS = [
+    const ALLOWED_SESSION_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'memcached' => 'Memcached',
         'database' => 'MySQL Database',
@@ -34,7 +33,7 @@ class AppSettingsCommand extends Command
         'cookie' => 'Cookie',
     ];
 
-    public const ALLOWED_QUEUE_DRIVERS = [
+    const ALLOWED_QUEUE_DRIVERS = [
         'redis' => 'Redis (recommended)',
         'database' => 'MySQL Database',
         'sync' => 'Sync',
@@ -78,14 +77,16 @@ class AppSettingsCommand extends Command
 
     /**
      * AppSettingsCommand constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
+     * @param \Illuminate\Contracts\Console\Kernel $command
      */
-    public function __construct(ConfigRepository $config, Kernel $command, ValidatorFactory $validator)
+    public function __construct(ConfigRepository $config, Kernel $command)
     {
         parent::__construct();
 
-        $this->config = $config;
         $this->command = $command;
-        $this->validator = $validator;
+        $this->config = $config;
     }
 
     /**
@@ -101,26 +102,12 @@ class AppSettingsCommand extends Command
 
         $this->output->comment(trans('command/messages.environment.app.author_help'));
         $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')
+                trans('command/messages.environment.app.author'), $this->config->get('pterodactyl.service.author', 'unknown@unknown.com')
             );
 
-        $validator = $this->validator->make(
-            ['email' => $this->variables['APP_SERVICE_AUTHOR']],
-            ['email' => 'email']
-        );
-
-        if ($validator->fails()) {
-            foreach ($validator->errors()->all() as $error) {
-                $this->output->error($error);
-            }
-            return 1;
-        }
-
         $this->output->comment(trans('command/messages.environment.app.app_url_help'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
-            trans('command/messages.environment.app.app_url'),
-            $this->config->get('app.url', 'http://example.org')
+                trans('command/messages.environment.app.app_url'), $this->config->get('app.url', 'http://example.org')
             );
 
         $this->output->comment(trans('command/messages.environment.app.timezone_help'));
@@ -151,17 +138,12 @@ class AppSettingsCommand extends Command
                 array_key_exists($selected, self::ALLOWED_QUEUE_DRIVERS) ? $selected : null
             );
 
-        if (!is_null($this->option('settings-ui'))) {
+        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';
         }
 
-        // Make sure session cookies are set as "secure" when using HTTPS
-        if (strpos($this->variables['APP_URL'], 'https://') === 0) {
-            $this->variables['SESSION_SECURE_COOKIE'] = 'true';
-        }
-
         $this->checkForRedis();
         $this->writeToEnvironment($this->variables);
 
@@ -184,12 +166,11 @@ class AppSettingsCommand extends Command
 
         $this->output->note(trans('command/messages.environment.app.using_redis'));
         $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
-            trans('command/messages.environment.app.redis_host'),
-            $this->config->get('database.redis.default.host')
+                trans('command/messages.environment.app.redis_host'), $this->config->get('database.redis.default.host')
             );
 
         $askForRedisPassword = true;
-        if (!empty($this->config->get('database.redis.default.password'))) {
+        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'));
         }
@@ -206,8 +187,7 @@ 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')
+                trans('command/messages.environment.app.redis_port'), $this->config->get('database.redis.default.port')
             );
     }
 }

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -57,6 +57,10 @@ class DatabaseSettingsCommand extends Command
 
     /**
      * DatabaseSettingsCommand constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
+     * @param \Illuminate\Database\DatabaseManager $database
+     * @param \Illuminate\Contracts\Console\Kernel $console
      */
     public function __construct(ConfigRepository $config, DatabaseManager $database, Kernel $console)
     {
@@ -78,28 +82,24 @@ class DatabaseSettingsCommand extends Command
     {
         $this->output->note(trans('command/messages.environment.database.host_warning'));
         $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')
+                trans('command/messages.environment.database.host'), $this->config->get('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)
+                trans('command/messages.environment.database.port'), $this->config->get('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')
+                trans('command/messages.environment.database.database'), $this->config->get('database.connections.mysql.database', 'panel')
             );
 
         $this->output->note(trans('command/messages.environment.database.username_warning'));
         $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
-            trans('command/messages.environment.database.username'),
-            $this->config->get('database.connections.mysql.username', 'pterodactyl')
+                trans('command/messages.environment.database.username'), $this->config->get('database.connections.mysql.username', 'pterodactyl')
             );
 
         $askForMySQLPassword = true;
-        if (!empty($this->config->get('database.connections.mysql.password')) && $this->input->isInteractive()) {
+        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'));
         }

app/Console/Commands/Environment/EmailSettingsCommand.php

@@ -37,7 +37,6 @@ class EmailSettingsCommand extends Command
                             {--encryption=}
                             {--host=}
                             {--port=}
-                            {--endpoint=}
                             {--username=}
                             {--password=}';
 
@@ -48,6 +47,8 @@ class EmailSettingsCommand extends Command
 
     /**
      * EmailSettingsCommand constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
      */
     public function __construct(ConfigRepository $config)
     {
@@ -64,15 +65,13 @@ class EmailSettingsCommand extends Command
     public function handle()
     {
         $this->variables['MAIL_DRIVER'] = $this->option('driver') ?? $this->choice(
-            trans('command/messages.environment.mail.ask_driver'),
-            [
+            trans('command/messages.environment.mail.ask_driver'), [
                 'smtp' => 'SMTP Server',
                 'mail' => 'PHP\'s Internal Mail Function',
                 'mailgun' => 'Mailgun Transactional Email',
                 'mandrill' => 'Mandrill Transactional Email',
                 'postmark' => 'Postmarkapp Transactional Email',
-            ],
-            $this->config->get('mail.driver', 'smtp')
+            ], $this->config->get('mail.driver', 'smtp')
         );
 
         $method = 'setup' . studly_case($this->variables['MAIL_DRIVER']) . 'DriverVariables';
@@ -81,19 +80,15 @@ class EmailSettingsCommand extends Command
         }
 
         $this->variables['MAIL_FROM'] = $this->option('email') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mail_from'),
-            $this->config->get('mail.from.address')
+                trans('command/messages.environment.mail.ask_mail_from'), $this->config->get('mail.from.address')
             );
 
         $this->variables['MAIL_FROM_NAME'] = $this->option('from') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mail_name'),
-            $this->config->get('mail.from.name')
+                trans('command/messages.environment.mail.ask_mail_name'), $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')
+                trans('command/messages.environment.mail.ask_encryption'), ['tls' => 'TLS', 'ssl' => 'SSL', '' => 'None'], $this->config->get('mail.encryption', 'tls')
             );
 
         $this->writeToEnvironment($this->variables);
@@ -108,18 +103,15 @@ class EmailSettingsCommand extends Command
     private function setupSmtpDriverVariables()
     {
         $this->variables['MAIL_HOST'] = $this->option('host') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_smtp_host'),
-            $this->config->get('mail.host')
+                trans('command/messages.environment.mail.ask_smtp_host'), $this->config->get('mail.host')
             );
 
         $this->variables['MAIL_PORT'] = $this->option('port') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_smtp_port'),
-            $this->config->get('mail.port')
+                trans('command/messages.environment.mail.ask_smtp_port'), $this->config->get('mail.port')
             );
 
         $this->variables['MAIL_USERNAME'] = $this->option('username') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_smtp_username'),
-            $this->config->get('mail.username')
+                trans('command/messages.environment.mail.ask_smtp_username'), $this->config->get('mail.username')
             );
 
         $this->variables['MAIL_PASSWORD'] = $this->option('password') ?? $this->secret(
@@ -133,18 +125,11 @@ class EmailSettingsCommand extends Command
     private function setupMailgunDriverVariables()
     {
         $this->variables['MAILGUN_DOMAIN'] = $this->option('host') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mailgun_domain'),
-            $this->config->get('services.mailgun.domain')
+                trans('command/messages.environment.mail.ask_mailgun_domain'), $this->config->get('services.mailgun.domain')
             );
 
         $this->variables['MAILGUN_SECRET'] = $this->option('password') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mailgun_secret'),
-            $this->config->get('services.mailgun.secret')
-        );
-
-        $this->variables['MAILGUN_ENDPOINT'] = $this->option('endpoint') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mailgun_endpoint'),
-            $this->config->get('services.mailgun.endpoint')
+                trans('command/messages.environment.mail.ask_mailgun_secret'), $this->config->get('services.mailgun.secret')
             );
     }
 
@@ -154,8 +139,7 @@ class EmailSettingsCommand extends Command
     private function setupMandrillDriverVariables()
     {
         $this->variables['MANDRILL_SECRET'] = $this->option('password') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_mandrill_secret'),
-            $this->config->get('services.mandrill.secret')
+                trans('command/messages.environment.mail.ask_mandrill_secret'), $this->config->get('services.mandrill.secret')
             );
     }
 
@@ -168,8 +152,7 @@ class EmailSettingsCommand extends Command
         $this->variables['MAIL_HOST'] = 'smtp.postmarkapp.com';
         $this->variables['MAIL_PORT'] = 587;
         $this->variables['MAIL_USERNAME'] = $this->variables['MAIL_PASSWORD'] = $this->option('username') ?? $this->ask(
-            trans('command/messages.environment.mail.ask_postmark_username'),
-            $this->config->get('mail.username')
+                trans('command/messages.environment.mail.ask_postmark_username'), $this->config->get('mail.username')
             );
     }
 }

app/Console/Commands/InfoCommand.php

@@ -37,6 +37,9 @@ class InfoCommand extends Command
 
     /**
      * VersionCommand constructor.
+     *
+     * @param \Illuminate\Contracts\Config\Repository $config
+     * @param \Pterodactyl\Services\Helpers\SoftwareVersionService $versionService
      */
     public function __construct(ConfigRepository $config, SoftwareVersionService $versionService)
     {
@@ -62,7 +65,7 @@ class InfoCommand extends Command
         $this->output->title('Application Configuration');
         $this->table([], [
             ['Environment', $this->formatText($this->config->get('app.env'), $this->config->get('app.env') === 'production' ?: 'bg=red')],
-            ['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', !$this->config->get('app.debug') ?: 'bg=red')],
+            ['Debug Mode', $this->formatText($this->config->get('app.debug') ? 'Yes' : 'No', ! $this->config->get('app.debug') ?: 'bg=red')],
             ['Installation URL', $this->config->get('app.url')],
             ['Installation Directory', base_path()],
             ['Timezone', $this->config->get('app.timezone')],
@@ -101,7 +104,6 @@ class InfoCommand extends Command
      *
      * @param string $value
      * @param string $opts
-     *
      * @return string
      */
     private function formatText($value, $opts = '')

app/Console/Commands/Location/DeleteLocationCommand.php

@@ -42,6 +42,9 @@ class DeleteLocationCommand extends Command
 
     /**
      * DeleteLocationCommand constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\LocationRepositoryInterface $repository
+     * @param \Pterodactyl\Services\Locations\LocationDeletionService $deletionService
      */
     public function __construct(
         LocationDeletionService $deletionService,
@@ -63,8 +66,7 @@ class DeleteLocationCommand extends Command
     {
         $this->locations = $this->locations ?? $this->repository->all();
         $short = $this->option('short') ?? $this->anticipate(
-            trans('command/messages.location.ask_short'),
-            $this->locations->pluck('short')->toArray()
+                trans('command/messages.location.ask_short'), $this->locations->pluck('short')->toArray()
             );
 
         $location = $this->locations->where('short', $short)->first();

app/Console/Commands/Location/MakeLocationCommand.php

@@ -33,6 +33,8 @@ class MakeLocationCommand extends Command
 
     /**
      * Create a new command instance.
+     *
+     * @param \Pterodactyl\Services\Locations\LocationCreationService $creationService
      */
     public function __construct(LocationCreationService $creationService)
     {

app/Console/Commands/Maintenance/CleanServiceBackupFilesCommand.php

@@ -9,7 +9,7 @@ use Illuminate\Contracts\Filesystem\Factory as FilesystemFactory;
 
 class CleanServiceBackupFilesCommand extends Command
 {
-    public const BACKUP_THRESHOLD_MINUTES = 5;
+    const BACKUP_THRESHOLD_MINUTES = 5;
 
     /**
      * @var string
@@ -28,6 +28,8 @@ class CleanServiceBackupFilesCommand extends Command
 
     /**
      * CleanServiceBackupFilesCommand constructor.
+     *
+     * @param \Illuminate\Contracts\Filesystem\Factory $filesystem
      */
     public function __construct(FilesystemFactory $filesystem)
     {

app/Console/Commands/Maintenance/PruneOrphanedBackupsCommand.php

@@ -12,26 +12,29 @@ class PruneOrphanedBackupsCommand extends Command
     /**
      * @var string
      */
-    protected $signature = 'p:maintenance:prune-backups {--prune-age=}';
+    protected $signature = 'p:maintenance:prune-backups {--since-minutes=30}';
 
     /**
      * @var string
      */
     protected $description = 'Marks all backups that have not completed in the last "n" minutes as being failed.';
 
+    /**
+     * @param \Pterodactyl\Repositories\Eloquent\BackupRepository $repository
+     */
     public function handle(BackupRepository $repository)
     {
-        $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.');
+        $since = $this->option('since-minutes');
+        if (! is_digit($since)) {
+            throw new InvalidArgumentException('The --since-minutes option must be a valid numeric digit.');
         }
 
         $query = $repository->getBuilder()
             ->whereNull('completed_at')
-            ->where('created_at', '<=', CarbonImmutable::now()->subMinutes($since)->toDateTimeString());
+            ->whereDate('created_at', '<=', CarbonImmutable::now()->subMinutes($since));
 
         $count = $query->count();
-        if (!$count) {
+        if (! $count) {
             $this->info('There are no orphaned backups to be marked as failed.');
 
             return;

app/Console/Commands/Migration/CleanOrphanedApiKeysCommand.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Pterodactyl\Console\Commands\Migration;
+
+use Pterodactyl\Models\ApiKey;
+use Illuminate\Console\Command;
+use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
+
+class CleanOrphanedApiKeysCommand extends Command
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * @var string
+     */
+    protected $signature = 'p:migration:clean-orphaned-keys';
+
+    /**
+     * @var string
+     */
+    protected $description = 'Cleans API keys from the database that are not assigned a specific role.';
+
+    /**
+     * CleanOrphanedApiKeysCommand constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository
+     */
+    public function __construct(ApiKeyRepositoryInterface $repository)
+    {
+        parent::__construct();
+
+        $this->repository = $repository;
+    }
+
+    /**
+     * Delete all orphaned API keys from the database when upgrading from 0.6 to 0.7.
+     *
+     * @return void|null
+     */
+    public function handle()
+    {
+        $count = $this->repository->findCountWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
+        $continue = $this->confirm(
+            'This action will remove ' . $count . ' keys from the database. Are you sure you wish to continue?', false
+        );
+
+        if (! $continue) {
+            return null;
+        }
+
+        $this->info('Deleting keys...');
+        $this->repository->deleteWhere([['key_type', '=', ApiKey::TYPE_NONE]]);
+        $this->info('Keys were successfully deleted.');
+    }
+}

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -12,13 +12,13 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
      */
     public function handle()
     {
-        if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning('It appears you have already configured an application encryption key. Continuing with this process with overwrite that key and cause data corruption for any existing encrypted data. DO NOT CONTINUE UNLESS YOU KNOW WHAT YOU ARE DOING.');
-            if (!$this->confirm('I understand the consequences of performing this command and accept all responsibility for the loss of encrypted data.')) {
+        if (! empty(config('app.key')) && $this->input->isInteractive()) {
+            $this->output->warning(trans('command/messages.key.warning'));
+            if (! $this->confirm(trans('command/messages.key.confirm'))) {
                 return;
             }
 
-            if (!$this->confirm('Are you sure you wish to continue? Changing the application encryption key WILL CAUSE DATA LOSS.')) {
+            if (! $this->confirm(trans('command/messages.key.final_confirm'))) {
                 return;
             }
         }

app/Console/Commands/Overrides/SeedCommand.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Pterodactyl\Console\Commands\Overrides;
-
-use Pterodactyl\Console\RequiresDatabaseMigrations;
-use Illuminate\Database\Console\Seeds\SeedCommand as BaseSeedCommand;
-
-class SeedCommand extends BaseSeedCommand
-{
-    use RequiresDatabaseMigrations;
-
-    /**
-     * Block someone from running this seed command if they have not completed
-     * the migration process.
-     */
-    public function handle()
-    {
-        if (!$this->hasCompletedMigrations()) {
-            $this->showMigrationWarning();
-
-            return;
-        }
-
-        parent::handle();
-    }
-}

app/Console/Commands/Overrides/UpCommand.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Pterodactyl\Console\Commands\Overrides;
-
-use Pterodactyl\Console\RequiresDatabaseMigrations;
-use Illuminate\Foundation\Console\UpCommand as BaseUpCommand;
-
-class UpCommand extends BaseUpCommand
-{
-    use RequiresDatabaseMigrations;
-
-    /**
-     * Block someone from running this up command if they have not completed
-     * the migration process.
-     */
-    public function handle()
-    {
-        if (!$this->hasCompletedMigrations()) {
-            $this->showMigrationWarning();
-
-            return;
-        }
-
-        parent::handle();
-    }
-}

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -1,37 +1,62 @@
 <?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\Schedule;
 
-use Exception;
-use Throwable;
+use Cake\Chronos\Chronos;
 use Illuminate\Console\Command;
-use Pterodactyl\Models\Schedule;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Collection;
 use Pterodactyl\Services\Schedules\ProcessScheduleService;
+use Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface;
 
 class ProcessRunnableCommand extends Command
 {
     /**
      * @var string
      */
-    protected $signature = 'p:schedule:process';
+    protected $description = 'Process schedules in the database and determine which are ready to run.';
+
+    /**
+     * @var \Pterodactyl\Services\Schedules\ProcessScheduleService
+     */
+    protected $processScheduleService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface
+     */
+    protected $repository;
 
     /**
      * @var string
      */
-    protected $description = 'Process schedules in the database and determine which are ready to run.';
+    protected $signature = 'p:schedule:process';
+
+    /**
+     * ProcessRunnableCommand constructor.
+     *
+     * @param \Pterodactyl\Services\Schedules\ProcessScheduleService $processScheduleService
+     * @param \Pterodactyl\Contracts\Repository\ScheduleRepositoryInterface $repository
+     */
+    public function __construct(ProcessScheduleService $processScheduleService, ScheduleRepositoryInterface $repository)
+    {
+        parent::__construct();
+
+        $this->processScheduleService = $processScheduleService;
+        $this->repository = $repository;
+    }
 
     /**
      * Handle command execution.
      */
     public function handle()
     {
-        $schedules = Schedule::query()->with('tasks')
-            ->where('is_active', true)
-            ->where('is_processing', false)
-            ->whereRaw('next_run_at <= NOW()')
-            ->get();
-
+        $schedules = $this->repository->getSchedulesToProcess(Chronos::now()->toAtomString());
         if ($schedules->count() < 1) {
             $this->line('There are no scheduled tasks for servers that need to be run.');
 
@@ -39,40 +64,23 @@ class ProcessRunnableCommand extends Command
         }
 
         $bar = $this->output->createProgressBar(count($schedules));
-        foreach ($schedules as $schedule) {
+        $schedules->each(function ($schedule) use ($bar) {
+            if ($schedule->tasks instanceof Collection && count($schedule->tasks) > 0) {
+                $this->processScheduleService->handle($schedule);
+
+                if ($this->input->isInteractive()) {
                     $bar->clear();
-            $this->processSchedule($schedule);
-            $bar->advance();
-            $bar->display();
-        }
-
-        $this->line('');
-    }
-
-    /**
-     * Processes a given schedule and logs and errors encountered the console output. This should
-     * never throw an exception out, otherwise you'll end up killing the entire run group causing
-     * any other schedules to not process correctly.
-     *
-     * @see https://github.com/pterodactyl/panel/issues/2609
-     */
-    protected function processSchedule(Schedule $schedule)
-    {
-        if ($schedule->tasks->isEmpty()) {
-            return;
-        }
-
-        try {
-            $this->getLaravel()->make(ProcessScheduleService::class)->handle($schedule);
-
                     $this->line(trans('command/messages.schedule.output_line', [
                         'schedule' => $schedule->name,
                         'hash' => $schedule->hashid,
                     ]));
-        } catch (Throwable | Exception $exception) {
-            Log::error($exception, ['schedule_id' => $schedule->id]);
-
-            $this->error("An error was encountered while processing Schedule #{$schedule->id}: " . $exception->getMessage());
                 }
             }
+
+            $bar->advance();
+            $bar->display();
+        });
+
+        $this->line('');
+    }
 }

app/Console/Commands/Server/BulkPowerActionCommand.php

@@ -2,15 +2,30 @@
 
 namespace Pterodactyl\Console\Commands\Server;
 
-use Pterodactyl\Models\Server;
 use Illuminate\Console\Command;
+use GuzzleHttp\Exception\RequestException;
 use Illuminate\Validation\ValidationException;
 use Illuminate\Validation\Factory as ValidatorFactory;
 use Pterodactyl\Repositories\Wings\DaemonPowerRepository;
-use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 
 class BulkPowerActionCommand extends Command
 {
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonPowerRepository
+     */
+    private $powerRepository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     */
+    private $repository;
+
+    /**
+     * @var \Illuminate\Validation\Factory
+     */
+    private $validator;
+
     /**
      * @var string
      */
@@ -24,18 +39,37 @@ class BulkPowerActionCommand extends Command
      */
     protected $description = 'Perform bulk power management on large groupings of servers or nodes at once.';
 
+    /**
+     * BulkPowerActionCommand constructor.
+     *
+     * @param \Pterodactyl\Repositories\Wings\DaemonPowerRepository $powerRepository
+     * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface $repository
+     * @param \Illuminate\Validation\Factory $validator
+     */
+    public function __construct(
+        DaemonPowerRepository $powerRepository,
+        ServerRepositoryInterface $repository,
+        ValidatorFactory $validator
+    ) {
+        parent::__construct();
+
+        $this->repository = $repository;
+        $this->validator = $validator;
+        $this->powerRepository = $powerRepository;
+    }
+
     /**
      * 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,
@@ -55,18 +89,23 @@ class BulkPowerActionCommand extends Command
             throw new ValidationException($validator);
         }
 
-        $count = $this->getQueryBuilder($servers, $nodes)->count();
-        if (!$this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {
+        $count = $this->repository->getServersForPowerActionCount($servers, $nodes);
+        if (! $this->confirm(trans('command/messages.server.power.confirm', ['action' => $action, 'count' => $count])) && $this->input->isInteractive()) {
             return;
         }
 
         $bar = $this->output->createProgressBar($count);
-        $this->getQueryBuilder($servers, $nodes)->each(function (Server $server) use ($action, $powerRepository, &$bar) {
+        $servers = $this->repository->getServersForPowerAction($servers, $nodes);
+
+        $servers->each(function ($server) use ($action, &$bar) {
             $bar->clear();
 
             try {
-                $powerRepository->setServer($server)->send($action);
-            } catch (DaemonConnectionException $exception) {
+                $this->powerRepository
+                    ->setNode($server->node)
+                    ->setServer($server)
+                    ->send($action);
+            } catch (RequestException $exception) {
                 $this->output->error(trans('command/messages.server.power.action_failed', [
                     'name' => $server->name,
                     'id' => $server->id,
@@ -81,24 +120,4 @@ class BulkPowerActionCommand extends Command
 
         $this->line('');
     }
-
-    /**
-     * 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)
-    {
-        $instance = Server::query()->whereNull('status');
-
-        if (!empty($nodes) && !empty($servers)) {
-            $instance->whereIn('id', $servers)->orWhereIn('node_id', $nodes);
-        } elseif (empty($nodes) && !empty($servers)) {
-            $instance->whereIn('id', $servers);
-        } elseif (!empty($nodes) && empty($servers)) {
-            $instance->whereIn('node_id', $nodes);
-        }
-
-        return $instance->with('node');
-    }
 }

app/Console/Commands/Server/BulkReinstallActionCommand.php

@@ -0,0 +1,113 @@
+<?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\Server;
+
+use Webmozart\Assert\Assert;
+use Illuminate\Console\Command;
+use GuzzleHttp\Exception\RequestException;
+use Pterodactyl\Repositories\Eloquent\ServerRepository;
+use Pterodactyl\Repositories\Wings\DaemonServerRepository;
+use Pterodactyl\Services\Servers\ServerConfigurationStructureService;
+
+class BulkReinstallActionCommand extends Command
+{
+    /**
+     * @var \Pterodactyl\Services\Servers\ServerConfigurationStructureService
+     */
+    private $configurationStructureService;
+
+    /**
+     * @var \Pterodactyl\Repositories\Wings\DaemonServerRepository
+     */
+    private $daemonRepository;
+
+    /**
+     * @var \Pterodactyl\Repositories\Eloquent\ServerRepository
+     */
+    private $repository;
+
+    /**
+     * @var string
+     */
+    protected $description = 'Reinstall a single server, all servers on a node, or all servers on the panel.';
+
+    /**
+     * @var string
+     */
+    protected $signature = 'p:server:reinstall
+                            {server? : The ID of the server to reinstall.}
+                            {--node= : ID of the node to reinstall all servers on. Ignored if server is passed.}';
+
+    /**
+     * BulkReinstallActionCommand constructor.
+     *
+     * @param \Pterodactyl\Repositories\Wings\DaemonServerRepository $daemonRepository
+     * @param \Pterodactyl\Services\Servers\ServerConfigurationStructureService $configurationStructureService
+     * @param \Pterodactyl\Repositories\Eloquent\ServerRepository $repository
+     */
+    public function __construct(
+        DaemonServerRepository $daemonRepository,
+        ServerConfigurationStructureService $configurationStructureService,
+        ServerRepository $repository
+    ) {
+        parent::__construct();
+
+        $this->configurationStructureService = $configurationStructureService;
+        $this->daemonRepository = $daemonRepository;
+        $this->repository = $repository;
+    }
+
+    /**
+     * Handle command execution.
+     */
+    public function handle()
+    {
+        $servers = $this->getServersToProcess();
+
+        if (! $this->confirm(trans('command/messages.server.reinstall.confirm')) && $this->input->isInteractive()) {
+            return;
+        }
+
+        $bar = $this->output->createProgressBar(count($servers));
+
+        $servers->each(function ($server) use ($bar) {
+            $bar->clear();
+
+            try {
+                $this->daemonRepository->setServer($server)->reinstall();
+            } catch (RequestException $exception) {
+                $this->output->error(trans('command/messages.server.reinstall.failed', [
+                    'name' => $server->name,
+                    'id' => $server->id,
+                    'node' => $server->node->name,
+                    'message' => $exception->getMessage(),
+                ]));
+            }
+
+            $bar->advance();
+            $bar->display();
+        });
+
+        $this->line('');
+    }
+
+    /**
+     * Return the servers to be reinstalled.
+     *
+     * @return \Illuminate\Support\Collection
+     */
+    private function getServersToProcess()
+    {
+        Assert::nullOrIntegerish($this->argument('server'), 'Value passed in server argument must be null or an integer, received %s.');
+        Assert::nullOrIntegerish($this->option('node'), 'Value passed in node option must be null or integer, received %s.');
+
+        return $this->repository->getDataForReinstall($this->argument('server'), $this->option('node'));
+    }
+}

app/Console/Commands/UpgradeCommand.php

@@ -1,197 +0,0 @@
-<?php
-
-namespace Pterodactyl\Console\Commands;
-
-use Closure;
-use Illuminate\Console\Command;
-use Pterodactyl\Console\Kernel;
-use Symfony\Component\Process\Process;
-use Symfony\Component\Console\Helper\ProgressBar;
-
-class UpgradeCommand extends Command
-{
-    protected const DEFAULT_URL = 'https://github.com/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.}
-        {--url= : The specific archive to download.}
-        {--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.';
-
-    /**
-     * Executes an upgrade command which will run through all of our standard
-     * commands for Pterodactyl and enable users to basically just download
-     * the archive and execute this and be done.
-     *
-     * This places the application in maintenance mode as well while the commands
-     * are being executed.
-     *
-     * @throws \Exception
-     */
-    public function handle()
-    {
-        $skipDownload = $this->option('skip-download');
-        if (!$skipDownload) {
-            $this->output->warning('This command does not verify the integrity of downloaded assets. Please ensure that you trust the download source before continuing. If you do not wish to download an archive, please indicate that using the --skip-download flag, or answering "no" to the question below.');
-            $this->output->comment('Download Source (set with --url=):');
-            $this->line($this->getUrl());
-        }
-
-        if (version_compare(PHP_VERSION, '7.4.0') < 0) {
-            $this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 7.4.0, you have [' . PHP_VERSION . '].');
-        }
-
-        $user = 'www-data';
-        $group = 'www-data';
-        if ($this->input->isInteractive()) {
-            if (!$skipDownload) {
-                $skipDownload = !$this->confirm('Would you like to download and unpack the archive files for the latest version?', true);
-            }
-
-            if (is_null($this->option('user'))) {
-                $userDetails = posix_getpwuid(fileowner('public'));
-                $user = $userDetails['name'] ?? 'www-data';
-
-                if (!$this->confirm("Your webserver user has been detected as <fg=blue>[{$user}]:</> is this correct?", true)) {
-                    $user = $this->anticipate(
-                        'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
-                        [
-                            'www-data',
-                            'nginx',
-                            'apache',
-                        ]
-                    );
-                }
-            }
-
-            if (is_null($this->option('group'))) {
-                $groupDetails = posix_getgrgid(filegroup('public'));
-                $group = $groupDetails['name'] ?? 'www-data';
-
-                if (!$this->confirm("Your webserver group has been detected as <fg=blue>[{$group}]:</> is this correct?", true)) {
-                    $group = $this->anticipate(
-                        'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
-                        [
-                            'www-data',
-                            'nginx',
-                            'apache',
-                        ]
-                    );
-                }
-            }
-
-            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);
-        $bar = $this->output->createProgressBar($skipDownload ? 9 : 10);
-        $bar->start();
-
-        if (!$skipDownload) {
-            $this->withProgress($bar, function () {
-                $this->line("\$upgrader> curl -L \"{$this->getUrl()}\" | tar -xzv");
-                $process = Process::fromShellCommandline("curl -L \"{$this->getUrl()}\" | tar -xzv");
-                $process->run(function ($type, $buffer) {
-                    $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-                });
-            });
-        }
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan down');
-            $this->call('down');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> chmod -R 755 storage bootstrap/cache');
-            $process = new Process(['chmod', '-R', '755', 'storage', 'bootstrap/cache']);
-            $process->run(function ($type, $buffer) {
-                $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-            });
-        });
-
-        $this->withProgress($bar, function () {
-            $command = ['composer', 'install', '--no-ansi'];
-            if (config('app.env') === 'production' && !config('app.debug')) {
-                $command[] = '--optimize-autoloader';
-                $command[] = '--no-dev';
-            }
-
-            $this->line('$upgrader> ' . implode(' ', $command));
-            $process = new Process($command);
-            $process->setTimeout(10 * 60);
-            $process->run(function ($type, $buffer) {
-                $this->line($buffer);
-            });
-        });
-
-        /** @var \Illuminate\Foundation\Application $app */
-        $app = require __DIR__ . '/../../../bootstrap/app.php';
-        /** @var \Pterodactyl\Console\Kernel $kernel */
-        $kernel = $app->make(Kernel::class);
-        $kernel->bootstrap();
-        $this->setLaravel($app);
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan view:clear');
-            $this->call('view:clear');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan config:clear');
-            $this->call('config:clear');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan migrate --force --seed');
-            $this->call('migrate', ['--force' => true, '--seed' => true]);
-        });
-
-        $this->withProgress($bar, function () use ($user, $group) {
-            $this->line("\$upgrader> chown -R {$user}:{$group} *");
-            $process = Process::fromShellCommandline("chown -R {$user}:{$group} *", $this->getLaravel()->basePath());
-            $process->setTimeout(10 * 60);
-            $process->run(function ($type, $buffer) {
-                $this->{$type === Process::ERR ? 'error' : 'line'}($buffer);
-            });
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan queue:restart');
-            $this->call('queue:restart');
-        });
-
-        $this->withProgress($bar, function () {
-            $this->line('$upgrader> php artisan up');
-            $this->call('up');
-        });
-
-        $this->newLine(2);
-        $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)
-    {
-        $bar->clear();
-        $callback();
-        $bar->advance();
-        $bar->display();
-    }
-
-    protected function getUrl(): string
-    {
-        if ($this->option('url')) {
-            return $this->option('url');
-        }
-
-        return sprintf(self::DEFAULT_URL, $this->option('release') ? 'download/v' . $this->option('release') : 'latest/download');
-    }
-}

app/Console/Commands/User/DeleteUserCommand.php

@@ -9,10 +9,11 @@
 
 namespace Pterodactyl\Console\Commands\User;
 
-use Pterodactyl\Models\User;
 use Webmozart\Assert\Assert;
+use Pterodactyl\Models\User;
 use Illuminate\Console\Command;
 use Pterodactyl\Services\Users\UserDeletionService;
+use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 
 class DeleteUserCommand extends Command
 {
@@ -38,9 +39,10 @@ class DeleteUserCommand extends Command
 
     /**
      * DeleteUserCommand constructor.
+     *
+     * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService
      */
-    public function __construct(UserDeletionService $deletionService)
-    {
+    public function __construct(UserDeletionService $deletionService) {
         parent::__construct();
 
         $this->deletionService = $deletionService;
@@ -48,7 +50,6 @@ class DeleteUserCommand extends Command
 
     /**
      * @return bool
-     *
      * @throws \Pterodactyl\Exceptions\DisplayException
      */
     public function handle()
@@ -57,9 +58,8 @@ class DeleteUserCommand extends Command
         Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
 
         $results = User::query()
-            ->where('id', 'LIKE', "$search%")
-            ->orWhere('username', 'LIKE', "$search%")
-            ->orWhere('email', 'LIKE', "$search%")
+            ->where('email', 'LIKE', "$search%")
+            ->where('username', 'LIKE', "$search%")
             ->get();
 
         if (count($results) < 1) {
@@ -78,7 +78,7 @@ class DeleteUserCommand extends Command
             }
 
             $this->table(['User ID', 'Email', 'Name'], $tableValues);
-            if (!$deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
+            if (! $deleteUser = $this->ask(trans('command/messages.user.select_search_user'))) {
                 return $this->handle();
             }
         } else {
@@ -91,9 +91,11 @@ class DeleteUserCommand extends Command
             $deleteUser = $results->first();
         }
 
-        if ($this->confirm(trans('command/messages.user.confirm_delete')) || !$this->input->isInteractive()) {
+        if ($this->confirm(trans('command/messages.user.confirm_delete')) || ! $this->input->isInteractive()) {
             $this->deletionService->handle($deleteUser);
             $this->info(trans('command/messages.user.deleted'));
         }
+
+        return;
     }
 }

app/Console/Commands/User/DisableTwoFactorCommand.php

@@ -31,6 +31,8 @@ class DisableTwoFactorCommand extends Command
 
     /**
      * DisableTwoFactorCommand constructor.
+     *
+     * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
      */
     public function __construct(UserRepositoryInterface $repository)
     {

app/Console/Commands/User/MakeUserCommand.php

@@ -31,6 +31,8 @@ class MakeUserCommand extends Command
 
     /**
      * MakeUserCommand constructor.
+     *
+     * @param \Pterodactyl\Services\Users\UserCreationService $creationService
      */
     public function __construct(UserCreationService $creationService)
     {
@@ -53,7 +55,7 @@ class MakeUserCommand extends Command
         $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')) {
+        if (is_null($password = $this->option('password')) && ! $this->option('no-password')) {
             $this->warn(trans('command/messages.user.ask_password_help'));
             $this->line(trans('command/messages.user.ask_password_tip'));
             $password = $this->secret(trans('command/messages.user.ask_password'));

app/Console/Kernel.php

@@ -17,16 +17,19 @@ class Kernel extends ConsoleKernel
 
     /**
      * Define the application's command schedule.
+     *
+     * @param \Illuminate\Console\Scheduling\Schedule $schedule
      */
     protected function schedule(Schedule $schedule)
     {
         // Execute scheduled commands for servers every minute, as if there was a normal cron running.
         $schedule->command('p:schedule:process')->everyMinute()->withoutOverlapping();
 
-        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();
-        }
+        // Every 30 minutes, run the backup pruning command so that any abandoned backups can be removed
+        // from the UI view for the server.
+        $schedule->command('p:maintenance:prune-backups', [
+            '--since-minutes' => '30',
+        ])->everyThirtyMinutes();
 
         // Every day cleanup any internal backups of service files.
         $schedule->command('p:maintenance:clean-service-backups')->daily();

app/Console/RequiresDatabaseMigrations.php

@@ -1,55 +0,0 @@
-<?php
-
-namespace Pterodactyl\Console;
-
-/**
- * @mixin \Illuminate\Console\Command
- */
-trait RequiresDatabaseMigrations
-{
-    /**
-     * Checks if the migrations have finished running by comparing the last migration file.
-     */
-    protected function hasCompletedMigrations(): bool
-    {
-        /** @var \Illuminate\Database\Migrations\Migrator $migrator */
-        $migrator = $this->getLaravel()->make('migrator');
-
-        $files = $migrator->getMigrationFiles(database_path('migrations'));
-
-        if (!$migrator->repositoryExists()) {
-            return false;
-        }
-
-        if (array_diff(array_keys($files), $migrator->getRepository()->getRan())) {
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Throw a massive error into the console to hopefully catch the users attention and get
-     * them to properly run the migrations rather than ignoring all of the other previous
-     * errors...
-     */
-    protected function showMigrationWarning()
-    {
-        $this->getOutput()->writeln('<options=bold>
-| @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
-|                                                                              |
-|               Your database has not been properly migrated!                  |
-|                                                                              |
-| @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |</>
-
-You must run the following command to finish migrating your database:
-
-  <fg=green;options=bold>php artisan migrate --step --force</>
-
-You will not be able to use Pterodactyl Panel as expected without fixing your
-database state by running the command above.
-');
-
-        $this->getOutput()->error('You must correct the error above before continuing.');
-    }
-}

app/Contracts/Core/ReceivesEvents.php

@@ -8,6 +8,8 @@ interface ReceivesEvents
 {
     /**
      * Handles receiving an event from the application.
+     *
+     * @param \Pterodactyl\Events\Event $notification
      */
     public function handle(Event $notification): void;
 }

app/Contracts/Criteria/CriteriaInterface.php

@@ -17,7 +17,7 @@ interface CriteriaInterface
      * Apply selected criteria to a repository call.
      *
      * @param \Illuminate\Database\Eloquent\Model $model
-     *
+     * @param \Pterodactyl\Repositories\Repository $repository
      * @return mixed
      */
     public function apply($model, Repository $repository);

app/Contracts/Extensions/HashidsInterface.php

@@ -18,7 +18,6 @@ interface HashidsInterface extends VendorHashidsInterface
      *
      * @param string $encoded
      * @param null $default
-     *
      * @return mixed
      *
      * @throws \InvalidArgumentException

app/Contracts/Http/ClientPermissionsRequest.php

@@ -8,6 +8,8 @@ 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
      * the given resource (server).
+     *
+     * @return string
      */
     public function permission(): string;
 }

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -2,17 +2,25 @@
 
 namespace Pterodactyl\Contracts\Repository;
 
+use Illuminate\Support\Collection;
+
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return all of the allocations that exist for a node that are not currently
      * allocated.
+     *
+     * @param int $node
+     * @return array
      */
     public function getUnassignedAllocationIds(int $node): array;
 
     /**
      * Return a single allocation from those meeting the requirements.
      *
+     * @param array $nodes
+     * @param array $ports
+     * @param bool $dedicated
      * @return \Pterodactyl\Models\Allocation|null
      */
     public function getRandomAllocation(array $nodes, array $ports, bool $dedicated = false);

app/Contracts/Repository/ApiKeyRepositoryInterface.php

@@ -9,21 +9,35 @@ interface ApiKeyRepositoryInterface extends RepositoryInterface
 {
     /**
      * Get all of the account API keys that exist for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @return \Illuminate\Support\Collection
      */
     public function getAccountKeys(User $user): Collection;
 
     /**
      * Get all of the application API keys that exist for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @return \Illuminate\Support\Collection
      */
     public function getApplicationKeys(User $user): Collection;
 
     /**
      * Delete an account API key from the panel for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @param string $identifier
+     * @return int
      */
     public function deleteAccountKey(User $user, string $identifier): int;
 
     /**
      * Delete an application API key from the panel for a specific user.
+     *
+     * @param \Pterodactyl\Models\User $user
+     * @param string $identifier
+     * @return int
      */
     public function deleteApplicationKey(User $user, string $identifier): int;
 }

app/Contracts/Repository/DatabaseHostRepositoryInterface.php

@@ -9,6 +9,8 @@ interface DatabaseHostRepositoryInterface extends RepositoryInterface
     /**
      * Return database hosts with a count of databases and the node
      * information for which it is attached.
+     *
+     * @return \Illuminate\Support\Collection
      */
     public function getWithViewDetails(): Collection;
 }

app/Contracts/Repository/DatabaseRepositoryInterface.php

@@ -8,60 +8,101 @@ use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 
 interface DatabaseRepositoryInterface extends RepositoryInterface
 {
-    public const DEFAULT_CONNECTION_NAME = 'dynamic';
+    const DEFAULT_CONNECTION_NAME = 'dynamic';
 
     /**
      * Set the connection name to execute statements against.
      *
+     * @param string $connection
      * @return $this
      */
     public function setConnection(string $connection);
 
     /**
      * Return the connection to execute statements against.
+     *
+     * @return string
      */
     public function getConnection(): string;
 
     /**
      * Return all of the databases belonging to a server.
+     *
+     * @param int $server
+     * @return \Illuminate\Support\Collection
      */
     public function getDatabasesForServer(int $server): Collection;
 
     /**
      * Return all of the databases for a given host with the server relationship loaded.
+     *
+     * @param int $host
+     * @param int $count
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
     public function getDatabasesForHost(int $host, int $count = 25): LengthAwarePaginator;
 
+    /**
+     * Create a new database if it does not already exist on the host with
+     * the provided details.
+     *
+     * @param array $data
+     * @return \Pterodactyl\Models\Database
+     *
+     * @throws \Pterodactyl\Exceptions\Model\DataValidationException
+     * @throws \Pterodactyl\Exceptions\Repository\DuplicateDatabaseNameException
+     */
+    public function createIfNotExists(array $data): Database;
+
     /**
      * Create a new database on a given connection.
+     *
+     * @param string $database
+     * @return bool
      */
     public function createDatabase(string $database): bool;
 
     /**
      * Create a new database user on a given connection.
      *
+     * @param string $username
+     * @param string $remote
+     * @param string $password
      * @param $max_connections
+     * @return bool
      */
     public function createUser(string $username, string $remote, string $password, string $max_connections): bool;
 
     /**
      * Give a specific user access to a given database.
+     *
+     * @param string $database
+     * @param string $username
+     * @param string $remote
+     * @return bool
      */
     public function assignUserToDatabase(string $database, string $username, string $remote): bool;
 
     /**
      * Flush the privileges for a given connection.
+     *
+     * @return bool
      */
     public function flush(): bool;
 
     /**
      * Drop a given database on a specific connection.
+     *
+     * @param string $database
+     * @return bool
      */
     public function dropDatabase(string $database): bool;
 
     /**
      * Drop a given user on a specific connection.
      *
+     * @param string $username
+     * @param string $remote
      * @return mixed
      */
     public function dropUser(string $username, string $remote): bool;

app/Contracts/Repository/EggRepositoryInterface.php

@@ -17,12 +17,17 @@ interface EggRepositoryInterface extends RepositoryInterface
     /**
      * Return an egg with the variables relation attached.
      *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithVariables(int $id): Egg;
 
     /**
      * Return all eggs and their relations to be used in the daemon API.
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     public function getAllWithCopyAttributes(): Collection;
 
@@ -30,18 +35,27 @@ interface EggRepositoryInterface extends RepositoryInterface
      * Return an egg with the scriptFrom and configFrom relations loaded onto the model.
      *
      * @param int|string $value
+     * @param string $column
+     * @return \Pterodactyl\Models\Egg
      */
     public function getWithCopyAttributes($value, string $column = 'id'): Egg;
 
     /**
      * Return all of the data needed to export a service.
      *
+     * @param int $id
+     * @return \Pterodactyl\Models\Egg
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithExportAttributes(int $id): Egg;
 
     /**
      * Confirm a copy script belongs to the same nest as the item trying to use it.
+     *
+     * @param int $copyFromId
+     * @param int $service
+     * @return bool
      */
     public function isCopyableScript(int $copyFromId, int $service): bool;
 }

app/Contracts/Repository/EggVariableRepositoryInterface.php

@@ -16,6 +16,9 @@ interface EggVariableRepositoryInterface extends RepositoryInterface
     /**
      * Return editable variables for a given egg. Editable variables must be set to
      * user viewable in order to be picked up by this function.
+     *
+     * @param int $egg
+     * @return \Illuminate\Support\Collection
      */
     public function getEditableVariables(int $egg): Collection;
 }

app/Contracts/Repository/LocationRepositoryInterface.php

@@ -9,17 +9,22 @@ interface LocationRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return locations with a count of nodes and servers attached to it.
+     *
+     * @return \Illuminate\Support\Collection
      */
     public function getAllWithDetails(): Collection;
 
     /**
      * Return all of the available locations with the nodes as a relationship.
+     *
+     * @return \Illuminate\Support\Collection
      */
     public function getAllWithNodes(): Collection;
 
     /**
      * Return all of the nodes and their respective count of servers for a location.
      *
+     * @param int $id
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -29,6 +34,7 @@ interface LocationRepositoryInterface extends RepositoryInterface
     /**
      * Return a location and the count of nodes in that location.
      *
+     * @param int $id
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException

app/Contracts/Repository/NestRepositoryInterface.php

@@ -17,7 +17,6 @@ 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
@@ -27,6 +26,7 @@ interface NestRepositoryInterface extends RepositoryInterface
     /**
      * Return a nest or all nests and the count of eggs and servers for that nest.
      *
+     * @param int|null $id
      * @return \Pterodactyl\Models\Nest|\Illuminate\Database\Eloquent\Collection
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -36,6 +36,9 @@ interface NestRepositoryInterface extends RepositoryInterface
     /**
      * Return a nest along with its associated eggs and the servers relation on those eggs.
      *
+     * @param int $id
+     * @return \Pterodactyl\Models\Nest
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithEggServers(int $id): Nest;

app/Contracts/Repository/NodeRepositoryInterface.php

@@ -4,35 +4,65 @@ namespace Pterodactyl\Contracts\Repository;
 
 use Pterodactyl\Models\Node;
 use Illuminate\Support\Collection;
+use Illuminate\Support\LazyCollection;
+use Illuminate\Contracts\Pagination\LengthAwarePaginator;
+use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
 
 interface NodeRepositoryInterface extends RepositoryInterface
 {
-    public const THRESHOLD_PERCENTAGE_LOW = 75;
-    public const THRESHOLD_PERCENTAGE_MEDIUM = 90;
+    const THRESHOLD_PERCENTAGE_LOW = 75;
+    const THRESHOLD_PERCENTAGE_MEDIUM = 90;
 
     /**
      * Return the usage stats for a single node.
+     *
+     * @param \Pterodactyl\Models\Node $node
+     * @return array
      */
     public function getUsageStats(Node $node): array;
 
     /**
      * Return the usage stats for a single node.
+     *
+     * @param \Pterodactyl\Models\Node $node
+     * @return array
      */
     public function getUsageStatsRaw(Node $node): array;
 
     /**
      * Return a single node with location and server information.
+     *
+     * @param \Pterodactyl\Models\Node $node
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Node
      */
     public function loadLocationAndServerCount(Node $node, bool $refresh = false): Node;
 
     /**
      * Attach a paginated set of allocations to a node mode including
      * any servers that are also attached to those allocations.
+     *
+     * @param \Pterodactyl\Models\Node $node
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Node
      */
     public function loadNodeAllocations(Node $node, bool $refresh = false): Node;
 
     /**
      * Return a collection of nodes for all locations to use in server creation UI.
+     *
+     * @return \Illuminate\Support\Collection
      */
     public function getNodesForServerCreation(): Collection;
+
+    /**
+     * Return the IDs of all nodes that exist in the provided locations and have the space
+     * available to support the additional disk and memory provided.
+     *
+     * @param array $locations
+     * @param int $disk
+     * @param int $memory
+     * @return \Illuminate\Support\LazyCollection
+     */
+    public function getNodesWithResourceUse(array $locations, int $disk, int $memory): LazyCollection;
 }

app/Contracts/Repository/RepositoryInterface.php

@@ -39,7 +39,6 @@ interface RepositoryInterface
      * An array of columns to filter the response by.
      *
      * @param array|string $columns
-     *
      * @return $this
      */
     public function setColumns($columns = ['*']);
@@ -63,6 +62,7 @@ interface RepositoryInterface
      * Set whether or not the repository should return a fresh model
      * when changes are committed.
      *
+     * @param bool $fresh
      * @return $this
      */
     public function setFreshModel(bool $fresh = true);
@@ -70,6 +70,9 @@ interface RepositoryInterface
     /**
      * Create a new model instance and persist it to the database.
      *
+     * @param array $fields
+     * @param bool $validate
+     * @param bool $force
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -79,6 +82,7 @@ interface RepositoryInterface
     /**
      * Find a model that has the specific ID passed.
      *
+     * @param int $id
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -87,12 +91,16 @@ interface RepositoryInterface
 
     /**
      * Find a model matching an array of where clauses.
+     *
+     * @param array $fields
+     * @return \Illuminate\Support\Collection
      */
     public function findWhere(array $fields): Collection;
 
     /**
      * Find and return the first matching instance for the given fields.
      *
+     * @param array $fields
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
@@ -101,16 +109,25 @@ interface RepositoryInterface
 
     /**
      * Return a count of records matching the passed arguments.
+     *
+     * @param array $fields
+     * @return int
      */
     public function findCountWhere(array $fields): int;
 
     /**
      * Delete a given record from the database.
+     *
+     * @param int $id
+     * @return int
      */
     public function delete(int $id): int;
 
     /**
      * Delete records matching the given attributes.
+     *
+     * @param array $attributes
+     * @return int
      */
     public function deleteWhere(array $attributes): int;
 
@@ -118,7 +135,9 @@ interface RepositoryInterface
      * Update a given ID with the passed array of fields.
      *
      * @param int $id
-     *
+     * @param array $fields
+     * @param bool $validate
+     * @param bool $force
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -129,12 +148,21 @@ interface RepositoryInterface
     /**
      * Perform a mass update where matching records are updated using whereIn.
      * This does not perform any model data validation.
+     *
+     * @param string $column
+     * @param array $values
+     * @param array $fields
+     * @return int
      */
     public function updateWhereIn(string $column, array $values, array $fields): int;
 
     /**
      * Update a record if it exists in the database, otherwise create it.
      *
+     * @param array $where
+     * @param array $fields
+     * @param bool $validate
+     * @param bool $force
      * @return mixed
      *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
@@ -143,27 +171,40 @@ interface RepositoryInterface
 
     /**
      * Return all records associated with the given model.
+     *
+     * @return Collection
      */
     public function all(): Collection;
 
     /**
      * Return a paginated result set using a search term if set on the repository.
+     *
+     * @param int $perPage
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
     public function paginated(int $perPage): LengthAwarePaginator;
 
     /**
      * Insert a single or multiple records into the database at once skipping
      * validation and mass assignment checking.
+     *
+     * @param array $data
+     * @return bool
      */
     public function insert(array $data): bool;
 
     /**
      * Insert multiple records into the database and ignore duplicates.
+     *
+     * @param array $values
+     * @return bool
      */
     public function insertIgnore(array $values): bool;
 
     /**
      * Get the amount of entries in the database.
+     *
+     * @return int
      */
     public function count(): int;
 }

app/Contracts/Repository/ScheduleRepositoryInterface.php

@@ -9,13 +9,37 @@ interface ScheduleRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return all of the schedules for a given server.
+     *
+     * @param int $server
+     * @return \Illuminate\Support\Collection
      */
     public function findServerSchedules(int $server): Collection;
 
+    /**
+     * Load the tasks relationship onto the Schedule module if they are not
+     * already present.
+     *
+     * @param \Pterodactyl\Models\Schedule $schedule
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Schedule
+     */
+    public function loadTasks(Schedule $schedule, bool $refresh = false): Schedule;
+
     /**
      * Return a schedule model with all of the associated tasks as a relationship.
      *
+     * @param int $schedule
+     * @return \Pterodactyl\Models\Schedule
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getScheduleWithTasks(int $schedule): Schedule;
+
+    /**
+     * Return all of the schedules that should be processed.
+     *
+     * @param string $timestamp
+     * @return \Illuminate\Support\Collection
+     */
+    public function getSchedulesToProcess(string $timestamp): Collection;
 }

app/Contracts/Repository/ServerRepositoryInterface.php

@@ -10,22 +10,37 @@ interface ServerRepositoryInterface extends RepositoryInterface
 {
     /**
      * Load the egg relations onto the server model.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Server
      */
     public function loadEggRelations(Server $server, bool $refresh = false): Server;
 
     /**
      * Return a collection of servers with their associated data for rebuild operations.
+     *
+     * @param int|null $server
+     * @param int|null $node
+     * @return \Illuminate\Support\Collection
      */
     public function getDataForRebuild(int $server = null, int $node = null): Collection;
 
     /**
      * Return a collection of servers with their associated data for reinstall operations.
+     *
+     * @param int|null $server
+     * @param int|null $node
+     * @return \Illuminate\Support\Collection
      */
     public function getDataForReinstall(int $server = null, int $node = null): Collection;
 
     /**
      * Return a server model and all variables associated with the server.
      *
+     * @param int $id
+     * @return \Pterodactyl\Models\Server
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function findWithVariables(int $id): Server;
@@ -34,16 +49,28 @@ interface ServerRepositoryInterface extends RepositoryInterface
      * Get the primary allocation for a given server. If a model is passed into
      * the function, load the allocation relationship onto it. Otherwise, find and
      * return the server from the database.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Server
      */
     public function getPrimaryAllocation(Server $server, bool $refresh = false): Server;
 
     /**
      * Return enough data to be used for the creation of a server via the daemon.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Server
      */
     public function getDataForCreation(Server $server, bool $refresh = false): Server;
 
     /**
      * Load associated databases onto the server model.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Server
      */
     public function loadDatabaseRelations(Server $server, bool $refresh = false): Server;
 
@@ -51,23 +78,77 @@ interface ServerRepositoryInterface extends RepositoryInterface
      * Get data for use when updating a server on the Daemon. Returns an array of
      * the egg which is used for build and rebuild. Only loads relations
      * if they are missing, or refresh is set to true.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @param bool $refresh
+     * @return array
      */
     public function getDaemonServiceData(Server $server, bool $refresh = false): array;
 
     /**
      * Return a server by UUID.
      *
+     * @param string $uuid
+     * @return \Pterodactyl\Models\Server
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getByUuid(string $uuid): Server;
 
+    /**
+     * Return all of the servers that should have a power action performed against them.
+     *
+     * @param int[] $servers
+     * @param int[] $nodes
+     * @param bool $returnCount
+     * @return int|\Illuminate\Support\LazyCollection
+     */
+    public function getServersForPowerAction(array $servers = [], array $nodes = [], bool $returnCount = false);
+
+    /**
+     * Return the total number of servers that will be affected by the query.
+     *
+     * @param int[] $servers
+     * @param int[] $nodes
+     * @return int
+     */
+    public function getServersForPowerActionCount(array $servers = [], array $nodes = []): int;
+
     /**
      * Check if a given UUID and UUID-Short string are unique to a server.
+     *
+     * @param string $uuid
+     * @param string $short
+     * @return bool
      */
     public function isUniqueUuidCombo(string $uuid, string $short): bool;
 
+    /**
+     * Get the amount of servers that are suspended.
+     *
+     * @return int
+     */
+    public function getSuspendedServersCount(): int;
+
     /**
      * Returns all of the servers that exist for a given node in a paginated response.
+     *
+     * @param int $node
+     * @param int $limit
+     *
+     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
      */
     public function loadAllServersForNode(int $node, int $limit): LengthAwarePaginator;
+
+    /**
+     * Returns every server that exists for a given node.
+     *
+     * This is different from {@see loadAllServersForNode} because
+     * it does not paginate the response.
+     *
+     * @param int $node
+     *
+     * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection
+     */
+    public function loadEveryServerForNode(int $node);
 }

app/Contracts/Repository/SessionRepositoryInterface.php

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

app/Contracts/Repository/SettingsRepositoryInterface.php

@@ -7,6 +7,9 @@ interface SettingsRepositoryInterface extends RepositoryInterface
     /**
      * Store a new persistent setting in the database.
      *
+     * @param string $key
+     * @param string|null $value
+     *
      * @throws \Pterodactyl\Exceptions\Model\DataValidationException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
@@ -15,14 +18,16 @@ interface SettingsRepositoryInterface extends RepositoryInterface
     /**
      * Retrieve a persistent setting from the database.
      *
+     * @param string $key
      * @param mixed $default
-     *
      * @return mixed
      */
     public function get(string $key, $default);
 
     /**
      * Remove a key from the database cache.
+     *
+     * @param string $key
      */
     public function forget(string $key);
 }

app/Contracts/Repository/SubuserRepositoryInterface.php

@@ -8,17 +8,29 @@ interface SubuserRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return a subuser with the associated server relationship.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Subuser
      */
     public function loadServerAndUserRelations(Subuser $subuser, bool $refresh = false): Subuser;
 
     /**
      * Return a subuser with the associated permissions relationship.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
+     * @param bool $refresh
+     * @return \Pterodactyl\Models\Subuser
      */
     public function getWithPermissions(Subuser $subuser, bool $refresh = false): Subuser;
 
     /**
      * Return a subuser and associated permissions given a user_id and server_id.
      *
+     * @param int $user
+     * @param int $server
+     * @return \Pterodactyl\Models\Subuser
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getWithPermissionsUsingUserAndServer(int $user, int $server): Subuser;

app/Contracts/Repository/TaskRepositoryInterface.php

@@ -9,6 +9,9 @@ interface TaskRepositoryInterface extends RepositoryInterface
     /**
      * Get a task and the server relationship for that task.
      *
+     * @param int $id
+     * @return \Pterodactyl\Models\Task
+     *
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function getTaskForJobProcess(int $id): Task;
@@ -16,6 +19,8 @@ interface TaskRepositoryInterface extends RepositoryInterface
     /**
      * Returns the next task in a schedule.
      *
+     * @param int $schedule
+     * @param int $index
      * @return \Pterodactyl\Models\Task|null
      */
     public function getNextTask(int $schedule, int $index);

app/Events/Server/Created.php

@@ -25,6 +25,8 @@ class Created
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Creating.php

@@ -25,6 +25,8 @@ class Creating
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Deleted.php

@@ -25,6 +25,8 @@ class Deleted
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Deleting.php

@@ -25,6 +25,8 @@ class Deleting
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Saved.php

@@ -25,6 +25,8 @@ class Saved
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Saving.php

@@ -25,6 +25,8 @@ class Saving
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Updated.php

@@ -25,6 +25,8 @@ class Updated
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Server/Updating.php

@@ -25,6 +25,8 @@ class Updating
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Server $server
      */
     public function __construct(Server $server)
     {

app/Events/Subuser/Created.php

@@ -25,6 +25,8 @@ class Created
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
      */
     public function __construct(Subuser $subuser)
     {

app/Events/Subuser/Creating.php

@@ -25,6 +25,8 @@ class Creating
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
      */
     public function __construct(Subuser $subuser)
     {

app/Events/Subuser/Deleted.php

@@ -25,6 +25,8 @@ class Deleted
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
      */
     public function __construct(Subuser $subuser)
     {

app/Events/Subuser/Deleting.php

@@ -25,6 +25,8 @@ class Deleting
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\Subuser $subuser
      */
     public function __construct(Subuser $subuser)
     {

app/Events/User/Created.php

@@ -25,6 +25,8 @@ class Created
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\User $user
      */
     public function __construct(User $user)
     {

app/Events/User/Creating.php

@@ -25,6 +25,8 @@ class Creating
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\User $user
      */
     public function __construct(User $user)
     {

app/Events/User/Deleted.php

@@ -25,6 +25,8 @@ class Deleted
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\User $user
      */
     public function __construct(User $user)
     {

app/Events/User/Deleting.php

@@ -25,6 +25,8 @@ class Deleting
 
     /**
      * Create a new event instance.
+     *
+     * @param \Pterodactyl\Models\User $user
      */
     public function __construct(User $user)
     {

app/Exceptions/DisplayException.php

@@ -11,10 +11,10 @@ use Prologue\Alerts\AlertsMessageBag;
 
 class DisplayException extends PterodactylException
 {
-    public const LEVEL_DEBUG = 'debug';
-    public const LEVEL_INFO = 'info';
-    public const LEVEL_WARNING = 'warning';
-    public const LEVEL_ERROR = 'error';
+    const LEVEL_DEBUG = 'debug';
+    const LEVEL_INFO = 'info';
+    const LEVEL_WARNING = 'warning';
+    const LEVEL_ERROR = 'error';
 
     /**
      * @var string
@@ -25,6 +25,7 @@ class DisplayException extends PterodactylException
      * Exception constructor.
      *
      * @param string $message
+     * @param Throwable|null $previous
      * @param string $level
      * @param int $code
      */
@@ -57,7 +58,6 @@ class DisplayException extends PterodactylException
      * request originated from an API hit, return the error in JSONAPI spec format.
      *
      * @param \Illuminate\Http\Request $request
-     *
      * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     public function render($request)
@@ -83,7 +83,7 @@ class DisplayException extends PterodactylException
      */
     public function report()
     {
-        if (!$this->getPrevious() instanceof Exception || !Handler::isReportable($this->getPrevious())) {
+        if (! $this->getPrevious() instanceof Exception || ! Handler::isReportable($this->getPrevious())) {
             return null;
         }
 

app/Exceptions/Handler.php

@@ -5,14 +5,10 @@ namespace Pterodactyl\Exceptions;
 use Exception;
 use Throwable;
 use PDOException;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Str;
+use Psr\Log\LoggerInterface;
 use Swift_TransportException;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Collection;
 use Illuminate\Container\Container;
 use Illuminate\Database\Connection;
-use Illuminate\Foundation\Application;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Session\TokenMismatchException;
 use Illuminate\Validation\ValidationException;
@@ -21,7 +17,6 @@ use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Pterodactyl\Exceptions\Repository\RecordNotFoundException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
 class Handler extends ExceptionHandler
 {
@@ -47,6 +42,17 @@ class Handler extends ExceptionHandler
         ValidationException::class,
     ];
 
+    /**
+     * A list of exceptions that should be logged with cleaned stack
+     * traces to avoid exposing credentials or other sensitive information.
+     *
+     * @var array
+     */
+    protected $cleanStacks = [
+        PDOException::class,
+        Swift_TransportException::class,
+    ];
+
     /**
      * A list of the inputs that are never flashed for validation exceptions.
      *
@@ -60,40 +66,56 @@ class Handler extends ExceptionHandler
     ];
 
     /**
-     * Registers the exception handling callbacks for the application. This
-     * will capture specific exception types that we do not want to include
-     * the detailed stack traces for since they could reveal credentials to
-     * whoever can read the logs.
+     * Report or log an exception. Skips Laravel's internal reporter since we
+     * don't need or want the user information in our logs by default.
      *
-     * @noinspection PhpUnusedLocalVariableInspection
+     * If you want to implement logging in a different format to integrate with
+     * services such as AWS Cloudwatch or other monitoring you can replace the
+     * contents of this function with a call to the parent reporter.
+     *
+     * @param \Throwable $exception
+     * @return mixed
+     *
+     * @throws \Throwable
      */
-    public function register()
+    public function report(Throwable $exception)
     {
-        if (config('app.exceptions.report_all', false)) {
-            $this->dontReport = [];
+        if (! config('app.exceptions.report_all', false) && $this->shouldntReport($exception)) {
+            return null;
         }
 
-        $this->reportable(function (PDOException $ex) {
-            $ex = $this->generateCleanedExceptionStack($ex);
-        });
-
-        $this->reportable(function (Swift_TransportException $ex) {
-            $ex = $this->generateCleanedExceptionStack($ex);
-        });
+        if (method_exists($exception, 'report')) {
+            return $exception->report();
         }
 
-    private function generateCleanedExceptionStack(Throwable $exception): string
+        try {
+            $logger = $this->container->make(LoggerInterface::class);
+        } catch (Exception $ex) {
+            throw $exception;
+        }
+
+        foreach ($this->cleanStacks as $class) {
+            if ($exception instanceof $class) {
+                $exception = $this->generateCleanedExceptionStack($exception);
+                break;
+            }
+        }
+
+        return $logger->error($exception);
+    }
+
+    private function generateCleanedExceptionStack(Throwable $exception)
     {
         $cleanedStack = '';
         foreach ($exception->getTrace() as $index => $item) {
             $cleanedStack .= sprintf(
                 "#%d %s(%d): %s%s%s\n",
                 $index,
-                Arr::get($item, 'file'),
-                Arr::get($item, 'line'),
-                Arr::get($item, 'class'),
-                Arr::get($item, 'type'),
-                Arr::get($item, 'function')
+                array_get($item, 'file'),
+                array_get($item, 'line'),
+                array_get($item, 'class'),
+                array_get($item, 'type'),
+                array_get($item, 'function')
             );
         }
 
@@ -112,14 +134,14 @@ class Handler extends ExceptionHandler
      * Render an exception into an HTTP response.
      *
      * @param \Illuminate\Http\Request $request
-     *
+     * @param \Throwable $exception
      * @return \Symfony\Component\HttpFoundation\Response
      *
      * @throws \Throwable
      */
     public function render($request, Throwable $exception)
     {
-        $connections = $this->container->make(Connection::class);
+        $connections = Container::getInstance()->make(Connection::class);
 
         // If we are currently wrapped up inside a transaction, we will roll all the way
         // back to the beginning. This needs to happen, otherwise session data does not
@@ -142,34 +164,33 @@ class Handler extends ExceptionHandler
      * calls to the API.
      *
      * @param \Illuminate\Http\Request $request
-     *
+     * @param \Illuminate\Validation\ValidationException $exception
      * @return \Illuminate\Http\JsonResponse
      */
     public function invalidJson($request, ValidationException $exception)
     {
-        $codes = Collection::make($exception->validator->failed())->mapWithKeys(function ($reasons, $field) {
+        $codes = collect($exception->validator->failed())->mapWithKeys(function ($reasons, $field) {
             $cleaned = [];
             foreach ($reasons as $reason => $attrs) {
-                $cleaned[] = Str::snake($reason);
+                $cleaned[] = snake_case($reason);
             }
 
             return [str_replace('.', '_', $field) => $cleaned];
         })->toArray();
 
-        $errors = Collection::make($exception->errors())->map(function ($errors, $field) use ($codes, $exception) {
+        $errors = collect($exception->errors())->map(function ($errors, $field) use ($codes, $exception) {
             $response = [];
             foreach ($errors as $key => $error) {
                 $meta = [
                     'source_field' => $field,
-                    'rule' => str_replace(self::PTERODACTYL_RULE_STRING, 'p_', Arr::get(
-                        $codes,
-                        str_replace('.', '_', $field) . '.' . $key
+                    'rule' => str_replace(self::PTERODACTYL_RULE_STRING, 'p_', array_get(
+                        $codes, str_replace('.', '_', $field) . '.' . $key
                     )),
                 ];
 
                 $converted = self::convertToArray($exception)['errors'][0];
                 $converted['detail'] = $error;
-                $converted['meta'] = is_array($converted['meta'] ?? null) ? array_merge($converted['meta'], $meta) : $meta;
+                $converted['meta'] = is_array($converted['meta']) ? array_merge($converted['meta'], $meta) : $meta;
 
                 $response[] = $converted;
             }
@@ -184,6 +205,10 @@ class Handler extends ExceptionHandler
 
     /**
      * Return the exception as a JSONAPI representation for use on API requests.
+     *
+     * @param \Throwable $exception
+     * @param array $override
+     * @return array
      */
     public static function convertToArray(Throwable $exception, array $override = []): array
     {
@@ -192,9 +217,7 @@ class Handler extends ExceptionHandler
             'status' => method_exists($exception, 'getStatusCode')
                 ? strval($exception->getStatusCode())
                 : ($exception instanceof ValidationException ? '422' : '500'),
-            'detail' => $exception instanceof HttpExceptionInterface
-                ? $exception->getMessage()
-                : 'An unexpected error was encountered while processing this request, please try again.',
+            'detail' => 'An error was encountered while processing this request.',
         ];
 
         if ($exception instanceof ModelNotFoundException || $exception->getPrevious() instanceof ModelNotFoundException) {
@@ -209,7 +232,7 @@ class Handler extends ExceptionHandler
                 'detail' => $exception->getMessage(),
                 'source' => [
                     'line' => $exception->getLine(),
-                    'file' => str_replace(Application::getInstance()->basePath(), '', $exception->getFile()),
+                    'file' => str_replace(base_path(), '', $exception->getFile()),
                 ],
                 'meta' => [
                     'trace' => explode("\n", $exception->getTraceAsString()),
@@ -222,6 +245,9 @@ class Handler extends ExceptionHandler
 
     /**
      * Return an array of exceptions that should not be reported.
+     *
+     * @param \Exception $exception
+     * @return bool
      */
     public static function isReportable(Exception $exception): bool
     {
@@ -232,22 +258,23 @@ class Handler extends ExceptionHandler
      * Convert an authentication exception into an unauthenticated response.
      *
      * @param \Illuminate\Http\Request $request
-     *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     * @param \Illuminate\Auth\AuthenticationException $exception
+     * @return \Illuminate\Http\Response
      */
     protected function unauthenticated($request, AuthenticationException $exception)
     {
         if ($request->expectsJson()) {
-            return new JsonResponse(self::convertToArray($exception), JsonResponse::HTTP_UNAUTHORIZED);
+            return response()->json(self::convertToArray($exception), 401);
         }
 
-        return $this->container->make('redirect')->guest('/auth/login');
+        return redirect()->guest(route('auth.login'));
     }
 
     /**
      * Converts an exception into an array to render in the response. Overrides
      * Laravel's built-in converter to output as a JSONAPI spec compliant object.
      *
+     * @param \Throwable $exception
      * @return array
      */
     protected function convertExceptionToArray(Throwable $exception)

app/Exceptions/Http/Connection/DaemonConnectionException.php

@@ -2,8 +2,8 @@
 
 namespace Pterodactyl\Exceptions\Http\Connection;
 
+use Illuminate\Support\Arr;
 use Illuminate\Http\Response;
-use Illuminate\Support\Facades\Log;
 use GuzzleHttp\Exception\GuzzleException;
 use Pterodactyl\Exceptions\DisplayException;
 
@@ -17,49 +17,33 @@ class DaemonConnectionException extends DisplayException
      */
     private $statusCode = Response::HTTP_GATEWAY_TIMEOUT;
 
-    /**
-     * Every request to the Wings instance will return a unique X-Request-Id header
-     * which allows for all errors to be efficiently tied to a specific request that
-     * triggered them, and gives users a more direct method of informing hosts when
-     * something goes wrong.
-     *
-     * @var string|null
-     */
-    private $requestId;
-
     /**
      * Throw a displayable exception caused by a daemon connection error.
+     *
+     * @param \GuzzleHttp\Exception\GuzzleException $previous
+     * @param bool $useStatusCode
      */
     public function __construct(GuzzleException $previous, bool $useStatusCode = true)
     {
         /** @var \GuzzleHttp\Psr7\Response|null $response */
         $response = method_exists($previous, 'getResponse') ? $previous->getResponse() : null;
-        $this->requestId = $response ? $response->getHeaderLine('X-Request-Id') : null;
 
         if ($useStatusCode) {
             $this->statusCode = is_null($response) ? $this->statusCode : $response->getStatusCode();
-            // There are rare conditions where wings encounters a panic condition and crashes the
-            // request being made after content has already been sent over the wire. In these cases
-            // you can end up with a "successful" response code that is actual an error.
-            //
-            // Handle those better here since we shouldn't ever end up in this exception state and
-            // be returning a 2XX level response.
-            if ($this->statusCode < 400) {
-                $this->statusCode = Response::HTTP_BAD_GATEWAY;
-            }
         }
 
-        if (is_null($response)) {
-            $message = 'Could not establish a connection to the machine running this server. Please try again.';
-        } else {
-            $message = sprintf('There was an error while communicating with the machine running this server. This error has been logged, please try again. (code: %s) (request_id: %s)', $response->getStatusCode(), $this->requestId ?? '<nil>');
-        }
+        $message = trans('admin/server.exceptions.daemon_exception', [
+            'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
+        ]);
 
         // Attempt to pull the actual error message off the response and return that if it is not
         // a 500 level error.
-        if ($this->statusCode < 500 && !is_null($response)) {
-            $body = json_decode($response->getBody()->__toString(), true);
-            $message = sprintf('An error occurred on the remote host: %s. (request id: %s)', $body['error'] ?? $message, $this->requestId ?? '<nil>');
+        if ($this->statusCode < 500 && ! is_null($response)) {
+            $body = $response->getBody();
+            if (is_string($body) || (is_object($body) && method_exists($body, '__toString'))) {
+                $body = json_decode(is_string($body) ? $body : $body->__toString(), true);
+                $message = "[Wings Error]: " . Arr::get($body, 'error', $message);
+            }
         }
 
         $level = $this->statusCode >= 500 && $this->statusCode !== 504
@@ -69,19 +53,6 @@ class DaemonConnectionException extends DisplayException
         parent::__construct($message, $previous, $level);
     }
 
-    /**
-     * Override the default reporting method for DisplayException by just logging immediately
-     * here and including the specific X-Request-Id header that was returned by the call.
-     *
-     * @return void
-     */
-    public function report()
-    {
-        Log::{$this->getErrorLevel()}($this->getPrevious(), [
-            'request_id' => $this->requestId,
-        ]);
-    }
-
     /**
      * Return the HTTP status code for this exception.
      *
@@ -91,12 +62,4 @@ class DaemonConnectionException extends DisplayException
     {
         return $this->statusCode;
     }
-
-    /**
-     * @return string|null
-     */
-    public function getRequestId()
-    {
-        return $this->requestId;
-    }
 }

app/Exceptions/Http/HttpForbiddenException.php

@@ -9,6 +9,9 @@ class HttpForbiddenException extends HttpException
 {
     /**
      * HttpForbiddenException constructor.
+     *
+     * @param string|null $message
+     * @param \Throwable|null $previous
      */
     public function __construct(string $message = null, \Throwable $previous = null)
     {

app/Exceptions/Http/Server/ServerStateConflictException.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Pterodactyl\Exceptions\Http\Server;
-
-use Throwable;
-use Pterodactyl\Models\Server;
-use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
-
-class ServerStateConflictException extends ConflictHttpException
-{
-    /**
-     * Exception thrown when the server is in an unsupported state for API access or
-     * certain operations within the codebase.
-     */
-    public function __construct(Server $server, Throwable $previous = null)
-    {
-        $message = 'This server is currently in an unsupported state, please try again later.';
-        if ($server->isSuspended()) {
-            $message = 'This server is currently suspended and the functionality requested is unavailable.';
-        } elseif (!$server->isInstalled()) {
-            $message = 'This server has not yet completed its installation process, please try again later.';
-        } elseif ($server->status === Server::STATUS_RESTORING_BACKUP) {
-            $message = 'This server is currently restoring from a backup, please try again later.';
-        } elseif (!is_null($server->transfer)) {
-            $message = 'This server is currently being transferred to a new machine, please try again later.';
-        }
-
-        parent::__construct($message, $previous);
-    }
-}

app/Exceptions/Http/TwoFactorAuthRequiredException.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Pterodactyl\Exceptions\Http;
-
-use Throwable;
-use Illuminate\Http\Response;
-use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
-
-class TwoFactorAuthRequiredException extends HttpException implements HttpExceptionInterface
-{
-    /**
-     * TwoFactorAuthRequiredException constructor.
-     */
-    public function __construct(Throwable $previous = null)
-    {
-        parent::__construct(Response::HTTP_BAD_REQUEST, 'Two-factor authentication is required on this account in order to access this endpoint.', $previous);
-    }
-}

app/Exceptions/Model/DataValidationException.php

@@ -18,6 +18,8 @@ class DataValidationException extends PterodactylException implements HttpExcept
 
     /**
      * DataValidationException constructor.
+     *
+     * @param \Illuminate\Contracts\Validation\Validator $validator
      */
     public function __construct(Validator $validator)
     {

app/Exceptions/Service/Allocation/AutoAllocationNotEnabledException.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Pterodactyl\Exceptions\Service\Allocation;
-
-use Pterodactyl\Exceptions\DisplayException;
-
-class AutoAllocationNotEnabledException extends DisplayException
-{
-    /**
-     * AutoAllocationNotEnabledException constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'Server auto-allocation is not enabled for this instance.'
-        );
-    }
-}

app/Exceptions/Service/Allocation/NoAutoAllocationSpaceAvailableException.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace Pterodactyl\Exceptions\Service\Allocation;
-
-use Pterodactyl\Exceptions\DisplayException;
-
-class NoAutoAllocationSpaceAvailableException extends DisplayException
-{
-    /**
-     * NoAutoAllocationSpaceAvailableException constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            'Cannot assign additional allocation: no more space available on node.'
-        );
-    }
-}

app/Exceptions/Service/Backup/BackupLockedException.php

@@ -1,16 +0,0 @@
-<?php
-
-namespace Pterodactyl\Exceptions\Service\Backup;
-
-use Pterodactyl\Exceptions\DisplayException;
-
-class BackupLockedException extends DisplayException
-{
-    /**
-     * TooManyBackupsException constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct('Cannot delete a backup that is marked as locked.');
-    }
-}

app/Exceptions/Service/Backup/TooManyBackupsException.php

@@ -8,6 +8,8 @@ class TooManyBackupsException extends DisplayException
 {
     /**
      * TooManyBackupsException constructor.
+     *
+     * @param int $backupLimit
      */
     public function __construct(int $backupLimit)
     {

app/Exceptions/Service/ServiceLimitExceededException.php

@@ -10,6 +10,9 @@ class ServiceLimitExceededException extends DisplayException
     /**
      * Exception thrown when something goes over a defined limit, such as allocated
      * ports, tasks, databases, etc.
+     *
+     * @param string $message
+     * @param \Throwable|null $previous
      */
     public function __construct(string $message, Throwable $previous = null)
     {

app/Exceptions/Service/User/TwoFactorAuthenticationTokenInvalid.php

@@ -6,11 +6,4 @@ use Pterodactyl\Exceptions\DisplayException;
 
 class TwoFactorAuthenticationTokenInvalid extends DisplayException
 {
-    /**
-     * TwoFactorAuthenticationTokenInvalid constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct('The provided two-factor authentication token was not valid.');
-    }
 }

app/Extensions/Backups/BackupManager.php

@@ -8,7 +8,6 @@ use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Webmozart\Assert\Assert;
 use InvalidArgumentException;
-use Illuminate\Foundation\Application;
 use League\Flysystem\AdapterInterface;
 use League\Flysystem\AwsS3v3\AwsS3Adapter;
 use League\Flysystem\Memory\MemoryAdapter;
@@ -42,8 +41,10 @@ class BackupManager
 
     /**
      * BackupManager constructor.
+     *
+     * @param \Illuminate\Foundation\Application $app
      */
-    public function __construct(Application $app)
+    public function __construct($app)
     {
         $this->app = $app;
         $this->config = $app->make(Repository::class);
@@ -52,6 +53,7 @@ class BackupManager
     /**
      * Returns a backup adapter instance.
      *
+     * @param string|null $name
      * @return \League\Flysystem\AdapterInterface
      */
     public function adapter(string $name = null)
@@ -62,8 +64,8 @@ class BackupManager
     /**
      * Set the given backup adapter instance.
      *
+     * @param string $name
      * @param \League\Flysystem\AdapterInterface $disk
-     *
      * @return $this
      */
     public function set(string $name, $disk)
@@ -76,6 +78,7 @@ class BackupManager
     /**
      * Gets a backup adapter.
      *
+     * @param string $name
      * @return \League\Flysystem\AdapterInterface
      */
     protected function get(string $name)
@@ -86,6 +89,7 @@ class BackupManager
     /**
      * Resolve the given backup disk.
      *
+     * @param string $name
      * @return \League\Flysystem\AdapterInterface
      */
     protected function resolve(string $name)
@@ -93,7 +97,9 @@ class BackupManager
         $config = $this->getConfig($name);
 
         if (empty($config['adapter'])) {
-            throw new InvalidArgumentException("Backup disk [{$name}] does not have a configured adapter.");
+            throw new InvalidArgumentException(
+                "Backup disk [{$name}] does not have a configured adapter."
+            );
         }
 
         $adapter = $config['adapter'];
@@ -117,6 +123,7 @@ class BackupManager
     /**
      * Calls a custom creator for a given adapter type.
      *
+     * @param array $config
      * @return \League\Flysystem\AdapterInterface
      */
     protected function callCustomCreator(array $config)
@@ -131,6 +138,7 @@ class BackupManager
     /**
      * Creates a new wings adapter.
      *
+     * @param array $config
      * @return \League\Flysystem\AdapterInterface
      */
     public function createWingsAdapter(array $config)
@@ -141,13 +149,14 @@ class BackupManager
     /**
      * Creates a new S3 adapter.
      *
+     * @param array $config
      * @return \League\Flysystem\AdapterInterface
      */
     public function createS3Adapter(array $config)
     {
         $config['version'] = 'latest';
 
-        if (!empty($config['key']) && !empty($config['secret'])) {
+        if (! empty($config['key']) && ! empty($config['secret'])) {
             $config['credentials'] = Arr::only($config, ['key', 'secret', 'token']);
         }
 
@@ -159,6 +168,7 @@ class BackupManager
     /**
      * Returns the configuration associated with a given backup type.
      *
+     * @param string $name
      * @return array
      */
     protected function getConfig(string $name)
@@ -178,6 +188,8 @@ class BackupManager
 
     /**
      * Set the default session driver name.
+     *
+     * @param string $name
      */
     public function setDefaultAdapter(string $name)
     {
@@ -188,7 +200,6 @@ class BackupManager
      * Unset the given adapter instances.
      *
      * @param string|string[] $adapter
-     *
      * @return $this
      */
     public function forget($adapter)
@@ -203,6 +214,8 @@ class BackupManager
     /**
      * Register a custom adapter creator closure.
      *
+     * @param string $adapter
+     * @param \Closure $callback
      * @return $this
      */
     public function extend(string $adapter, Closure $callback)

app/Extensions/DynamicDatabaseConnection.php

@@ -16,9 +16,9 @@ use Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface;
 
 class DynamicDatabaseConnection
 {
-    public const DB_CHARSET = 'utf8';
-    public const DB_COLLATION = 'utf8_unicode_ci';
-    public const DB_DRIVER = 'mysql';
+    const DB_CHARSET = 'utf8';
+    const DB_COLLATION = 'utf8_unicode_ci';
+    const DB_DRIVER = 'mysql';
 
     /**
      * @var \Illuminate\Config\Repository
@@ -37,6 +37,10 @@ class DynamicDatabaseConnection
 
     /**
      * DynamicDatabaseConnection constructor.
+     *
+     * @param \Illuminate\Config\Repository $config
+     * @param \Pterodactyl\Contracts\Repository\DatabaseHostRepositoryInterface $repository
+     * @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
      */
     public function __construct(
         ConfigRepository $config,
@@ -59,7 +63,7 @@ class DynamicDatabaseConnection
      */
     public function set($connection, $host, $database = 'mysql')
     {
-        if (!$host instanceof DatabaseHost) {
+        if (! $host instanceof DatabaseHost) {
             $host = $this->repository->find($host);
         }
 

app/Extensions/Hashids.php

@@ -20,7 +20,7 @@ class Hashids extends VendorHashids implements HashidsInterface
     public function decodeFirst($encoded, $default = null)
     {
         $result = $this->decode($encoded);
-        if (!is_array($result)) {
+        if (! is_array($result)) {
             return $default;
         }