Merge pull request #402 from MineTrax/develop

Develop

app/Http/Controllers/Admin/RoleController.php

@@ -71,7 +71,9 @@ public function store(CreateRoleRequest $request)
 
         $role->givePermissionTo($request->permissions);
 
-        $role->addMediaFromRequest('photo')->toMediaCollection('role');
+        if ($request->photo) {
+            $role->addMediaFromRequest('photo')->toMediaCollection('role');
+        }
 
         return redirect()->route('admin.role.index')
             ->with(['toast' => ['type' => 'success', 'title' => __('Created Successfully'), 'body' => __('New Role is created successfully')]]);

app/Http/Controllers/Admin/ServerController.php

@@ -72,11 +72,12 @@ public function index()
             ->allowedSorts(['id', 'name', 'hostname', 'ip_address', 'join_port', 'query_port', 'webquery_port', 'type', 'minecraft_version', 'order', 'country_id', 'last_scanned_at', 'created_at'])
             ->defaultSort('-order')
             ->paginate($perPage)
+            ->through(fn($server) => $server->append('masked_ip_address')->makeHidden('ip_address'))
             ->withQueryString();
 
         return Inertia::render('Admin/Server/IndexServer', [
             'servers' => $servers,
-            'canCreateBungeeServer' => ! $canCreateBungeeServer,
+            'canCreateBungeeServer' => !$canCreateBungeeServer,
             'filters' => request()->all(['perPage', 'sort', 'filter']),
         ]);
     }
@@ -177,7 +178,7 @@ public function storeBungee(Request $request, GeolocationService $geolocationSer
             'order' => $request->order,
         ]);
 
-        if (! $request->webquery_port) {
+        if (!$request->webquery_port) {
             return redirect()->route('admin.server.index')
                 ->with(['toast' => ['type' => 'success', 'title' => __('Created Successfully'), 'body' => __('Proxy server added successfully')]]);
         }
@@ -306,9 +307,9 @@ public function updateBungee(Request $request, Server $server, GeolocationServic
         $server->save();
 
         // We forget the cached result so that new data will be shown instantly and not redundant data.
-        Cache::forget('server:ping:'.$server->id);
-        Cache::forget('server:query:'.$server->id);
-        Cache::forget('server:webquery:'.$server->id);
+        Cache::forget('server:ping:' . $server->id);
+        Cache::forget('server:query:' . $server->id);
+        Cache::forget('server:webquery:' . $server->id);
 
         return redirect()->route('admin.server.index')
             ->with(['toast' => ['type' => 'success', 'title' => __('Updated Successfully'), 'body' => __('Server updated successfully')]]);
@@ -338,9 +339,9 @@ public function update(UpdateServerRequest $request, Server $server, Geolocation
         $server->save();
 
         // We forget the cached result so that new data will be shown instantly and not redundant data.
-        Cache::forget('server:ping:'.$server->id);
-        Cache::forget('server:query:'.$server->id);
-        Cache::forget('server:webquery:'.$server->id);
+        Cache::forget('server:ping:' . $server->id);
+        Cache::forget('server:query:' . $server->id);
+        Cache::forget('server:webquery:' . $server->id);
 
         return redirect()->route('admin.server.index')
             ->with(['toast' => ['type' => 'success', 'title' => __('Updated Successfully'), 'body' => __('Server updated successfully')]]);

app/Http/Controllers/Admin/UserController.php

@@ -40,9 +40,9 @@ public function index()
                 'updated_at',
                 'country_id',
                 'last_login_at',
-                'roles.display_name',
                 'country.name',
                 'discord_user_id',
+                AllowedFilter::exact('roles.display_name'),
                 AllowedFilter::custom('q', new FilterMultipleFields(['name', 'email', 'username', 'discord_user_id'])),
                 AllowedFilter::scope('is_verified'),
             ])

app/Http/Controllers/PlayerPasswordResetController.php

@@ -79,8 +79,6 @@ public function update(Request $request, PluginSettings $pluginSettings)
                 'toast' => [
                     'type' => 'success',
                     'title' => __('Action Successful!'),
-                    'body' => __('Password reset request has been queued. It will complete in a few seconds.'),
-                    'milliseconds' => 15000,
                 ]
             ]);
     }

app/Http/Requests/CreateRoleRequest.php

@@ -30,7 +30,7 @@ public function rules()
             'display_name' => 'required|string|max:255',
             'is_staff' => 'required|boolean',
             'is_hidden_from_staff_list' => 'required|boolean',
-            'photo' => 'required|image|max:300',
+            'photo' => 'nullable|image|max:300',
             'weight' => 'required|integer',
             'web_message_format' => 'nullable|string|max:255',
             'permissions' => 'sometimes|nullable|array|exists:permissions,name'

app/Models/Role.php

@@ -33,7 +33,7 @@ public function registerMediaCollections(): void
 
     public function getPhotoUrlAttribute()
     {
-        $photo_url = url('images/default-roles/'.$this->name.'.png');
+        $photo_url = null;
         if ($this->getFirstMediaUrl('role')) {
             $photo_url = $this->getFirstMediaUrl('role');
         }

app/Models/Server.php

@@ -117,4 +117,9 @@ public function getSettingsKey($key, $default = null)
     {
         return Arr::dot($this->settings)[$key] ?? $default;
     }
+
+    public function getMaskedIpAddressAttribute()
+    {
+        return preg_replace('/(\d{1,3})\.\d{1,3}\.\d{1,3}\.\d{1,3}/', '$1.xx.xx.xx', $this->ip_address);
+    }
 }

database/migrations/2021_11_21_084550_create_minecraft_player_sessions_table.php

@@ -19,7 +19,7 @@ public function up()
             $table->uuid('player_uuid')->index();
             $table->string('player_username');
             $table->string('player_displayname')->nullable();
-            $table->timestamp('session_started_at');
+            $table->timestamp('session_started_at')->nullable();
             $table->timestamp('session_ended_at')->nullable();
             $table->integer('mob_kills')->default(0);
             $table->integer('player_kills')->default(0);

database/migrations/2021_11_21_085347_create_minecraft_player_pvp_kills_table.php

@@ -19,7 +19,7 @@ public function up()
             $table->uuid('victim_uuid')->index();
             $table->string('killer_username');
             $table->string('victim_username');
-            $table->timestamp('killed_at');
+            $table->timestamp('killed_at')->nullable();
             $table->string('weapon')->nullable();
             $table->json('world_location')->nullable();
 

database/migrations/2021_11_21_085403_create_minecraft_player_mob_kills_table.php

@@ -19,7 +19,7 @@ public function up()
             $table->string('player_username');
             $table->string('mob_id');
             $table->string('mob_name');
-            $table->timestamp('killed_at');
+            $table->timestamp('killed_at')->nullable();
             $table->string('weapon')->nullable();
             $table->json('world_location')->nullable();
 

database/migrations/2021_11_21_095010_create_minecraft_player_deaths_table.php

@@ -23,7 +23,7 @@ public function up()
 
             $table->string('killer_entity_id')->nullable();    // If killed by mob: Entity id
             $table->string('killer_entity_name')->nullable();    // If killed by mob: Entity name
-            $table->timestamp('died_at');
+            $table->timestamp('died_at')->nullable();
             $table->string('world_location')->nullable();
 
             $table->foreignId('session_id')->constrained('minecraft_player_sessions')->onDelete('cascade');

database/migrations/2023_07_26_021416_update_minecraft_players_table.php

@@ -50,7 +50,7 @@ public function up(): void
             $table->double('pvp_damage_given')->nullable()->default(0);
             $table->double('pvp_damage_taken')->nullable()->default(0);
 
-            $table->timestamp('first_seen_at');
+            $table->timestamp('first_seen_at')->nullable();
             $table->timestamp('last_seen_at')->nullable();
             $table->string('last_minecraft_version')->nullable();
             $table->string('last_join_address')->nullable();