axotion / laravel-inbox

src/Services/InboxService.php

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;