Merge pull request pterodactyl#3 from pterodactyl/develop

Pull from upstream

Author: alliraine

README.md

@@ -1,53 +1,44 @@
 [![Logo Image](https://cdn.pterodactyl.io/logos/new/pterodactyl_logo.png)](https://pterodactyl.io)
 
 [![Build status](https://img.shields.io/travis/pterodactyl/panel/develop.svg?style=flat-square)](https://travis-ci.org/pterodactyl/panel)
-[![StyleCI](https://styleci.io/repos/47508644/shield?branch=develop)](https://styleci.io/repos/47508644)
 [![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 container while exposing a beautiful and intuitive
+UI to end users.
 
-Pterodactyl is the open-source game server management panel built with PHP7, Nodejs, and Go. Designed with security in mind, Pterodactyl runs all game servers in isolated Docker containers while exposing a beautiful and intuitive UI to administrators and users.
-What more are you waiting for? Make game servers a first class citizen on your platform today.
+Stop settling for less. Make game servers a first class citizen on your platform.
 
-![Image](https://cdn.pterodactyl.io/site-assets/mockup-macbook-grey.png)
+![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 funding Pterodactyl's developement. [Interested
-in becoming a sponsor?](https://github.com/sponsors/DaneEveritt)
-
-#### [BloomVPS](https://bloomvps.com)
-> BloomVPS 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-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.
-
-## Support & Documentation
-Support for using Pterodactyl can be found on our [Documentation Website](https://pterodactyl.io/project/introduction.html), [Guides Website](https://pterodactyl.io/community/about.html), or via our [Discord Chat](https://discord.gg/QRDZvVm).
+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 |
+| ------- | ----- |
+| [**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-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)
+* [Wings Documentation](https://pterodactyl.io/wings/1.0/installing.html)
+* [Community Guides](https://pterodactyl.io/community/about.html)
+* Or, get additional help [via Discord](https://discord.gg/pterodactyl)
 
 ### Supported Games
-We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to host your games across the world without having to bloat each physical machine with additional dependencies.
+We support a huge variety of games by utilizing Docker containers to isolate each instance, giving you the power to
+host your games across the world without having to bloat each physical machine with additional dependencies.
 
 Some of our core supported games include:
 
-* Minecraft — including Spigot, Sponge, Bungeecord, Waterfall, and more
+* Minecraft — including Paper, Sponge, Bungeecord, Waterfall, and more
 * Rust
 * Terraria
 * Teamspeak
@@ -57,30 +48,22 @@ Some of our core supported games include:
 * Garry's Mod
 * ARK: Survival Evolved
 
-In addition to our standard nest of supported games, our community is constantly pushing the limits of this software and there are plenty more games available provided by the community. Some of these games include:
+In addition to our standard nest of supported games, our community is constantly pushing the limits of this software
+and there are plenty more games available provided by the community. Some of these games include:
 
 * Factorio
 * San Andreas: MP
 * Pocketmine MP
 * Squad
 * FiveM
 * Xonotic
-* Discord ATLBot
-
-## Credits
-This software would not be possible without the work of other open-source authors who provide tools such as:
-
-[Ace Editor](https://ace.c9.io), [AdminLTE](https://adminlte.io), [Animate.css](http://daneden.github.io/animate.css/), [AnsiUp](https://github.com/drudru/ansi_up), [Async.js](https://github.com/caolan/async), 
-[Bootstrap](http://getbootstrap.com), [Bootstrap Notify](http://bootstrap-notify.remabledesigns.com), [Chart.js](http://www.chartjs.org), [FontAwesome](http://fontawesome.io),
-[FontAwesome Animations](https://github.com/l-lin/font-awesome-animation), [jQuery](http://jquery.com), [Laravel](https://laravel.com), [Lodash](https://lodash.com),
-[Select2](https://select2.github.io), [Socket.io](http://socket.io), [Socket.io File Upload](https://github.com/vote539/socketio-file-upload), [SweetAlert](http://t4t5.github.io/sweetalert),
-[Typeahead](https://github.com/bassjobsen/Bootstrap-3-Typeahead), and [Particles.js](http://vincentgarreau.com/particles.js).
-
-Some Javascript and CSS used within the panel is licensed under a `MIT` or `Apache 2.0` license. Please check their respective header files for more information.
+* Starmade
+* Discord ATLBot, and most other Node.js/Python discord bots
+* [and many more...](https://github.com/parkervcp/eggs)
 
 ## License
 ```
-Copyright (c) 2015 - 2018 Dane Everitt <dane@daneeveritt.com>.
+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
@@ -100,3 +83,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ```
+
+Some Javascript and CSS used within the panel are licensed under a `MIT` or `Apache 2.0` license. Please check their
+respective header files for more information.

app/Console/Commands/User/DeleteUserCommand.php

@@ -10,6 +10,7 @@
 namespace Pterodactyl\Console\Commands\User;
 
 use Webmozart\Assert\Assert;
+use Pterodactyl\Models\User;
 use Illuminate\Console\Command;
 use Pterodactyl\Services\Users\UserDeletionService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
@@ -40,16 +41,11 @@ class DeleteUserCommand extends Command
      * DeleteUserCommand constructor.
      *
      * @param \Pterodactyl\Services\Users\UserDeletionService $deletionService
-     * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
      */
-    public function __construct(
-        UserDeletionService $deletionService,
-        UserRepositoryInterface $repository
-    ) {
+    public function __construct(UserDeletionService $deletionService) {
         parent::__construct();
 
         $this->deletionService = $deletionService;
-        $this->repository = $repository;
     }
 
     /**
@@ -59,9 +55,13 @@ public function __construct(
     public function handle()
     {
         $search = $this->option('user') ?? $this->ask(trans('command/messages.user.search_users'));
-        Assert::notEmpty($search, 'Search term must be a non-null value, received %s.');
+        Assert::notEmpty($search, 'Search term should be an email address, got: %s.');
+
+        $results = User::query()
+            ->where('email', 'LIKE', "$search%")
+            ->where('username', 'LIKE', "$search%")
+            ->get();
 
-        $results = $this->repository->setSearchTerm($search)->all();
         if (count($results) < 1) {
             $this->error(trans('command/messages.user.no_users_found'));
             if ($this->input->isInteractive()) {
@@ -95,5 +95,7 @@ public function handle()
             $this->deletionService->handle($deleteUser);
             $this->info(trans('command/messages.user.deleted'));
         }
+
+        return;
     }
 }

app/Contracts/Repository/AllocationRepositoryInterface.php

@@ -6,14 +6,6 @@
 
 interface AllocationRepositoryInterface extends RepositoryInterface
 {
-    /**
-     * Return all of the unique IPs that exist for a given node.
-     *
-     * @param int $node
-     * @return \Illuminate\Support\Collection
-     */
-    public function getUniqueAllocationIpsForNode(int $node): Collection;
-
     /**
      * Return all of the allocations that exist for a node that are not currently
      * allocated.
@@ -23,27 +15,6 @@ public function getUniqueAllocationIpsForNode(int $node): Collection;
      */
     public function getUnassignedAllocationIds(int $node): array;
 
-    /**
-     * Get an array of all allocations that are currently assigned to a given server.
-     *
-     * @param int $server
-     * @return array
-     */
-    public function getAssignedAllocationIds(int $server): array;
-
-    /**
-     * Return a concatenated result set of node ips that already have at least one
-     * server assigned to that IP. This allows for filtering out sets for
-     * dedicated allocation IPs.
-     *
-     * If an array of nodes is passed the results will be limited to allocations
-     * in those nodes.
-     *
-     * @param array $nodes
-     * @return array
-     */
-    public function getDiscardableDedicatedAllocations(array $nodes = []): array;
-
     /**
      * Return a single allocation from those meeting the requirements.
      *

app/Contracts/Repository/Attributes/SearchableInterface.php

@@ -4,9 +4,8 @@
 
 use Pterodactyl\Models\Location;
 use Illuminate\Support\Collection;
-use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
 
-interface LocationRepositoryInterface extends RepositoryInterface, SearchableInterface
+interface LocationRepositoryInterface extends RepositoryInterface
 {
     /**
      * Return locations with a count of nodes and servers attached to it.

app/Contracts/Repository/DaemonKeyRepositoryInterface.php

@@ -14,7 +14,7 @@
 interface NestRepositoryInterface extends RepositoryInterface
 {
     /**
-     * Return a nest or all nests with their associated eggs, variables, and packs.
+     * Return a nest or all nests with their associated eggs and variables.
      *
      * @param int $id
      * @return \Illuminate\Database\Eloquent\Collection|\Pterodactyl\Models\Nest
@@ -24,7 +24,7 @@ interface NestRepositoryInterface extends RepositoryInterface
     public function getWithEggs(int $id = null);
 
     /**
-     * Return a nest or all nests and the count of eggs, packs, and servers for that nest.
+     * 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

app/Contracts/Repository/LocationRepositoryInterface.php

@@ -8,7 +8,7 @@
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Pterodactyl\Contracts\Repository\Attributes\SearchableInterface;
 
-interface NodeRepositoryInterface extends RepositoryInterface, SearchableInterface
+interface NodeRepositoryInterface extends RepositoryInterface
 {
     const THRESHOLD_PERCENTAGE_LOW = 75;
     const THRESHOLD_PERCENTAGE_MEDIUM = 90;
@@ -29,13 +29,6 @@ public function getUsageStats(Node $node): array;
      */
     public function getUsageStatsRaw(Node $node): array;
 
-    /**
-     * Return all available nodes with a searchable interface.
-     *
-     * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator
-     */
-    public function getNodeListingData(): LengthAwarePaginator;
-
     /**
      * Return a single node with location and server information.
      *