fix

Author: QuentinGab

src/Concerns/ParticipateToConversations.php

@@ -61,7 +61,7 @@ public static function getModelMessage(): string
     }
 
     /**
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversations(): BelongsToMany
     {
@@ -75,7 +75,7 @@ public function conversations(): BelongsToMany
     /**
      * Return unread conversations using the `message_reads` table
      *
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsUnread(): BelongsToMany
     {
@@ -85,7 +85,7 @@ public function conversationsUnread(): BelongsToMany
     /**
      * Return read conversations using the `message_reads` table
      *
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsRead(): BelongsToMany
     {
@@ -95,24 +95,24 @@ public function conversationsRead(): BelongsToMany
     /**
      * Return unread conversations using the pivot column `conversation_user.last_read_message_id`
      *
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function denormalizedConversationsUnread(): BelongsToMany
     {
         return $this
             ->conversations()
             ->where(function ($query) {
                 return $query
-                    ->wherePivot('last_read_message_id', '=', null)
-                    ->orWherePivot('last_read_message_id', '<', DB::raw('conversations.latest_message_id'));
+                    ->where('conversation_user.last_read_message_id', '=', null)
+                    ->orWhere('conversation_user.last_read_message_id', '<', DB::raw('conversations.latest_message_id'));
             });
 
     }
 
     /**
      * Return read conversations using the pivot column `conversation_user.last_read_message_id`
      *
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function denormalizedConversationsRead(): BelongsToMany
     {
@@ -122,31 +122,31 @@ public function denormalizedConversationsRead(): BelongsToMany
     }
 
     /**
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsNotMuted(): BelongsToMany
     {
         return $this->conversations()->wherePivot('muted_at', null);
     }
 
     /**
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsMuted(): BelongsToMany
     {
         return $this->conversations()->wherePivot('muted_at', '!=', null);
     }
 
     /**
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsNotArchived(): BelongsToMany
     {
         return $this->conversations()->wherePivot('archived_at', null);
     }
 
     /**
-     * @return BelongsToMany<TConversation, $this>
+     * @return BelongsToMany<TConversation, $this, TConversationUser, 'conversationUser'>
      */
     public function conversationsArchived(): BelongsToMany
     {

src/ConversationUser.php

@@ -71,7 +71,7 @@ public function isMessageRead(Message|int $message): bool
     {
         $messageId = $message instanceof Message ? $message->id : $message;
 
-        return $this->last_read_message_id === null || $this->last_read_message_id >= $messageId;
+        return $this->last_read_message_id && $this->last_read_message_id >= $messageId;
     }
 
     public function markAsDenormalizedRead(Message|int $message): static