Code cleanup for facades

Author: DaneEveritt

app/Facades/Activity.php

@@ -3,22 +3,8 @@
 namespace Pterodactyl\Facades;
 
 use Illuminate\Support\Facades\Facade;
-use Illuminate\Database\Eloquent\Model;
 use Pterodactyl\Services\Activity\ActivityLogService;
 
-/**
- * @method static ActivityLogService anonymous()
- * @method static ActivityLogService event(string $action)
- * @method static ActivityLogService description(?string $description)
- * @method static ActivityLogService subject(Model|Model[] $subject)
- * @method static ActivityLogService actor(Model $actor)
- * @method static ActivityLogService withRequestMetadata()
- * @method static ActivityLogService property(string|array $key, mixed $value = null)
- * @method static \Pterodactyl\Models\ActivityLog log(string $description = null)
- * @method static ActivityLogService clone()
- * @method static void reset()
- * @method static mixed transaction(\Closure $callback)
- */
 class Activity extends Facade
 {
     protected static function getFacadeAccessor()

app/Facades/LogBatch.php

@@ -5,12 +5,6 @@
 use Illuminate\Support\Facades\Facade;
 use Pterodactyl\Services\Activity\AcitvityLogBatchService;
 
-/**
- * @method static ?string uuid()
- * @method static void start()
- * @method static void end()
- * @method static mixed transaction(\Closure $callback)
- */
 class LogBatch extends Facade
 {
     protected static function getFacadeAccessor()

app/Facades/LogTarget.php

@@ -5,13 +5,6 @@
 use Illuminate\Support\Facades\Facade;
 use Pterodactyl\Services\Activity\ActivityLogTargetableService;
 
-/**
- * @method static void setActor(\Illuminate\Database\Eloquent\Model $actor)
- * @method static void setSubject(\Illuminate\Database\Eloquent\Model $subject)
- * @method static \Illuminate\Database\Eloquent\Model|null actor()
- * @method static \Illuminate\Database\Eloquent\Model|null subject()
- * @method static void reset()
- */
 class LogTarget extends Facade
 {
     protected static function getFacadeAccessor()

…tp/Middleware/AccountActivitySubject.php …p/Middleware/Activity/AccountSubject.phpapp/Http/Middleware/AccountActivitySubject.php renamed to app/Http/Middleware/Activity/AccountSubject.php app/Http/Middleware/AccountActivitySubject.php renamed to app/Http/Middleware/Activity/AccountSubject.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Pterodactyl\Http\Middleware;
+namespace Pterodactyl\Http\Middleware\Activity;
 
 use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Facades\LogTarget;
 
-class AccountActivitySubject
+class AccountSubject
 {
     /**
      * Sets the actor and default subject for all requests passing through this

…ttp/Middleware/ServerActivitySubject.php …tp/Middleware/Activity/ServerSubject.phpapp/Http/Middleware/ServerActivitySubject.php renamed to app/Http/Middleware/Activity/ServerSubject.php app/Http/Middleware/ServerActivitySubject.php renamed to app/Http/Middleware/Activity/ServerSubject.php

@@ -1,13 +1,13 @@
 <?php
 
-namespace Pterodactyl\Http\Middleware;
+namespace Pterodactyl\Http\Middleware\Activity;
 
 use Closure;
 use Illuminate\Http\Request;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Facades\LogTarget;
 
-class ServerActivitySubject
+class ServerSubject
 {
     /**
      * Attempts to automatically scope all of the activity log events registered

app/Models/ApiKey.php

@@ -13,7 +13,7 @@
  * @property int $id
  * @property int $user_id
  * @property int $key_type
- * @property string|null $identifier
+ * @property string $identifier
  * @property string $token
  * @property array|null $allowed_ips
  * @property string|null $memo

config/app.php

@@ -239,5 +239,10 @@
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
+
+        // Custom Facades
+        'Activity' => Pterodactyl\Facades\Activity::class,
+        'LogBatch' => Pterodactyl\Facades\LogBatch::class,
+        'LogTarget' => Pterodactyl\Facades\LogTarget::class,
     ],
 ];

config/ide-helper.php

@@ -2,8 +2,8 @@
 
 use Illuminate\Support\Facades\Route;
 use Pterodactyl\Http\Controllers\Api\Client;
-use Pterodactyl\Http\Middleware\ServerActivitySubject;
-use Pterodactyl\Http\Middleware\AccountActivitySubject;
+use Pterodactyl\Http\Middleware\Activity\ServerSubject;
+use Pterodactyl\Http\Middleware\Activity\AccountSubject;
 use Pterodactyl\Http\Middleware\RequireTwoFactorAuthentication;
 use Pterodactyl\Http\Middleware\Api\Client\Server\ResourceBelongsToServer;
 use Pterodactyl\Http\Middleware\Api\Client\Server\AuthenticateServerAccess;
@@ -19,7 +19,7 @@
 Route::get('/', [Client\ClientController::class, 'index'])->name('api:client.index');
 Route::get('/permissions', [Client\ClientController::class, 'permissions']);
 
-Route::prefix('/account')->middleware(AccountActivitySubject::class)->group(function () {
+Route::prefix('/account')->middleware(AccountSubject::class)->group(function () {
     Route::prefix('/')->withoutMiddleware(RequireTwoFactorAuthentication::class)->group(function () {
         Route::get('/', [Client\AccountController::class, 'index'])->name('api:client.account');
         Route::get('/two-factor', [Client\TwoFactorController::class, 'index']);
@@ -54,7 +54,7 @@
 Route::group([
     'prefix' => '/servers/{server}',
     'middleware' => [
-        ServerActivitySubject::class,
+        ServerSubject::class,
         AuthenticateServerAccess::class,
         ResourceBelongsToServer::class,
     ],