fix messages pagination issue by using whereHas method

composer.json

@@ -1,9 +1,8 @@
 {
     "name": "nahid/talk",
-    "description": "Talk is a PHP based users conversations library. It helps to develop users messages and conversations in easy way. Talk also support Laravel 5>=",
+    "description": "Talk is a Laravel 5 based users conversations library. It helps to develop users messages and conversations in easy way.",
     "keywords": ["message", "inbox", "conversations", "chat", "php", "laravel"],
     "homepage": "https://github.com/nahid/talk",
-    "type": "library",
     "license": "CC(3.0)",
     "authors": [
         {

src/Conversations/ConversationRepository.php

@@ -151,16 +151,17 @@ public function threadsAll($user, $offset, $take)
      * */
     public function getMessagesById($conversationId, $userId, $offset, $take)
     {
-        return $this->with(['messages' => function ($q) use ($userId, $offset, $take) {
-            return $q->where(function ($q) use ($userId) {
-                $q->where('user_id', $userId)
-                ->where('deleted_from_sender', 0);
+        return Conversation::whereHas('messages', function ($query) use ($userId, $offset, $take) {
+            $query->where(function ($qr) use ($userId) {
+                $qr->where('user_id', '=', $userId)
+                    ->where('deleted_from_sender', 0);
             })
-            ->orWhere(function ($q) use ($userId) {
-                $q->where('user_id', '!=', $userId);
-                $q->where('deleted_from_receiver', 0);
-            })->offset($offset)->take($take);
-        }, 'userone', 'usertwo'])->find($conversationId);
+                ->orWhere(function ($q) use ($userId) {
+                    $q->where('user_id', '!=', $userId)
+                        ->where('deleted_from_receiver', 0);
+                })->skip($offset)->take($take);
+        })->with(['userone', 'usertwo'])->find($conversationId);
+
     }
 
     /*

src/TalkServiceProvider.php

@@ -58,6 +58,7 @@ protected function registerTalk()
             return new Talk($app[ConversationRepository::class], $app[MessageRepository::class]);
         });
     }
+
     /**
      * Get the services provided by the provider.
      *