Merge master to v10.0.0 (08.06.2026) (#2731)

* perf(persistence): Reduce the number of read message per channel from DB when paginating (part 1) (#2679)

* refactor(dao): Filter reactions by userId at DB level.

* refactor(dao): Filter reactions by userId at DB level (pinned messages).

* refactor(dao): optimize message retrieval with SQL-side pagination filters

* refactor(dao): fix formatting

* refactor(dao): Update CHANGELOG.md

* refactor(dao): Apply formatting

* refactor(dao): enhance message pagination logic to support inclusive cursors

* refactor(dao): Update docs

* refactor(dao): Add message.id tiebreakier

* refactor(dao): Add message.id tiebreaker

* refactor(dao): Update CHANGELOG.md

* perf(persistence): Reduce the number of read message per channel from DB when paginating (part 2) (#2681)

* refactor(dao): Filter reactions by userId at DB level.

* refactor(dao): Filter reactions by userId at DB level (pinned messages).

* refactor(dao): optimize message retrieval with SQL-side pagination filters

* refactor(dao): fix formatting

* refactor(dao): Update CHANGELOG.md

* refactor(dao): Apply formatting

* refactor(dao): optimize message and reaction retrieval with grouped queries

* refactor(dao): add tests for new methods

* refactor(dao): enhance message pagination logic to support inclusive cursors

* refactor(dao): Update docs

* refactor(dao): Remove legacy method

* refactor(dao): Remove legacy method

* refactor(dao): Remove legacy method

* refactor(dao): Fix warnings

* refactor(dao): Add message.id tiebreakier

* refactor(dao): Add message.id tiebreaker

* refactor(dao): Update CHANGELOG.md

* fix(persistence): Prevent fetching drafts/quotes for quoted messages.

* chore(repo): release v9.25.0 (#2730)

* feat(persistence): Add batched getLocationsByMessageIds.

* Clean-up location dao.

* Fix formatting.

* Fix PR remarks.

---------

Co-authored-by: Sahil Kumar <xdsahil@gmail.com>

Author: VelikovPetar

packages/stream_chat/CHANGELOG.md

@@ -34,6 +34,10 @@
 - Fixed quoted poll messages losing their poll, shared-location, or nested-quote content when the server omits it from the `quoted_message` payload during channel re-sync.
 - Fixed a poll attached to a parent message disappearing when a thread reply was added; partial `message.updated` events no longer clobber locally-known `poll` / `sharedLocation` on the parent.
 
+## 9.25.0
+
+- Minor bug fixes and improvements
+
 ## 9.24.0
 
 🔒 Security

packages/stream_chat_flutter/CHANGELOG.md

@@ -155,7 +155,7 @@
 - Fixed tapping a quoted parent message inside a thread doing nothing (or kicking back to the channel). The thread message list now resolves the parent slot directly and scrolls/highlights it instead of falling through to `loadChannelAtMessage`.
 - Fixed the jump-to-message highlight starting before the scroll settled, which made the fade barely visible (or invisible if the target hadn't been mounted yet). The message list now awaits the scroll, then plays a 1s hold + 1s ease-out fade — closer to the highlight feel in Slack's permalink jump.
 
-## Upcoming Changes
+## 9.25.0
 
 🐞 Fixed
 

packages/stream_chat_flutter_core/CHANGELOG.md

@@ -32,7 +32,7 @@
 - Fixed `StreamChatCore` disconnecting the WebSocket immediately on background when no `onBackgroundEventReceived` handler was provided; the keep-alive timer now fires before the connection closes regardless of whether a handler is set.
 - Fixed `StreamMessageComposerController.cancelEditMessage` losing the pre-edit draft when a remote update arrived for the message being edited.
 
-## Upcoming Changes
+## 9.25.0
 
 ✅ Added
 

packages/stream_chat_localizations/CHANGELOG.md

@@ -58,6 +58,10 @@
 - Reworded `flagLabel`, `cancelLabel` and `deleteLabel` defaults from uppercase to sentence case across all supported locales (e.g. English: `'FLAG'` → `'Flag'`, `'CANCEL'` → `'Cancel'`, `'DELETE'` → `'Delete'`) so dialog buttons render in the same case as the rest of the system.
 - Raised minimum Flutter to `>=3.41.0` and Dart SDK to `^3.11.0`.
 
+## 9.25.0
+
+- Updated `stream_chat_flutter` dependency to [`9.25.0`](https://pub.dev/packages/stream_chat_flutter/changelog).
+
 ## 9.24.0
 
 - Updated `stream_chat_flutter` dependency to [`9.24.0`](https://pub.dev/packages/stream_chat_flutter/changelog).

packages/stream_chat_persistence/CHANGELOG.md

@@ -9,14 +9,21 @@
 
 - Fixed channel list re-sorting on refresh or when returning from background.
 
-# Upcoming
+## 9.25.0
 
 🚀 Performance
 
 - Reduce the number of DB reads in the `ChatPersistenceClient.getChannelStates` method.
+- Read only the messages matching the `PaginationParams` from DB when calling `MessageDao.getMessagesByCid` instead of reading all messages for the channel and applying pagination in memory.
+- Read only the reactions matching the `userId` from DB when calling `ReactionDao.getReactionsByUserId` instead of reading all reactions for the message and filtering in memory.
+- Read only the reactions matching the `userId` from DB when calling `PinnedMessageReactionDao.getReactionsByUserId` instead of reading all reactions for the message and filtering in memory.
+- Improve the message read times from DB.
 
-🐛 Fixed
+🐞 Fixed
 
+- `MessageDao.getMessagesByCid` now honours `PaginationParams.lessThanOrEqual` and `PaginationParams.greaterThanOrEqual` (inclusive of the cursor message), in addition to the existing strict `lessThan`/`greaterThan`.
+- `MessageDao.getMessagesByCid` now treats `PaginationParams.greaterThan` as strict (exclusive of the cursor), matching the `PaginationParams` contract and the existing `lessThan` behaviour.
+- `MessageDao.getMessagesByCid` with a forward cursor (`greaterThan`/`greaterThanOrEqual`) and a `limit` now returns the messages immediately AFTER the pivot, instead of the channel tail — mirroring how `lessThan` already returned the messages immediately before the pivot.
 - Fixed missing persistence of the `team` field on channel entities.
 
 🔄 Changed

packages/stream_chat_persistence/lib/src/dao/draft_message_dao.dart

@@ -3,6 +3,7 @@
 import 'package:drift/drift.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/drift_chat_database.dart';
+import 'package:stream_chat_persistence/src/db/query_utils.dart';
 import 'package:stream_chat_persistence/src/entity/entity.dart';
 import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
@@ -74,6 +75,26 @@ class DraftMessageDao extends DatabaseAccessor<DriftChatDatabase> with _$DraftMe
     return _draftFromEntity(result);
   }
 
+  /// Returns thread drafts in [cid] for every parent message id in
+  /// [parentIds], keyed by parent message id.
+  Future<Map<String, Draft?>> getDraftMessagesByParentIds(
+    String cid,
+    List<String> parentIds,
+  ) async {
+    if (parentIds.isEmpty) return const {};
+    final result = <String, Draft?>{for (final id in parentIds) id: null};
+    for (final chunk in chunked(parentIds)) {
+      final query = select(draftMessages)..where((tbl) => tbl.channelCid.equals(cid) & tbl.parentId.isIn(chunk));
+      final entities = await query.get();
+      for (final entity in entities) {
+        if (entity.parentId case final pid?) {
+          result[pid] = await _draftFromEntity(entity);
+        }
+      }
+    }
+    return result;
+  }
+
   /// Updates the draft message data of a particular channel with
   /// the new [messageList] data.
   Future<void> updateDraftMessages(List<Draft> draftMessageList) {

packages/stream_chat_persistence/lib/src/dao/location_dao.dart

@@ -3,6 +3,7 @@
 import 'package:drift/drift.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/drift_chat_database.dart';
+import 'package:stream_chat_persistence/src/db/query_utils.dart';
 import 'package:stream_chat_persistence/src/entity/locations.dart';
 import 'package:stream_chat_persistence/src/mapper/mapper.dart';
 
@@ -63,6 +64,38 @@ class LocationDao extends DatabaseAccessor<DriftChatDatabase> with _$LocationDao
     return _locationFromEntity(result);
   }
 
+  /// Returns the shared location for every id in [messageIds], keyed by
+  /// message id. Messages with no associated location are absent from the
+  /// map.
+  ///
+  /// Returned `Location`s do not populate `Location.message` /
+  /// `Location.channel`. The batched method is consumed by
+  /// `MessageDao._messagesFromJoinRows`, which attaches the result as
+  /// `Message.sharedLocation` on the message it is currently assembling —
+  /// the linked fields would just be redundant copies of the parent Message
+  /// and Channel. Hydrating them here would also re-enter
+  /// `MessageDao.getMessageById` and open a cycle through quoted-message
+  /// resolution whenever any link in the chain has a location. Consumers
+  /// that need the linked `message` / `channel` should use
+  /// [getLocationByMessageId] or [getLocationsByCid].
+  Future<Map<String, Location>> getLocationsByMessageIds(
+    List<String> messageIds,
+  ) async {
+    if (messageIds.isEmpty) return const {};
+    final result = <String, Location>{};
+    for (final chunk in chunked(messageIds)) {
+      final query = select(locations)..where((tbl) => tbl.messageId.isIn(chunk));
+      final entities = await query.get();
+      for (final entity in entities) {
+        if (entity.messageId case final id?) {
+          // Don't enrich message/channel (see method doc)
+          result[id] = entity.toLocation();
+        }
+      }
+    }
+    return result;
+  }
+
   /// Update multiple locations
   Future<void> updateLocations(List<Location> locationList) {
     return batch(