Merge remote-tracking branch 'origin/master' into v10.0.0

# Conflicts:
#	melos.yaml
#	packages/stream_chat/CHANGELOG.md
#	packages/stream_chat/example/pubspec.yaml
#	packages/stream_chat/lib/src/client/channel.dart
#	packages/stream_chat/lib/src/event_type.dart
#	packages/stream_chat/lib/version.dart
#	packages/stream_chat/pubspec.yaml
#	packages/stream_chat/test/src/client/channel_test.dart
#	packages/stream_chat_flutter/CHANGELOG.md
#	packages/stream_chat_flutter/example/pubspec.yaml
#	packages/stream_chat_flutter/pubspec.yaml
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_dark.png
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_options_dialog_light.png
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_dark.png
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_light.png
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_dark.png
#	packages/stream_chat_flutter/test/src/poll/goldens/ci/stream_poll_results_dialog_with_show_all_light.png
#	packages/stream_chat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_dark.png
#	packages/stream_chat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_closed_light.png
#	packages/stream_chat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_dark.png
#	packages/stream_chat_flutter/test/src/poll/interactor/goldens/ci/stream_poll_interactor_light.png
#	packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_dark.png
#	packages/stream_chat_flutter/test/src/scroll_view/thread_scroll_view/goldens/ci/stream_thread_list_tile_light.png
#	packages/stream_chat_flutter_core/CHANGELOG.md
#	packages/stream_chat_flutter_core/example/pubspec.yaml
#	packages/stream_chat_flutter_core/pubspec.yaml
#	packages/stream_chat_localizations/CHANGELOG.md
#	packages/stream_chat_localizations/example/pubspec.yaml
#	packages/stream_chat_localizations/pubspec.yaml
#	packages/stream_chat_persistence/CHANGELOG.md
#	packages/stream_chat_persistence/example/pubspec.yaml
#	packages/stream_chat_persistence/pubspec.yaml
#	sample_app/pubspec.yaml

Author: xsahil03x

melos.yaml

@@ -102,6 +102,7 @@ command:
     dev_dependencies:
       alchemist: ">=0.11.0 <0.13.0"
       build_runner: ^2.4.9
+      connectivity_plus_platform_interface: ^2.0.0
       drift_dev: ^2.22.1
       fake_async: ^1.3.1
       faker_dart: ^0.2.1

packages/stream_chat/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 9.17.0
+
+🐞 Fixed
+
+- Fixed `currentUser.pushPreferences` not updating immediately after calling `setPushPreferences`.
+- Fixed `Channel.sendMessage` to prevent sending empty messages when all attachments are cancelled
+  during upload.
+- Fixed `toDraftMessage` to only include successfully uploaded attachments in draft messages.
+
 ## 10.0.0-beta.5
 
 - Included the changes from version [`9.16.0`](https://pub.dev/packages/stream_chat/changelog).

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

@@ -649,6 +649,15 @@ class Channel {
     });
   }
 
+  bool _isMessageValidForUpload(Message message) {
+    final hasText = message.text?.trim().isNotEmpty == true;
+    final hasAttachments = message.attachments.isNotEmpty;
+    final hasQuotedMessage = message.quotedMessageId != null;
+    final hasPoll = message.pollId != null;
+
+    return hasText || hasAttachments || hasQuotedMessage || hasPoll;
+  }
+
   final _sendMessageLock = Lock();
 
   /// Send a [message] to this channel.
@@ -707,6 +716,15 @@ class Channel {
         message = await attachmentsUploadCompleter.future;
       }
 
+      // Validate the final message before sending it to the server.
+      if (_isMessageValidForUpload(message) == false) {
+        client.logger.warning('Message is not valid for sending, removing it');
+
+        // Remove the message from state as it is invalid.
+        state!.deleteMessage(message, hardDelete: true);
+        throw const StreamChatError('Message is not valid for sending');
+      }
+
       // Wait for the previous sendMessage call to finish. Otherwise, the order
       // of messages will not be maintained.
       final response = await _sendMessageLock.synchronized(
@@ -2262,6 +2280,8 @@ class ChannelClientState {
 
     _startCleaningExpiredLocations();
 
+    _listenChannelPushPreferenceUpdated();
+
     _channel._client.chatPersistenceClient
         ?.getChannelThreads(_channel.cid!)
         .then((threads) {
@@ -3824,6 +3844,24 @@ class ChannelClientState {
     );
   }
 
+  // Listens to channel push preference update events and updates the state
+  void _listenChannelPushPreferenceUpdated() {
+    _subscriptions.add(
+      _channel.on(EventType.channelPushPreferenceUpdated).listen(
+            (event) {
+          final pushPreferences = event.channelPushPreference;
+          if (pushPreferences == null) return;
+
+          updateChannelState(
+            channelState.copyWith(
+              pushPreferences: pushPreferences,
+            ),
+          );
+        },
+      ),
+    );
+  }
+
   /// Call this method to dispose this object.
   void dispose() {
     _debouncedUpdatePersistenceChannelState.cancel();

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

@@ -1017,8 +1017,39 @@ class StreamChatClient {
   /// ```
   Future<UpsertPushPreferencesResponse> setPushPreferences(
     List<PushPreferenceInput> preferences,
-  ) {
-    return _chatApi.device.setPushPreferences(preferences);
+  ) async {
+    final res = await _chatApi.device.setPushPreferences(preferences);
+
+    final currentUser = state.currentUser;
+    final currentUserId = currentUser?.id;
+    if (currentUserId == null) return res;
+
+    // Emit events for updated preferences
+    final updatedPushPreference = res.userPreferences[currentUserId];
+    if (updatedPushPreference != null) {
+      final pushPreferenceUpdatedEvent = Event(
+        type: EventType.pushPreferenceUpdated,
+        pushPreference: updatedPushPreference,
+      );
+
+      handleEvent(pushPreferenceUpdatedEvent);
+    }
+
+    // Emit events for updated channel-specific preferences
+    final channelPushPreferences = res.userChannelPreferences[currentUserId];
+    if (channelPushPreferences != null) {
+      for (final MapEntry(:key, :value) in channelPushPreferences.entries) {
+        final pushPreferenceUpdatedEvent = Event(
+          type: EventType.channelPushPreferenceUpdated,
+          cid: key,
+          channelPushPreference: value,
+        );
+
+        handleEvent(pushPreferenceUpdatedEvent);
+      }
+    }
+
+    return res;
   }
 
   /// Get a development token
@@ -2150,6 +2181,11 @@ class ClientState {
           if (event.unreadThreads case final count?) {
             currentUser = currentUser?.copyWith(unreadThreads: count);
           }
+
+          // Update the push preferences.
+          if (event.pushPreference case final preferences?) {
+            currentUser = currentUser?.copyWith(pushPreferences: preferences);
+          }
         }),
       );
 

packages/stream_chat/lib/src/core/models/draft_message.dart

@@ -189,11 +189,16 @@ extension MessageToDraftMessage on Message {
   /// This is useful when you want to convert a message to a draft message
   /// before sending it to the server.
   DraftMessage toDraftMessage() {
+    // Only include attachments that have been successfully uploaded.
+    final uploadedAttachments = attachments.where((it) {
+      return it.uploadState.isSuccess;
+    }).toList();
+
     return DraftMessage(
       id: id,
       text: text,
       type: type,
-      attachments: attachments,
+      attachments: uploadedAttachments,
       parentId: parentId,
       showInChannel: showInChannel,
       mentionedUsers: mentionedUsers,

packages/stream_chat/lib/src/core/models/event.dart

@@ -41,6 +41,8 @@ class Event {
     this.lastReadMessageId,
     this.draft,
     this.reminder,
+    this.pushPreference,
+    this.channelPushPreference,
     this.extraData = const {},
     this.isLocal = true,
   }) : createdAt = createdAt?.toUtc() ?? DateTime.now().toUtc();
@@ -154,6 +156,12 @@ class Event {
   /// The message reminder sent with the event.
   final MessageReminder? reminder;
 
+  /// Push notification preferences for the current user.
+  final PushPreference? pushPreference;
+
+  /// Push notification preferences for the current user for this channel.
+  final ChannelPushPreference? channelPushPreference;
+
   /// Map of custom channel extraData
   final Map<String, Object?> extraData;
 
@@ -193,6 +201,8 @@ class Event {
     'last_read_message_id',
     'draft',
     'reminder',
+    'push_preference',
+    'channel_push_preference',
   ];
 
   /// Serialize to json
@@ -234,6 +244,8 @@ class Event {
     String? lastReadMessageId,
     Draft? draft,
     MessageReminder? reminder,
+    PushPreference? pushPreference,
+    ChannelPushPreference? channelPushPreference,
     Map<String, Object?>? extraData,
   }) =>
       Event(
@@ -269,6 +281,9 @@ class Event {
         lastReadMessageId: lastReadMessageId ?? this.lastReadMessageId,
         draft: draft ?? this.draft,
         reminder: reminder ?? this.reminder,
+        pushPreference: pushPreference ?? this.pushPreference,
+        channelPushPreference:
+            channelPushPreference ?? this.channelPushPreference,
         isLocal: isLocal,
         extraData: extraData ?? this.extraData,
       );

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

@@ -182,4 +182,11 @@ class EventType {
 
   /// Event sent when a live shared location is expired.
   static const String locationExpired = 'location.expired';
+
+  /// Local event sent when push notification preference is updated.
+  static const String pushPreferenceUpdated = 'push_preference.updated';
+
+  /// Local event sent when channel push notification preference is updated.
+  static const String channelPushPreferenceUpdated =
+      'channel.push_preference.updated';
 }