Merge pull request #6 from jlozano254/master

Reduces memory usage & CPU processing, fix for empty collection return
baklysystems · Feb 19, 2018 · 82dbda3 · 82dbda3
2 parents 8295cb6 + 6ab560e
commit 82dbda3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/Messenger.php b/src/Messenger.php
@@ -121,7 +121,7 @@ public function messagesWith($authId, $withId, $take = 20)
         $conversation = $this->getConversation($authId, $withId);
 
         if ($conversation) {
-            $collection   = Message::whereConversationId($conversation->id)
+            $messages = Message::whereConversationId($conversation->id)
                 ->where(function ($query) use ($authId, $withId) {
                     $query->where(function ($qr) use ($authId) {
                         $qr->where('sender_id', $authId) // this message is sent by the authUser.
@@ -130,16 +130,15 @@ public function messagesWith($authId, $withId, $take = 20)
                         $qr->where('sender_id', $withId) // this message is sent by the receiver/withUser.
                             ->where('deleted_from_receiver', 0);
                     });
-                });
-            $totalRecords = $collection->count();
-            $messages     = $collection->take($take)
-                ->skip($totalRecords - $take)
+                })
+                ->latest()
+                ->take($take)
                 ->get();
 
-            return $messages;
+            return $messages->reverse();
         }
 
-        return null;
+        return collect();
     }
 
     /**