chore: merge fixes

Author: xsahil03x

packages/stream_chat/lib/src/client/channel.dart

@@ -3142,13 +3142,12 @@ class ChannelClientState {
     // a thread-only message.
     if (isUpToDate || isThreadOnlyMessage) updateMessage(message);
 
-      // Otherwise, check if we can count the message as unread.
-      if (MessageRules.canCountAsUnread(message, _channel)) {
-        unreadCount += 1; // Increment unread count
-      }
+    // Otherwise, check if we can count the message as unread.
+    if (MessageRules.canCountAsUnread(message, _channel)) {
+      unreadCount += 1; // Increment unread count
+    }
 
-      _client.channelDeliveryReporter.submitForDelivery([_channel]);
-    }));
+    _client.channelDeliveryReporter.submitForDelivery([_channel]);
   }
 
   /// Updates the [read] in the state if it exists. Adds it otherwise.
@@ -3870,7 +3869,7 @@ class ChannelClientState {
     // Calculate the new last message at time.
     var lastMessageAt = _channelState.channel?.lastMessageAt;
     for (final message in affectedMessages) {
-      if (_shouldUpdateChannelLastMessageAt(message)) {
+      if (MessageRules.canUpdateChannelLastMessageAt(message, _channel)) {
         lastMessageAt = [lastMessageAt, message.createdAt].nonNulls.max;
       }
     }

packages/stream_chat/lib/src/core/models/channel_config.g.dart

@@ -19,11 +19,21 @@ class MessageRules {
   /// * A poll
   static bool canUpload(Message message) {
     final hasText = message.text?.trim().isNotEmpty == true;
+    if (hasText) return true;
+
     final hasAttachments = message.attachments.isNotEmpty;
+    if (hasAttachments) return true;
+
     final hasQuotedMessage = message.quotedMessageId != null;
+    if (hasQuotedMessage) return true;
+
+    final hasSharedLocation = message.sharedLocation != null;
+    if (hasSharedLocation) return true;
+
     final hasPoll = message.pollId != null;
+    if (hasPoll) return true;
 
-    return hasText || hasAttachments || hasQuotedMessage || hasPoll;
+    return false;
   }
 
   /// Whether the [message] can update the channel's last message timestamp.

packages/stream_chat/lib/src/core/util/message_rules.dart

@@ -48,8 +48,8 @@ export 'src/core/models/location.dart';
 export 'src/core/models/location_coordinates.dart';
 export 'src/core/models/member.dart';
 export 'src/core/models/message.dart';
-export 'src/core/models/message_delivery.dart';
 export 'src/core/models/message_delete_scope.dart';
+export 'src/core/models/message_delivery.dart';
 export 'src/core/models/message_reminder.dart';
 export 'src/core/models/message_state.dart';
 export 'src/core/models/moderation.dart';