axotion / laravel-inbox

src/InboxController.php

Indentation +2 added lines, -2 removed lines

@@ -24,10 +24,10 @@
     {
         $conversations = $this->inboxService->fetchAllConversation();
 
-      $users = $this->inboxService->getInboxUsers($conversations);
+        $users = $this->inboxService->getInboxUsers($conversations);
 
 
-     return view('inbox::inbox.index', compact('conversations', 'users'));
+        return view('inbox::inbox.index', compact('conversations', 'users'));
     }
     /**
      * Show the form for creating a new resource.

Spacing +3 added lines, -3 removed lines

@@ -65,7 +65,7 @@ 
      */
     public function show(Conversation $id)
     {
-        if(auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
+        if (auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
             return view('inbox::inbox.show')->with('conversation', $id);
         }
         return redirect()->back();
@@ -86,7 +86,7 @@ 
                 'message' => 'required|max:10000'
             ]
         );
-        if(auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
+        if (auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
 
             $this->inboxService->addMessage($request, $id);
         }
@@ -101,7 +101,7 @@ 
      */
     public function destroy(Conversation $id)
     {
-        if(auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
+        if (auth()->id() == $id->id_to OR auth()->id() == $id->id_from) {
 
             $this->inboxService->deleteConversation($id);
         }

src/Repository/InboxRepository.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 class InboxRepository
 {
-	public function fetchAll()
+    public function fetchAll()
     {
         return Conversation::where('id_from', auth()->id())->orderBy('id', 'desc')->orWhere('id_to', auth()->id())->orderBy('id', 'desc')->get()->groupBy(function ($data){
             return Carbon::parse($data->created_at)->format('Y-m-d');

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
 {
 	public function fetchAll()
     {
-        return Conversation::where('id_from', auth()->id())->orderBy('id', 'desc')->orWhere('id_to', auth()->id())->orderBy('id', 'desc')->get()->groupBy(function ($data){
+        return Conversation::where('id_from', auth()->id())->orderBy('id', 'desc')->orWhere('id_to', auth()->id())->orderBy('id', 'desc')->get()->groupBy(function($data) {
             return Carbon::parse($data->created_at)->format('Y-m-d');
         });
     }
@@ -33,7 +33,7 @@ 
     public function conversationExists($to, $from)
     {
         //prevent to pm yourself
-        if(auth()->user()->name == $to->name){
+        if (auth()->user()->name == $to->name) {
             return true;
         }
         //check if conversation already exists

src/InboxServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     public function boot()
     {
         include __DIR__.'/routes.php';
-          $this->publishes([
+            $this->publishes([
             __DIR__ . '/migrations' => $this->app->databasePath() . '/migrations'
         ], 'migrations');
 

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
         include __DIR__.'/routes.php';
           $this->publishes([
-            __DIR__ . '/migrations' => $this->app->databasePath() . '/migrations'
+            __DIR__.'/migrations' => $this->app->databasePath().'/migrations'
         ], 'migrations');
 
     }

src/Conversation.php

Spacing +1 added lines, -1 removed lines

@@ -6,7 +6,7 @@
 
 class Conversation extends Model
 {
-    public function messages(){
+    public function messages() {
         return $this->hasMany('Evilnet\Inbox\Messages');
     }
 }

src/Services/InboxService.php

Indentation +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         $a->message = $request->get('message');
         $a->conversation_id = $request->get('conv_id');
         $a->save();
-         return redirect()->back()->send();
+            return redirect()->back()->send();
     }
 
     public function addConversation($user,$messg,$subject){
@@ -56,7 +56,7 @@ 
         }
         }
         else{
-         return redirect()->back()->withErrors('User not found')->send();
+            return redirect()->back()->withErrors('User not found')->send();
         }
     }
     public  function fetchAllConversation(){

Spacing +16 added lines, -16 removed lines

@@ -12,7 +12,7 @@ 
 use Evilnet\Inbox\Repository\InboxRepository;
 use Evilnet\Inbox\User;
 
-class InboxService{
+class InboxService {
 
     protected $inboxRepository;
     function __construct(InboxRepository $inboxRepository)
@@ -20,8 +20,8 @@ 
         $this->inboxRepository = $inboxRepository;
     }
 
-    public function addMessage($request, $id){
-        if($request->get('conv_id') != $id->id){
+    public function addMessage($request, $id) {
+        if ($request->get('conv_id') != $id->id) {
             redirect()->back()->withErrors('Something went wrong...')->send();
         }
 
@@ -33,12 +33,12 @@ 
          return redirect()->back()->send();
     }
 
-    public function addConversation($user,$messg,$subject){
+    public function addConversation($user, $messg, $subject) {
 
-        if($this->inboxRepository->userExists($user)){
+        if ($this->inboxRepository->userExists($user)) {
             $from = auth()->id();
             $to = User::where('name', $user)->first();
-            if(!$this->inboxRepository->conversationExists($to,$from)){
+            if (!$this->inboxRepository->conversationExists($to, $from)) {
                 $message = new Messages();
                 $message->name = auth()->user()->name;
                 $message->message = $messg;
@@ -51,21 +51,21 @@ 
                 $message->save();
                 return redirect()->to(url('/').'/conversation/'.$conversation->id)->send();
             }
-        else{
+        else {
                 return redirect()->back()->withErrors('Conversation already exists')->send();
         }
         }
-        else{
+        else {
          return redirect()->back()->withErrors('User not found')->send();
         }
     }
-    public  function fetchAllConversation(){
+    public  function fetchAllConversation() {
         return $this->inboxRepository->fetchAll();
     }
 
-    public  function deleteConversation($conversation){
+    public  function deleteConversation($conversation) {
         //it will delete conversation row and all related rows in messages table
-        foreach ($conversation->messages as $messages){
+        foreach ($conversation->messages as $messages) {
             $messages->forceDelete();
         }
         $conversation->forceDelete();
@@ -74,14 +74,14 @@ 
 
     }
     //return array with users that match to display for logged user
-        public function getInboxUsers($conversations){
+        public function getInboxUsers($conversations) {
             $users = [];
-            foreach ($conversations as $date => $thread){
-                foreach ($thread as $conversation){
-                    if( auth()->id() == $conversation->id_to) {
+            foreach ($conversations as $date => $thread) {
+                foreach ($thread as $conversation) {
+                    if (auth()->id() == $conversation->id_to) {
                         $users[] = \Evilnet\Inbox\User::where('id', $conversation->id_from)->first();
                     }
-                    elseif(auth()->id() == $conversation->id_from)
+                    elseif (auth()->id() == $conversation->id_from)
                         $users[] = \Evilnet\Inbox\User::where('id', $conversation->id_to)->first();
                 }
             }

Braces +4 added lines, -6 removed lines

@@ -50,12 +50,10 @@ 
                 $message->conversation_id = $conversation->id;
                 $message->save();
                 return redirect()->to(url('/').'/conversation/'.$conversation->id)->send();
-            }
-        else{
+            } else{
                 return redirect()->back()->withErrors('Conversation already exists')->send();
         }
-        }
-        else{
+        } else{
          return redirect()->back()->withErrors('User not found')->send();
         }
     }
@@ -80,9 +78,9 @@ 
                 foreach ($thread as $conversation){
                     if( auth()->id() == $conversation->id_to) {
                         $users[] = \Evilnet\Inbox\User::where('id', $conversation->id_from)->first();
+                    } elseif(auth()->id() == $conversation->id_from) {
+                                            $users[] = \Evilnet\Inbox\User::where('id', $conversation->id_to)->first();
                     }
-                    elseif(auth()->id() == $conversation->id_from)
-                        $users[] = \Evilnet\Inbox\User::where('id', $conversation->id_to)->first();
                 }
             }
             return $users;

src/routes.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * Date: 09.07.2017
  * Time: 19:37
  */
-Route::group(['middleware' => ['web', 'auth']], function () {
+Route::group(['middleware' => ['web', 'auth']], function() {
     Route::get('conversation', 'Evilnet\Inbox\InboxController@create');
     Route::post('conversation', 'Evilnet\Inbox\InboxController@store');
     Route::get('conversation/{id}', 'Evilnet\Inbox\InboxController@show');

src/migrations/2017_07_06_200205_create_conversations_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('conversations', function (Blueprint $table) {
+        Schema::create('conversations', function(Blueprint $table) {
             $table->increments('id');
             $table->text('subject');
             $table->integer('id_from');

src/migrations/2017_07_06_200352_create_messages_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('messages', function (Blueprint $table) {
+        Schema::create('messages', function(Blueprint $table) {
             $table->increments('id');
             $table->text('name');
             $table->text('message');