Merge pull request #486 from singularity43/sandbox

(Fix) Ban System
HDInnovations · Jan 11, 2019 · c1f9543 · c1f9543
2 parents 9855680 + 2826d69
commit c1f9543
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/app/Console/Commands/AutoBan.php b/app/Console/Commands/AutoBan.php
@@ -68,7 +68,7 @@ public function handle()
                 $logban->save();
 
                 // Send Email
-                Mail::to($ban->warneduser->email)->send(new BanUser($logban));
+                Mail::to($ban->warneduser->email)->send(new BanUser($ban->warneduser->email, $logban));
             }
         }
     }

diff --git a/app/Http/Controllers/Staff/BanController.php b/app/Http/Controllers/Staff/BanController.php
@@ -100,7 +100,7 @@ public function ban(Request $request, $username, $id)
                 \LogActivity::addToLog("Staff Member {$staff->username} has banned member {$user->username}.");
 
                 // Send Email
-                Mail::to($user->email)->send(new BanUser($user, $ban));
+                Mail::to($user->email)->send(new BanUser($user->email, $ban));
 
                 return redirect()->route('profile', ['username' => $user->username, 'id' => $user->id])
                     ->with($this->toastr->success('User Is Now Banned!', 'Yay!', ['options']));
@@ -156,7 +156,7 @@ public function unban(Request $request, $username, $id)
                 \LogActivity::addToLog("Staff Member {$staff->username} has unbanned member {$user->username}.");
 
                 // Send Email
-                Mail::to($user->email)->send(new UnbanUser($user, $ban));
+                Mail::to($user->email)->send(new UnbanUser($user->email, $ban));
 
                 return redirect()->route('profile', ['username' => $user->username, 'id' => $user->id])
                     ->with($this->toastr->success('User Is Now Relieved Of His Ban!', 'Yay!', ['options']));

diff --git a/app/Mail/BanUser.php b/app/Mail/BanUser.php
@@ -21,16 +21,18 @@ class BanUser extends Mailable
 {
     use Queueable, SerializesModels;
 
-    public $logban;
+    public $email;
+    public $ban;
 
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($logban)
+    public function __construct($email, $ban)
     {
-        $this->logban = $logban;
+        $this->email = $email;
+        $this->ban = $ban;
     }
 
     /**

diff --git a/app/Mail/UnbanUser.php b/app/Mail/UnbanUser.php
@@ -22,15 +22,17 @@ class UnbanUser extends Mailable
     use Queueable, SerializesModels;
 
     public $email;
+    public $ban;
 
     /**
      * Create a new message instance.
      *
      * @return void
      */
-    public function __construct($email)
+    public function __construct($email, $ban)
     {
         $this->email = $email;
+        $this->ban = $ban;
     }
 
     /**

diff --git a/resources/views/emails/ban.blade.php b/resources/views/emails/ban.blade.php
@@ -1,7 +1,7 @@
 @component('mail::message')
 # @lang('email.banned-header')!
 
-**Reason:** {{ $logban->ban_reason }}
+**Reason:** {{ $ban->ban_reason }}
 
 *@lang('email.banned-footer')*
 @endcomponent