BelongsToMany bugfix in Messagable trait

Author: pascalbaljet

src/Cmgmyr/Messenger/Traits/Messagable.php

@@ -11,7 +11,7 @@ trait Messagable
      */
     public function messages()
     {
-        return $this->hasMany(Config::get('messenger.message_model'));
+        return $this->hasMany(config('messenger.message_model'));
     }
 
     /**
@@ -21,7 +21,7 @@ public function messages()
      */
     public function threads()
     {
-        return $this->belongsToMany(Config::get('messenger.thread_model'), 'participants');
+        return $this->belongsToMany(config('messenger.thread_model'), $this->getParticipantTable(), 'user_id', 'thread_id');
     }
 
     /**
@@ -54,23 +54,33 @@ public function threadsWithNewMessages()
          * I don't want to include as a dependency for this package...it's overkill. So let's
          * exclude this check in the testing environment.
          */
-        if (getenv('APP_ENV') == 'testing' || !str_contains(\Illuminate\Foundation\Application::VERSION, '5.0')) {
+        if (getenv('APP_ENV') == 'testing' || !str_contains(\Illuminate\Foundation\Application::VERSION, '5.0'))
+        {
             $participants = $participants->all();
         }
 
-        if ($participants) {
+        if ($participants)
+        {
             $threadModelClass = config('messenger.thread_model');
             $threadModel      = new $threadModelClass;
 
             $threads = $threadModel->whereIn('id', array_keys($participants))->get();
 
-            foreach ($threads as $thread) {
-                if ($thread->updated_at > $participants[$thread->id]) {
+            foreach ($threads as $thread)
+            {
+                if ($thread->updated_at > $participants[$thread->id])
+                {
                     $threadsWithNewMessages[] = $thread->id;
                 }
             }
         }
 
         return $threadsWithNewMessages;
     }
+
+    private function getParticipantTable()
+    {
+        $participantModel = config('messenger.participant_model');
+        return (new $participantModel)->getTable();
+    }
 }