refactor: fix PHP styling

app/Console/Commands/RemoveExpiredStrikes.php

@@ -2,13 +2,12 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Facades\Settings;
 use App\Models\Mail\ModMail;
 use App\Services\UserService;
+use Illuminate\Console\Command;
 
-class RemoveExpiredStrikes extends Command
-{
+class RemoveExpiredStrikes extends Command {
     /**
      * The name and signature of the console command.
      *
@@ -26,8 +25,7 @@ class RemoveExpiredStrikes extends Command
     /**
      * Execute the console command.
      */
-    public function handle()
-    {
+    public function handle() {
         //
         $mails = ModMail::where('has_expired', 0)->where('issue_strike', 1)->where('strike_expiry', '<', now())->get();
         foreach ($mails as $mail) {
@@ -39,7 +37,7 @@ public function handle()
                 $service = new UserService;
                 $service->unban($mail->user);
 
-                $this->info('Unbanned user ' . $mail->recipient->username . ' due to expired strike.');
+                $this->info('Unbanned user '.$mail->recipient->username.' due to expired strike.');
             }
         }
     }

app/Http/Controllers/Admin/ModMailController.php

@@ -6,8 +6,8 @@
 use App\Models\Mail\ModMail;
 use App\Models\User\User;
 use App\Services\MailService;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 
 class ModMailController extends Controller {
     /**
@@ -50,7 +50,7 @@ public function getMail($id) {
      */
     public function getCreateMail() {
         return view('admin.mail.create_mail', [
-            'mail' => new ModMail,
+            'mail'  => new ModMail,
             'users' => ['Select User'] + User::orderBy('id')->pluck('name', 'id')->toArray(),
         ]);
     }

app/Http/Controllers/Comments/CommentController.php

@@ -6,12 +6,11 @@
 use App\Facades\Settings;
 use App\Models\Comment\Comment;
 use App\Models\Gallery\GallerySubmission;
+use App\Models\Mail\ModMail;
 use App\Models\News;
 use App\Models\Report\Report;
 use App\Models\Sales\Sales;
 use App\Models\SitePage;
-use App\Models\Mail\ModMail;
-use App\Models\Mail\UserMail;
 use App\Models\User\User;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;

app/Http/Controllers/Controller.php

@@ -13,5 +13,6 @@ class Controller extends BaseController {
     /**
      * Creates a new controller instance.
      */
-    public function __construct() {}
+    public function __construct() {
+    }
 }

app/Http/Controllers/Users/MailController.php

@@ -11,7 +11,6 @@
 use Illuminate\Http\Request;
 
 class MailController extends Controller {
-
     /**
      * Shows the mail index.
      *
@@ -24,8 +23,8 @@ public function getIndex() {
 
         return view('home.mail.index', [
             'modMail'  => ModMail::where('user_id', Auth::user()->id)->orderBy('created_at', 'desc')->get(),
-            'inbox'  => UserMail::where('recipient_id', Auth::user()->id)->orderBy('created_at', 'desc')->get(),
-            'outbox' => UserMail::where('sender_id', Auth::user()->id)->orderBy('created_at', 'desc')->get(),
+            'inbox'    => UserMail::where('recipient_id', Auth::user()->id)->orderBy('created_at', 'desc')->get(),
+            'outbox'   => UserMail::where('sender_id', Auth::user()->id)->orderBy('created_at', 'desc')->get(),
         ]);
     }
 
@@ -86,6 +85,7 @@ public function getCreateUserMail() {
         if (!config('lorekeeper.mod_mail.allow_user_mail')) {
             abort(404);
         }
+
         return view('home.mail.create_user_mail', [
             'mail'  => new UserMail,
             'users' => User::orderBy('id')->where('id', '!=', Auth::user()->id)->pluck('name', 'id')->toArray(),
@@ -94,10 +94,9 @@ public function getCreateUserMail() {
 
     /**
      * Sends mail from one user to another.
-     * 
-     * @param Request $request
-     * @param MailService $service
-     * 
+     *
+     * @param mixed|null $mail_id
+     *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function postCreateUserMail(Request $request, MailService $service, $mail_id = null) {

app/Models/Mail/ModMail.php

@@ -4,8 +4,8 @@
 
 use App\Models\Model;
 use App\Models\User\User;
-use Illuminate\Support\Facades\Auth;
 use App\Traits\Commentable;
+use Illuminate\Support\Facades\Auth;
 
 class ModMail extends Model {
     use Commentable;
@@ -26,13 +26,6 @@ class ModMail extends Model {
      */
     protected $table = 'mod_mails';
 
-    /**
-     * Whether the model contains timestamps to be saved and updated.
-     *
-     * @var string
-     */
-    public $timestamps = true;
-
     /**
      * The attributes that should be cast to native types.
      *
@@ -42,6 +35,13 @@ class ModMail extends Model {
         'strike_expiry' => 'datetime',
     ];
 
+    /**
+     * Whether the model contains timestamps to be saved and updated.
+     *
+     * @var string
+     */
+    public $timestamps = true;
+
     /**
      * Validation rules for creation.
      *

app/Models/Mail/UserMail.php

@@ -6,7 +6,6 @@
 use App\Models\User\User;
 
 class UserMail extends Model {
-
     /**
      * The attributes that are mass assignable.
      *
@@ -65,14 +64,14 @@ public function recipient() {
      * Get the parent message.
      */
     public function parent() {
-        return $this->belongsTo(UserMail::class, 'parent_id');
+        return $this->belongsTo(self::class, 'parent_id');
     }
 
     /**
      * Get the child messages.
      */
     public function children() {
-        return $this->hasMany(UserMail::class, 'parent_id', 'id');
+        return $this->hasMany(self::class, 'parent_id', 'id');
     }
 
     /**********************************************************************************************

app/Services/MailService.php

@@ -74,7 +74,6 @@ public function createUserMail($data, $sender) {
         DB::beginTransaction();
 
         try {
-
             if (!config('lorekeeper.mod_mail.allow_user_mail')) {
                 throw new \Exception('User mail is disabled.');
             }

app/Services/UserService.php

@@ -487,7 +487,7 @@ public function unban($user, $staff = null) {
         try {
             if (!$staff) {
                 $staff = $user;
-                if (!$this->logAdminAction($staff, 'Unbanned User', 'Unbanned '.$user->displayname . ' after strike expiry.')) {
+                if (!$this->logAdminAction($staff, 'Unbanned User', 'Unbanned '.$user->displayname.' after strike expiry.')) {
                     throw new \Exception('Failed to log admin action.');
                 }
             } else {

config/lorekeeper/mod_mail.php

@@ -10,4 +10,4 @@
 
     // Unban users if their strike expires and they are below the strike limit?
     'unban_on_strike_expiry' => true,
-];
+];

database/migrations/2024_10_25_003118_add_strike_expiry_to_mod_mail.php

@@ -4,13 +4,11 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      */
-    public function up(): void
-    {
+    public function up(): void {
         Schema::table('mod_mails', function (Blueprint $table) {
             //
             $table->timestamp('strike_expiry')->nullable()->default(null)->after('strike_count');
@@ -21,8 +19,7 @@ public function up(): void
     /**
      * Reverse the migrations.
      */
-    public function down(): void
-    {
+    public function down(): void {
         Schema::table('mod_mails', function (Blueprint $table) {
             //
             $table->dropColumn('strike_expiry');