Merge pull request #124 from sendbird/v4.2.24

Add 4.2.24.
sendbird · Oct 8, 2024 · 1727cfb · 1727cfb
2 parents bc9631c + 15194ac
commit 1727cfb
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## v4.2.24 (Oct 8, 2024)
+
+### Improvements
+- Fixed bugs regarding the events for `hide()` in `GroupChannel`
+- Fixed the message deletion bug in db regarding `resetMyHistory()`
+
 ## v4.2.23 (Sep 13, 2024)
 
 ### Improvements

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ Before installing Sendbird Chat SDK, you need to create a Sendbird application o
 
 ```yaml
 dependencies:
-  sendbird_chat_sdk: ^4.2.23
+  sendbird_chat_sdk: ^4.2.24
 ```
 
 - Run `flutter pub get` command in your project directory.

diff --git a/lib/src/internal/db/db.dart b/lib/src/internal/db/db.dart
@@ -381,7 +381,12 @@ class DB {
     int timestamp,
   ) async {
     return await CChannelMessage.getStartingPointMessages(
-        _chat, _isar, channelType, channelUrl, timestamp);
+      _chat,
+      _isar,
+      channelType,
+      channelUrl,
+      timestamp,
+    );
   }
 
   Future<void> deleteChannelMessage(String rootId) async {

diff --git a/lib/src/internal/main/chat/chat.dart b/lib/src/internal/main/chat/chat.dart
@@ -62,7 +62,7 @@ part 'chat_notifications.dart';
 part 'chat_push.dart';
 part 'chat_user.dart';
 
-const sdkVersion = '4.2.23';
+const sdkVersion = '4.2.24';
 
 // Internal implementation for main class. Do not directly access this class.
 class Chat with WidgetsBindingObserver {

diff --git a/lib/src/internal/main/chat_manager/collection_manager/collection_manager.dart b/lib/src/internal/main/chat_manager/collection_manager/collection_manager.dart
@@ -655,7 +655,7 @@ class InternalGroupChannelHandlerForCollectionManager
   void onChannelHidden(GroupChannel channel) {
     _collectionManager.sendEventsToGroupChannelCollectionList(
       eventSource: CollectionEventSource.eventChannelHidden,
-      deletedChannelUrls: [channel.channelUrl],
+      updatedChannels: [channel],
     );
   }
 

diff --git a/lib/src/internal/main/chat_manager/db_manager.dart b/lib/src/internal/main/chat_manager/db_manager.dart
@@ -407,20 +407,65 @@ class DBManager {
     required int timestamp,
     required MessageListParams params,
     required bool isPrevious,
+    int? messageOffsetTimestamp,
   }) async {
     if (isEnabled()) {
-      return await _db.getMessages(
+      List<RootMessage> messages = await _db.getMessages(
         channelType,
         channelUrl,
         sendingStatus,
         timestamp,
         params,
         isPrevious,
       );
+
+      if (channelType == ChannelType.group && messageOffsetTimestamp != null) {
+        return _applyMessageOffsetTimestamp(
+          channelType: channelType,
+          channelUrl: channelUrl,
+          messages: messages,
+          messageOffsetTimestamp: messageOffsetTimestamp,
+        );
+      } else {
+        return messages;
+      }
     }
     return [];
   }
 
+  Future<List<RootMessage>> _applyMessageOffsetTimestamp({
+    required ChannelType channelType,
+    required String channelUrl,
+    required List<RootMessage> messages,
+    required int messageOffsetTimestamp,
+  }) async {
+    List<RootMessage> resultMessages = [];
+    List<String> deletedMessageIds = [];
+
+    for (final message in messages) {
+      if (message.createdAt < messageOffsetTimestamp) {
+        deletedMessageIds.add(message.rootId);
+      } else {
+        resultMessages.add(message);
+      }
+    }
+
+    if (deletedMessageIds.isNotEmpty) {
+      await _db.deleteMessagesInChunk(
+        channelUrl: channelUrl,
+        rootIds: deletedMessageIds,
+      );
+
+      for (final messageId in deletedMessageIds) {
+        await _db.deleteUserMessage(messageId);
+        await _db.deleteFileMessage(messageId);
+        await _db.deleteAdminMessage(messageId);
+      }
+    }
+
+    return resultMessages;
+  }
+
   Future<List<BaseMessage>> getPendingMessages({
     required ChannelType channelType,
     required String channelUrl,
@@ -533,10 +578,25 @@ class DBManager {
     required ChannelType channelType,
     required String channelUrl,
     required int timestamp,
+    int? messageOffsetTimestamp,
   }) async {
     if (isEnabled()) {
-      return await _db.getStartingPointMessages(
-          channelType, channelUrl, timestamp);
+      List<RootMessage> messages = await _db.getStartingPointMessages(
+        channelType,
+        channelUrl,
+        timestamp,
+      );
+
+      if (channelType == ChannelType.group && messageOffsetTimestamp != null) {
+        return _applyMessageOffsetTimestamp(
+          channelType: channelType,
+          channelUrl: channelUrl,
+          messages: messages,
+          messageOffsetTimestamp: messageOffsetTimestamp,
+        );
+      } else {
+        return messages;
+      }
     }
     return [];
   }

diff --git a/lib/src/public/main/collection/group_channel_collection/group_channel_collection.dart b/lib/src/public/main/collection/group_channel_collection/group_channel_collection.dart
@@ -334,7 +334,11 @@ class GroupChannelCollection {
       }
     }
 
-    if (checkToUpdateChannel == false) {
+    if (checkToUpdateChannel) {
+      if (eventSource == CollectionEventSource.eventChannelHidden) {
+        return _canAddChannel(query: _query, channel: addedChannel);
+      }
+    } else {
       //+ DBManager
       if (_chat.dbManager.isEnabled()) {
         if (await _chat.dbManager.canAddChannel(

diff --git a/lib/src/public/main/collection/group_channel_message_collection/base_message_collection.dart b/lib/src/public/main/collection/group_channel_message_collection/base_message_collection.dart
@@ -219,13 +219,18 @@ abstract class BaseMessageCollection {
       final localInitializeParams = MessageListParams()
         ..copyWith(_initializeParams);
 
+      final int? messageOffsetTimestamp = (_channel is GroupChannel)
+          ? (_channel as GroupChannel).messageOffsetTimestamp
+          : null;
+
       final localPreviousMessages = await _chat.dbManager.getMessages(
         channelType: _channel.channelType,
         channelUrl: _channel.channelUrl,
         sendingStatus: SendingStatus.succeeded,
         timestamp: _startingPoint,
         params: localInitializeParams..inclusive = false,
         isPrevious: true,
+        messageOffsetTimestamp: messageOffsetTimestamp,
       );
 
       List<RootMessage> localStartingPointMessages = [];
@@ -234,6 +239,7 @@ abstract class BaseMessageCollection {
           channelType: _channel.channelType,
           channelUrl: _channel.channelUrl,
           timestamp: _startingPoint,
+          messageOffsetTimestamp: messageOffsetTimestamp,
         );
         localStartingPointMessages.addAll(messages);
       }
@@ -245,6 +251,7 @@ abstract class BaseMessageCollection {
         timestamp: _startingPoint,
         params: localInitializeParams..inclusive = false,
         isPrevious: false,
+        messageOffsetTimestamp: messageOffsetTimestamp,
       );
 
       if (_initializeParams.reverse) {

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: sendbird_chat_sdk
 description: With Sendbird Chat for Flutter, you can easily build an in-app chat with all the essential messaging features.
-version: 4.2.23
+version: 4.2.24
 homepage: https://sendbird.com
 repository: https://github.com/sendbird/sendbird-chat-sdk-flutter
 documentation: https://sendbird.com/docs/chat/sdk/v4/flutter/getting-started/send-first-message