Implement front-end server searching 🍬

CHANGELOG.md

@@ -12,6 +12,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 
 ### Added
 * Login attempts and pasword reset requests are now protected by invisible ReCaptcha. This feature can be disabled with a `.env` variable.
+* Server listing for individual users is now searchable on the front-end.
 
 ### Changed
 * Subuser permissions are now stored in `Permission::list()` to make views way cleaner and make adding to views significantly cleaner.

app/Http/Controllers/API/User/InfoController.php

@@ -31,7 +31,7 @@ class InfoController extends BaseController
 {
     public function me(Request $request)
     {
-        return $request->user()->serverAccessCollection()->load('allocation', 'option')->map(function ($server) {
+        return $request->user()->access('service', 'node', 'allocation', 'option')->get()->map(function ($server) {
             return [
                 'id' => $server->uuidShort,
                 'uuid' => $server->uuid,

app/Http/Controllers/Base/IndexController.php

@@ -38,8 +38,14 @@ class IndexController extends Controller
      */
     public function getIndex(Request $request)
     {
+        $servers = $request->user()->access();
+
+        if (! is_null($request->input('query'))) {
+            $servers->search($request->input('query'));
+        }
+
         return view('base.index', [
-            'servers' => $request->user()->serverAccessCollection(config('pterodactyl.paginate.frontend.servers')),
+            'servers' => $servers->paginate(config('pterodactyl.paginate.frontend.servers')),
         ]);
     }
 

app/Models/User.php

@@ -103,6 +103,8 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
         ],
     ];
 
+    protected $query;
+
     /**
      * Enables or disables TOTP on an account if the token is valid.
      *
@@ -200,18 +202,22 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
      * Returns an array of all servers a user is able to access.
      * Note: does not account for user admin status.
      *
-     * @param  int|null  $paginate
-     * @param  array     $load
-     * @return \Illuminate\Pagination\LengthAwarePagination|\Illuiminate\Database\Eloquent\Collection
+     * @param  array        $load
+     * @return \Illuiminate\Database\Eloquent\Builder
      */
-    public function serverAccessCollection($paginate = null, $load = ['service', 'node', 'allocation'])
+    public function access(...$load)
     {
-        $query = Server::with($load);
+        if (count($load) > 0 && is_null($load[0])) {
+            $query = Server::query();
+        } else {
+            $query = Server::with(! empty($load) ? $load : ['service', 'node', 'allocation']);
+        }
+
         if (! $this->isRootAdmin()) {
             $query->whereIn('id', $this->serverAccessArray());
         }
 
-        return (is_numeric($paginate)) ? $query->paginate($paginate) : $query->get();
+        return $query;
     }
 
     /**

resources/themes/pterodactyl/admin/users/view.blade.php

@@ -129,7 +129,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach($user->serverAccessCollection() as $server)
+                        @foreach($user->access()->get() as $server)
                             <tr>
                                 <td><a href="{{ route('server.index', $server->uuidShort) }}/"><i class="fa fa-tachometer"></i></a></td>
                                 <td><code>{{ $server->uuidShort }}</code></td>

resources/themes/pterodactyl/base/index.blade.php

@@ -38,12 +38,14 @@
             <div class="box-header">
                 <h3 class="box-title">@lang('base.index.list')</h3>
                 <div class="box-tools">
-                    <div class="input-group input-group-sm" style="width: 150px;">
-                        <input type="text" name="table_search" class="form-control pull-right" placeholder="@lang('strings.search')">
-                        <div class="input-group-btn">
-                            <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
+                    <form action="{{ route('index') }}" method="GET">
+                        <div class="input-group input-group-sm" style="width: 250px;">
+                            <input type="text" name="query" class="form-control pull-right" value="{{ request()->input('query') }}" placeholder="@lang('strings.search')">
+                            <div class="input-group-btn">
+                                <button type="submit" class="btn btn-default"><i class="fa fa-search"></i></button>
+                            </div>
                         </div>
-                    </div>
+                    </form>
                 </div>
             </div>
             <div class="box-body table-responsive no-padding">

resources/themes/pterodactyl/layouts/master.blade.php

@@ -235,7 +235,7 @@
             <aside class="control-sidebar control-sidebar-dark">
                 <div class="tab-content">
                     <ul class="control-sidebar-menu">
-                        @foreach (Auth::user()->serverAccessCollection(null, []) as $s)
+                        @foreach (Auth::user()->access(null)->get() as $s)
                             <li>
                                 <a
                                     @if(isset($server) && isset($node))