From be8b319691c641757c951793c8c68da0845bd055 Mon Sep 17 00:00:00 2001
From: Deven Joshi <deven9852@gmail.com>
Date: Wed, 10 Nov 2021 20:01:02 +0530
Subject: [PATCH] fixes name

---
 .../lib/src/core/api/requests.dart            | 12 +++++-----
 .../lib/src/core/api/requests.g.dart          |  4 ++--
 .../lib/src/stream_channel.dart               | 22 +++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/packages/stream_chat/lib/src/core/api/requests.dart b/packages/stream_chat/lib/src/core/api/requests.dart
index 76272241..6f00b374 100644
--- a/packages/stream_chat/lib/src/core/api/requests.dart
+++ b/packages/stream_chat/lib/src/core/api/requests.dart
@@ -64,7 +64,7 @@ class PaginationParams extends Equatable {
     this.after = 10,
     this.offset,
     this.next,
-    this.aroundId,
+    this.idAround,
     this.greaterThan,
     this.greaterThanOrEqual,
     this.lessThan,
@@ -94,8 +94,8 @@ class PaginationParams extends Equatable {
   final String? next;
 
   /// Message ID to fetch messages around
-  @JsonKey(name: 'around_id')
-  final String? aroundId;
+  @JsonKey(name: 'id_around')
+  final String? idAround;
 
   /// Filter on ids greater than the given value.
   @JsonKey(name: 'id_gt')
@@ -122,7 +122,7 @@ class PaginationParams extends Equatable {
     int? before,
     int? after,
     int? offset,
-    String? aroundId,
+    String? idAround,
     String? next,
     String? greaterThan,
     String? greaterThanOrEqual,
@@ -134,7 +134,7 @@ class PaginationParams extends Equatable {
         before: before ?? this.before,
         after: limit ?? this.after,
         offset: offset ?? this.offset,
-        aroundId: aroundId ?? this.aroundId,
+        idAround: idAround ?? this.idAround,
         next: next ?? this.next,
         greaterThan: greaterThan ?? this.greaterThan,
         greaterThanOrEqual: greaterThanOrEqual ?? this.greaterThanOrEqual,
@@ -149,7 +149,7 @@ class PaginationParams extends Equatable {
         after,
         offset,
         next,
-        aroundId,
+        idAround,
         greaterThan,
         greaterThanOrEqual,
         lessThan,
diff --git a/packages/stream_chat/lib/src/core/api/requests.g.dart b/packages/stream_chat/lib/src/core/api/requests.g.dart
index 5a9e67bd..7d45ee86 100644
--- a/packages/stream_chat/lib/src/core/api/requests.g.dart
+++ b/packages/stream_chat/lib/src/core/api/requests.g.dart
@@ -25,7 +25,7 @@ PaginationParams _$PaginationParamsFromJson(Map<String, dynamic> json) =>
       after: json['after'] as int? ?? 10,
       offset: json['offset'] as int?,
       next: json['next'] as String?,
-      aroundId: json['around_id'] as String?,
+      idAround: json['id_around'] as String?,
       greaterThan: json['id_gt'] as String?,
       greaterThanOrEqual: json['id_gte'] as String?,
       lessThan: json['id_lt'] as String?,
@@ -47,7 +47,7 @@ Map<String, dynamic> _$PaginationParamsToJson(PaginationParams instance) {
 
   writeNotNull('offset', instance.offset);
   writeNotNull('next', instance.next);
-  writeNotNull('around_id', instance.aroundId);
+  writeNotNull('id_around', instance.idAround);
   writeNotNull('id_gt', instance.greaterThan);
   writeNotNull('id_gte', instance.greaterThanOrEqual);
   writeNotNull('id_lt', instance.lessThan);
diff --git a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
index 62dc8a4a..633c3137 100644
--- a/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
+++ b/packages/stream_chat_flutter_core/lib/src/stream_channel.dart
@@ -227,13 +227,13 @@ class StreamChannelState extends State<StreamChannel> {
         preferOffline: preferOffline,
       );
 
-  Future<List<ChannelState>> _queryAtMessage({
+  Future<ChannelState?> _queryAtMessage({
     String? messageId,
     int before = 20,
     int after = 20,
     bool preferOffline = false,
   }) async {
-    if (channel.state == null) return [];
+    if (channel.state == null) return null;
     channel.state!.isUpToDate = false;
     channel.state!.truncate();
 
@@ -245,17 +245,15 @@ class StreamChannelState extends State<StreamChannel> {
         preferOffline: preferOffline,
       );
       channel.state!.isUpToDate = true;
-      return [];
+      return null;
     }
 
-    return Future.wait([
-      queryAroundMessage(
-        messageId,
-        before: before,
-        after: after,
-        preferOffline: preferOffline,
-      ),
-    ]);
+    return queryAroundMessage(
+      messageId,
+      before: before,
+      after: after,
+      preferOffline: preferOffline,
+    );
   }
 
   ///
@@ -267,7 +265,7 @@ class StreamChannelState extends State<StreamChannel> {
   }) =>
       channel.query(
         messagesPagination: PaginationParams(
-          aroundId: messageId,
+          idAround: messageId,
           before: before,
           after: after,
         ),