From c49641fde7eec5794a57c11f5204282bf4372f62 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Mon, 14 Feb 2022 19:52:50 +0530 Subject: [PATCH 01/18] test(llc): fix markAllRead test Signed-off-by: xsahil03x --- packages/stream_chat/test/src/core/api/channel_api_test.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stream_chat/test/src/core/api/channel_api_test.dart b/packages/stream_chat/test/src/core/api/channel_api_test.dart index 7835ab6a..e631fdb2 100644 --- a/packages/stream_chat/test/src/core/api/channel_api_test.dart +++ b/packages/stream_chat/test/src/core/api/channel_api_test.dart @@ -175,14 +175,14 @@ void main() { test('markAllRead', () async { const path = '/channels/read'; - when(() => client.post(path)).thenAnswer( + when(() => client.post(path, data: {})).thenAnswer( (_) async => successResponse(path, data: {})); final res = await channelApi.markAllRead(); expect(res, isNotNull); - verify(() => client.post(path)).called(1); + verify(() => client.post(path, data: {})).called(1); verifyNoMoreInteractions(client); }); From 338b4ac6198b5d329a079596140e5c2a7dd35511 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Mon, 14 Feb 2022 20:04:49 +0530 Subject: [PATCH 02/18] chore(llc): fix lint Signed-off-by: xsahil03x --- packages/stream_chat/lib/src/client/channel.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index d3900842..945574fd 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -1322,7 +1322,8 @@ class Channel { /// Remove the ban for the user with given [userID] in the channel. @Deprecated( - "Use 'unbanMember' instead. This method will be removed in v4.0.0") + "Use 'unbanMember' instead. This method will be removed in v4.0.0", + ) Future unbanUser(String userID) => unbanMember(userID); /// Remove the ban for the member with given [userID] in the channel. From 6e2f7855aa951133bf465eed68c87011aeebe4da Mon Sep 17 00:00:00 2001 From: GroovinChip Date: Mon, 14 Feb 2022 10:04:09 -0500 Subject: [PATCH 03/18] (chore:flutter) - run sample app on macos Some xcode project settings were updated due to building for macos --- .../example/ios/Runner.xcodeproj/project.pbxproj | 4 ++-- .../Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/project.pbxproj b/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/project.pbxproj index 1721e6f1..4b1a8d5d 100644 --- a/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/project.pbxproj +++ b/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 46; + objectVersion = 50; objects = { /* Begin PBXBuildFile section */ @@ -156,7 +156,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1300; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index a28140cf..3db53b6e 100644 --- a/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/packages/stream_chat_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 15 Feb 2022 16:26:41 +0530 Subject: [PATCH 04/18] fix(ui): fix `unban` command not working in `MessageInput` Signed-off-by: xsahil03x --- packages/stream_chat_flutter/CHANGELOG.md | 6 ++++++ .../lib/src/message_input.dart | 20 +++++++++++++++++++ .../lib/src/message_text.dart | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index f19972b4..d68549e1 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -1,3 +1,9 @@ +## Upcoming + +🐞 Fixed + +- [[#888]](https://github.com/GetStream/stream-chat-flutter/issues/888) Fix `unban` command not working in `MessageInput`. + ## 3.4.0 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog). diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart index 8672f180..d1a45786 100644 --- a/packages/stream_chat_flutter/lib/src/message_input.dart +++ b/packages/stream_chat_flutter/lib/src/message_input.dart @@ -1816,6 +1816,8 @@ class MessageInputState extends State { _mentionedUsers.clear(); + message = _replaceUserNameWithId(message); + try { Future sendingFuture; if (widget.editMessage == null || @@ -2081,3 +2083,21 @@ class _CountdownButton extends StatelessWidget { ), ); } + +Message _replaceUserNameWithId(Message message) { + final mentionedUsers = message.mentionedUsers; + if (mentionedUsers.isEmpty) return message; + + var messageTextToSend = message.text; + if (messageTextToSend == null) return message; + + for (final user in mentionedUsers.toSet()) { + final userName = user.name; + messageTextToSend = messageTextToSend!.replaceAll( + '@$userName', + '@${user.id}', + ); + } + + return message.copyWith(text: messageTextToSend); +} diff --git a/packages/stream_chat_flutter/lib/src/message_text.dart b/packages/stream_chat_flutter/lib/src/message_text.dart index bb2946f4..4787bb9e 100644 --- a/packages/stream_chat_flutter/lib/src/message_text.dart +++ b/packages/stream_chat_flutter/lib/src/message_text.dart @@ -84,9 +84,10 @@ class MessageText extends StatelessWidget { String _replaceMentions(String text) { var messageTextToRender = text; for (final user in message.mentionedUsers.toSet()) { + final userId = user.id; final userName = user.name; messageTextToRender = messageTextToRender.replaceAll( - '@$userName', + '@$userId', '[@$userName](@${userName.replaceAll(' ', '')})', ); } From 538fdd6bc58daf7ac4d0bfc0624424cf984e079f Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 12:15:55 +0530 Subject: [PATCH 05/18] Exposed score in the sendReaction function for channel --- packages/stream_chat/lib/src/client/channel.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index 945574fd..fe25626e 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -811,6 +811,7 @@ class Channel { Future sendReaction( Message message, String type, { + int? score, Map extraData = const {}, bool enforceUnique = false, }) async { @@ -862,6 +863,13 @@ class Channel { state?.addMessage(newMessage); + if (score != null) { + extraData.putIfAbsent( + 'score', + () => score, + ); + } + try { final reactionResp = await _client.sendReaction( messageId, From 3fc9aabe6f0e5b5cfb7172c1a6a23f11e34b30a8 Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 14:05:48 +0530 Subject: [PATCH 06/18] Exposed score for send reaction in the client side as well --- .../stream_chat/lib/src/client/channel.dart | 12 +++-------- .../stream_chat/lib/src/client/client.dart | 21 ++++++++++++------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart index fe25626e..fdd1d1d6 100644 --- a/packages/stream_chat/lib/src/client/channel.dart +++ b/packages/stream_chat/lib/src/client/channel.dart @@ -811,7 +811,7 @@ class Channel { Future sendReaction( Message message, String type, { - int? score, + int score = 1, Map extraData = const {}, bool enforceUnique = false, }) async { @@ -830,7 +830,7 @@ class Channel { createdAt: now, type: type, user: user, - score: 1, + score: score, extraData: extraData, ); @@ -863,17 +863,11 @@ class Channel { state?.addMessage(newMessage); - if (score != null) { - extraData.putIfAbsent( - 'score', - () => score, - ); - } - try { final reactionResp = await _client.sendReaction( messageId, type, + score: score, extraData: extraData, enforceUnique: enforceUnique, ); diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart index a9486c08..f44f3d52 100644 --- a/packages/stream_chat/lib/src/client/client.dart +++ b/packages/stream_chat/lib/src/client/client.dart @@ -1157,15 +1157,22 @@ class StreamChatClient { Future sendReaction( String messageId, String reactionType, { + int score = 1, Map extraData = const {}, bool enforceUnique = false, - }) => - _chatApi.message.sendReaction( - messageId, - reactionType, - extraData: extraData, - enforceUnique: enforceUnique, - ); + }) { + extraData.putIfAbsent( + 'score', + () => score, + ); + + return _chatApi.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + enforceUnique: enforceUnique, + ); + } /// Delete a [reactionType] from this [messageId] Future deleteReaction( From 6fa746fec350b8508111498bc92e17bf550828b4 Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 18:51:06 +0530 Subject: [PATCH 07/18] Fixed unmodifiable const map bug and added client and channel tests --- .../stream_chat/lib/src/client/client.dart | 10 +- .../test/src/client/channel_test.dart | 129 ++++++++++++++++++ .../test/src/client/client_test.dart | 114 ++++++++++++++-- 3 files changed, 234 insertions(+), 19 deletions(-) diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart index f44f3d52..9c593694 100644 --- a/packages/stream_chat/lib/src/client/client.dart +++ b/packages/stream_chat/lib/src/client/client.dart @@ -1161,15 +1161,15 @@ class StreamChatClient { Map extraData = const {}, bool enforceUnique = false, }) { - extraData.putIfAbsent( - 'score', - () => score, - ); + final _extraData = { + 'score': score, + ...extraData, + }; return _chatApi.message.sendReaction( messageId, reactionType, - extraData: extraData, + extraData: _extraData, enforceUnique: enforceUnique, ); } diff --git a/packages/stream_chat/test/src/client/channel_test.dart b/packages/stream_chat/test/src/client/channel_test.dart index adbfb388..cc89c44b 100644 --- a/packages/stream_chat/test/src/client/channel_test.dart +++ b/packages/stream_chat/test/src/client/channel_test.dart @@ -1116,6 +1116,135 @@ void main() { verify(() => client.sendReaction(message.id, type)).called(1); }); + test('should work fine with score passed explicitly', () async { + const type = 'test-reaction-type'; + final message = Message(id: 'test-message-id'); + + const score = 5; + final reaction = Reaction( + type: type, + messageId: message.id, + score: score, + ); + + when(() => client.sendReaction( + message.id, + type, + score: score, + )).thenAnswer( + (_) async => SendReactionResponse() + ..message = message + ..reaction = reaction, + ); + + expectLater( + // skipping first seed message list -> [] messages + channel.state?.messagesStream.skip(1), + emitsInOrder([ + [ + isSameMessageAs( + message.copyWith( + status: MessageSendingStatus.sent, + reactionCounts: {type: 1}, + reactionScores: {type: score}, + latestReactions: [reaction], + ownReactions: [reaction], + ), + matchReactions: true, + matchSendingStatus: true, + ), + ], + ]), + ); + + final res = await channel.sendReaction( + message, + type, + score: score, + ); + + expect(res, isNotNull); + expect(res.reaction.type, type); + expect(res.reaction.messageId, message.id); + expect(res.reaction.score, score); + + verify(() => client.sendReaction( + message.id, + type, + score: score, + )).called(1); + }); + + test('should work fine with score passed explicitly and in extraData', + () async { + const type = 'test-reaction-type'; + final message = Message(id: 'test-message-id'); + + const score = 5; + const extraDataScore = 3; + const extraData = { + 'score': extraDataScore, + }; + final reaction = Reaction( + type: type, + messageId: message.id, + score: extraDataScore, + ); + + when(() => client.sendReaction( + message.id, + type, + score: score, + extraData: extraData, + )).thenAnswer( + (_) async => SendReactionResponse() + ..message = message + ..reaction = reaction, + ); + + expectLater( + // skipping first seed message list -> [] messages + channel.state?.messagesStream.skip(1), + emitsInOrder([ + [ + isSameMessageAs( + message.copyWith( + status: MessageSendingStatus.sent, + reactionCounts: {type: 1}, + reactionScores: {type: extraDataScore}, + latestReactions: [reaction], + ownReactions: [reaction], + ), + matchReactions: true, + matchSendingStatus: true, + ), + ], + ]), + ); + + final res = await channel.sendReaction( + message, + type, + score: score, + extraData: extraData, + ); + + expect(res, isNotNull); + expect(res.reaction.type, type); + expect(res.reaction.messageId, message.id); + expect( + res.reaction.score, + extraDataScore, + ); + + verify(() => client.sendReaction( + message.id, + type, + score: score, + extraData: extraData, + )).called(1); + }); + test( 'should restore previous message if `client.sendReaction` throws', () async { diff --git a/packages/stream_chat/test/src/client/client_test.dart b/packages/stream_chat/test/src/client/client_test.dart index b89db0dc..c9aa8968 100644 --- a/packages/stream_chat/test/src/client/client_test.dart +++ b/packages/stream_chat/test/src/client/client_test.dart @@ -1956,23 +1956,109 @@ void main() { verifyNoMoreInteractions(api.channel); }); - test('`.sendReaction`', () async { - const messageId = 'test-message-id'; - const reactionType = 'like'; + group('`.sendReaction`', () { + test('`.sendReaction with default params`', () async { + const messageId = 'test-message-id'; + const reactionType = 'like'; + const extraData = {'score': 1}; - when(() => api.message.sendReaction(messageId, reactionType)) - .thenAnswer((_) async => SendReactionResponse() - ..message = Message(id: messageId) - ..reaction = Reaction(type: reactionType, messageId: messageId)); + when(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).thenAnswer((_) async => SendReactionResponse() + ..message = Message(id: messageId) + ..reaction = Reaction(type: reactionType, messageId: messageId)); - final res = await client.sendReaction(messageId, reactionType); - expect(res, isNotNull); - expect(res.message.id, messageId); - expect(res.reaction.type, reactionType); - expect(res.reaction.messageId, messageId); + final res = await client.sendReaction(messageId, reactionType); + expect(res, isNotNull); + expect(res.message.id, messageId); + expect(res.reaction.type, reactionType); + expect(res.reaction.messageId, messageId); - verify(() => api.message.sendReaction(messageId, reactionType)).called(1); - verifyNoMoreInteractions(api.message); + verify(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).called(1); + verifyNoMoreInteractions(api.message); + }); + + test('`.sendReaction with score`', () async { + const messageId = 'test-message-id'; + const reactionType = 'like'; + const score = 3; + const extraData = {'score': score}; + + when(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).thenAnswer((_) async => SendReactionResponse() + ..message = Message(id: messageId) + ..reaction = Reaction( + type: reactionType, + messageId: messageId, + score: score, + )); + + final res = await client.sendReaction( + messageId, + reactionType, + score: score, + ); + expect(res, isNotNull); + expect(res.message.id, messageId); + expect(res.reaction.type, reactionType); + expect(res.reaction.messageId, messageId); + expect(res.reaction.score, score); + + verify(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).called(1); + verifyNoMoreInteractions(api.message); + }); + + test('`.sendReaction with score passed in extradata also`', () async { + const messageId = 'test-message-id'; + const reactionType = 'like'; + const score = 3; + const extraDataScore = 5; + const extraData = {'score': extraDataScore}; + + when(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).thenAnswer((_) async => SendReactionResponse() + ..message = Message(id: messageId) + ..reaction = Reaction( + type: reactionType, + messageId: messageId, + score: extraDataScore, + )); + + final res = await client.sendReaction( + messageId, + reactionType, + score: score, + extraData: extraData, + ); + expect(res, isNotNull); + expect(res.message.id, messageId); + expect(res.reaction.type, reactionType); + expect(res.reaction.messageId, messageId); + expect(res.reaction.score, extraDataScore); + + verify(() => api.message.sendReaction( + messageId, + reactionType, + extraData: extraData, + )).called(1); + verifyNoMoreInteractions(api.message); + }); }); test('`.deleteReaction`', () async { From 392a5ffa531bb568f249881e28e006cf84bc9bee Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 19:13:34 +0530 Subject: [PATCH 08/18] Made an entry into stream_chat changelog --- packages/stream_chat/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 787aa2af..ece8a30e 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,3 +1,7 @@ +## Upcoming + +- You can now pass `score` to `client.sendReaction` and `channel.sendReaction` functions + ## 3.4.0 🐞 Fixed From 0db466b5b3614f67d48890d4aab4e612bbaa377a Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 19:21:20 +0530 Subject: [PATCH 09/18] Changelog addition --- packages/stream_chat/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 8226e977..ee554704 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -1,5 +1,7 @@ ## Upcoming +✅ Added + - You can now pass `score` to `client.sendReaction` and `channel.sendReaction` functions 🐞 Fixed From 6a4caff89783aeec1ec9d80ea1843c66b4e1a377 Mon Sep 17 00:00:00 2001 From: Ayush Shekhar Date: Wed, 16 Feb 2022 19:25:50 +0530 Subject: [PATCH 10/18] Removed extra - from changelog --- packages/stream_chat/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index ee554704..91077303 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -7,7 +7,6 @@ 🐞 Fixed - [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890). Fixed Reactions not updating on thread messages. Thanks [bstolinski](https://github.com/bstolinski). -- ## 3.4.0 🐞 Fixed From ca01ca28d5a1c261f149d10847e6f70324550338 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Feb 2022 14:58:18 +0530 Subject: [PATCH 11/18] fix(llc): add type check in auth_interceptor.dart Signed-off-by: xsahil03x --- .../lib/src/core/http/interceptor/auth_interceptor.dart | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart b/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart index 37f618f5..0ef1a408 100644 --- a/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart +++ b/packages/stream_chat/lib/src/core/http/interceptor/auth_interceptor.dart @@ -49,10 +49,13 @@ class AuthInterceptor extends Interceptor { DioError err, ErrorInterceptorHandler handler, ) async { - ErrorResponse? error; final data = err.response?.data; - if (data != null) error = ErrorResponse.fromJson(data); - if (error?.code == ChatErrorCode.tokenExpired.code) { + if (data == null || data is! Map) { + return handler.next(err); + } + + final error = ErrorResponse.fromJson(data); + if (error.code == ChatErrorCode.tokenExpired.code) { if (_tokenManager.isStatic) return handler.next(err); _client.lock(); await _tokenManager.loadToken(refresh: true); From d21adb99571a789d3127a25e4d34004c16226041 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Feb 2022 15:00:03 +0530 Subject: [PATCH 12/18] chore(llc): Update CHANGELOG.md Signed-off-by: xsahil03x --- packages/stream_chat/CHANGELOG.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 91077303..0c35a7a3 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -6,16 +6,21 @@ 🐞 Fixed -- [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890). Fixed Reactions not updating on thread messages. Thanks [bstolinski](https://github.com/bstolinski). +- [[#890]](https://github.com/GetStream/stream-chat-flutter/pull/890) Fixed Reactions not updating on thread messages. + Thanks [bstolinski](https://github.com/bstolinski). +- [[#897]](https://github.com/GetStream/stream-chat-flutter/issues/897) Fixed error type mis-match in `AuthInterceptor`. + ## 3.4.0 🐞 Fixed - [[#857]](https://github.com/GetStream/stream-chat-flutter/issues/857) Channel now listens for member ban/unban and updates the channel state with the latest data. -- [[#748]](https://github.com/GetStream/stream-chat-flutter/issues/748) `Message.user` is now also included while saving users in persistence. +- [[#748]](https://github.com/GetStream/stream-chat-flutter/issues/748) `Message.user` is now also included while saving + users in persistence. - [[#871]](https://github.com/GetStream/stream-chat-flutter/issues/871) Fixed thread message deletion. -- [[#846]](https://github.com/GetStream/stream-chat-flutter/issues/846) Fixed `message.ownReactions` getting truncated when receiving a reaction event. +- [[#846]](https://github.com/GetStream/stream-chat-flutter/issues/846) Fixed `message.ownReactions` getting truncated + when receiving a reaction event. - Add check for invalid image URLs - Fix `channelState.pinnedMessagesStream` getting reset to `0` after a channel update. - Fixed `unreadCount` after removing user from a channel. From ea38750a44682521a764377eff9d51e82919a1a8 Mon Sep 17 00:00:00 2001 From: S-ecki <75510543+S-ecki@users.noreply.github.com> Date: Fri, 18 Feb 2022 10:39:17 +0100 Subject: [PATCH 13/18] update chewie to newest version fixes issue #805 --- packages/stream_chat_flutter/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/stream_chat_flutter/pubspec.yaml b/packages/stream_chat_flutter/pubspec.yaml index eba6b7f8..348b8205 100644 --- a/packages/stream_chat_flutter/pubspec.yaml +++ b/packages/stream_chat_flutter/pubspec.yaml @@ -12,7 +12,7 @@ environment: dependencies: cached_network_image: ^3.0.0 characters: ^1.1.0 - chewie: ^1.2.0 + chewie: ^1.3.0 collection: ^1.15.0 diacritic: ^0.1.3 dio: ^4.0.0 From d4b9a10e54c5faa3132a81900ea4e11ba731c74e Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Feb 2022 17:12:27 +0530 Subject: [PATCH 14/18] feat(llc): add support for `partialUserUpdate` endpoint. Signed-off-by: xsahil03x --- .../stream_chat/lib/src/client/client.dart | 22 ++++++++++ .../lib/src/core/api/requests.dart | 26 ++++++++++++ .../lib/src/core/api/requests.g.dart | 11 +++++ .../lib/src/core/api/user_api.dart | 13 ++++++ .../lib/src/core/models/channel_state.g.dart | 2 +- .../test/src/client/client_test.dart | 40 +++++++++++++++++++ 6 files changed, 113 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat/lib/src/client/client.dart b/packages/stream_chat/lib/src/client/client.dart index 9c593694..c3605ac5 100644 --- a/packages/stream_chat/lib/src/client/client.dart +++ b/packages/stream_chat/lib/src/client/client.dart @@ -1073,6 +1073,28 @@ class StreamChatClient { Future updateUsers(List users) => _chatApi.user.updateUsers(users); + /// Partially update the given user with [id]. + /// Use [set] to define values to be set. + /// Use [unset] to define values to be unset. + Future partialUpdateUser( + String id, { + Map? set, + List? unset, + }) { + final user = PartialUpdateUserRequest( + id: id, + set: set, + unset: unset, + ); + return partialUpdateUsers([user]); + } + + /// Batch partial updates the [users]. + Future partialUpdateUsers( + List users, + ) => + _chatApi.user.partialUpdateUsers(users); + /// Bans a user from all channels Future banUser( String targetUserId, [ diff --git a/packages/stream_chat/lib/src/core/api/requests.dart b/packages/stream_chat/lib/src/core/api/requests.dart index 6f00b374..3f4e79de 100644 --- a/packages/stream_chat/lib/src/core/api/requests.dart +++ b/packages/stream_chat/lib/src/core/api/requests.dart @@ -156,3 +156,29 @@ class PaginationParams extends Equatable { lessThanOrEqual, ]; } + +/// Request model for the [client.partialUpdateUser] api call. +@JsonSerializable(createFactory: false) +class PartialUpdateUserRequest extends Equatable { + /// Creates a new PartialUpdateUserRequest instance. + const PartialUpdateUserRequest({ + required this.id, + this.set, + this.unset, + }); + + /// User ID. + final String id; + + /// Fields to set. + final Map? set; + + /// Fields to unset. + final List? unset; + + /// Serialize model to json + Map toJson() => _$PartialUpdateUserRequestToJson(this); + + @override + List get props => [id, set, unset]; +} 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 7d45ee86..62ec12b3 100644 --- a/packages/stream_chat/lib/src/core/api/requests.g.dart +++ b/packages/stream_chat/lib/src/core/api/requests.g.dart @@ -54,3 +54,14 @@ Map _$PaginationParamsToJson(PaginationParams instance) { writeNotNull('id_lte', instance.lessThanOrEqual); return val; } + +Map _$PartialUpdateUserRequestToJson( + PartialUpdateUserRequest instance) => + { + 'stringify': instance.stringify, + 'hash_code': instance.hashCode, + 'id': instance.id, + 'set': instance.set, + 'unset': instance.unset, + 'props': instance.props, + }; diff --git a/packages/stream_chat/lib/src/core/api/user_api.dart b/packages/stream_chat/lib/src/core/api/user_api.dart index 61159731..916976c8 100644 --- a/packages/stream_chat/lib/src/core/api/user_api.dart +++ b/packages/stream_chat/lib/src/core/api/user_api.dart @@ -46,4 +46,17 @@ class UserApi { ); return UpdateUsersResponse.fromJson(response.data); } + + /// Batch partial update of [users]. + Future partialUpdateUsers( + List users, + ) async { + final response = await _client.patch( + '/users', + data: { + 'users': users, + }, + ); + return UpdateUsersResponse.fromJson(response.data); + } } diff --git a/packages/stream_chat/lib/src/core/models/channel_state.g.dart b/packages/stream_chat/lib/src/core/models/channel_state.g.dart index 0da51768..5100932c 100644 --- a/packages/stream_chat/lib/src/core/models/channel_state.g.dart +++ b/packages/stream_chat/lib/src/core/models/channel_state.g.dart @@ -21,7 +21,7 @@ ChannelState _$ChannelStateFromJson(Map json) => ChannelState( pinnedMessages: (json['pinned_messages'] as List?) ?.map((e) => Message.fromJson(e as Map)) .toList() ?? - const [], + _emptyPinnedMessages, watcherCount: json['watcher_count'] as int?, watchers: (json['watchers'] as List?) ?.map((e) => User.fromJson(e as Map)) diff --git a/packages/stream_chat/test/src/client/client_test.dart b/packages/stream_chat/test/src/client/client_test.dart index c9aa8968..b59937bb 100644 --- a/packages/stream_chat/test/src/client/client_test.dart +++ b/packages/stream_chat/test/src/client/client_test.dart @@ -1772,6 +1772,46 @@ void main() { verifyNoMoreInteractions(api.user); }); + test('`.partialUpdateUser`', () async { + const userId = 'test-user-id'; + + final set = {'color': 'yellow'}; + final unset = []; + + final partialUpdateRequest = PartialUpdateUserRequest( + id: userId, + set: set, + unset: unset, + ); + + final updatedUser = User( + id: userId, + extraData: {'color': set['color']}, + ); + + when(() => api.user.partialUpdateUsers([partialUpdateRequest])) + .thenAnswer( + (_) async => UpdateUsersResponse() + ..users = { + updatedUser.id: updatedUser, + }, + ); + + final res = await client.partialUpdateUser( + userId, + set: set, + unset: unset, + ); + + expect(res, isNotNull); + expect(res.users, {updatedUser.id: updatedUser}); + + verify( + () => api.user.partialUpdateUsers([partialUpdateRequest]), + ).called(1); + verifyNoMoreInteractions(api.user); + }); + test('`.banUser`', () async { const userId = 'test-user-id'; From 3886f10387e436bd1a8775f3b10cfe5e49de6a78 Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Feb 2022 17:13:36 +0530 Subject: [PATCH 15/18] chore(llc): update CHANGELOG.md Signed-off-by: xsahil03x --- packages/stream_chat/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md index 0c35a7a3..82225b27 100644 --- a/packages/stream_chat/CHANGELOG.md +++ b/packages/stream_chat/CHANGELOG.md @@ -2,7 +2,8 @@ ✅ Added -- You can now pass `score` to `client.sendReaction` and `channel.sendReaction` functions +- You can now pass `score` to `client.sendReaction` and `channel.sendReaction` functions. +- Added new `client.partialUpdateUsers` function in order to partially update users. 🐞 Fixed From adf7befd6894392356f1ba9dcd90e495849d2aed Mon Sep 17 00:00:00 2001 From: Sahil Kumar Date: Fri, 18 Feb 2022 17:54:49 +0530 Subject: [PATCH 16/18] test(llc): add `userApi.partialUpdateUsers` test. Signed-off-by: xsahil03x --- .../test/src/core/api/user_api_test.dart | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/packages/stream_chat/test/src/core/api/user_api_test.dart b/packages/stream_chat/test/src/core/api/user_api_test.dart index dbf83f2c..764386f8 100644 --- a/packages/stream_chat/test/src/core/api/user_api_test.dart +++ b/packages/stream_chat/test/src/core/api/user_api_test.dart @@ -82,4 +82,37 @@ void main() { verify(() => client.post(path, data: any(named: 'data'))).called(1); verifyNoMoreInteractions(client); }); + + test('partialUpdateUsers', () async { + const user = PartialUpdateUserRequest( + id: 'test-user-id', + set: {'color': 'yellow'}, + ); + + const path = '/users'; + + final updatedUser = {user.id: User(id: user.id, extraData: user.set!)}; + + when(() => client.patch(path, data: { + 'users': [user], + })).thenAnswer( + (_) async => successResponse( + path, + data: { + 'users': + updatedUser.map((key, value) => MapEntry(key, value.toJson())) + }, + ), + ); + + final res = await userApi.partialUpdateUsers([user]); + + expect(res, isNotNull); + expect(res.users.length, updatedUser.length); + + verify(() => client.patch(path, data: { + 'users': [user] + })).called(1); + verifyNoMoreInteractions(client); + }); } From cfb41dd62943253074bedad47c95f91fc3cfa4aa Mon Sep 17 00:00:00 2001 From: Gordon Hayes Date: Fri, 18 Feb 2022 15:26:44 +0100 Subject: [PATCH 17/18] fix: scrollToBottom not respecting false value --- packages/stream_chat_flutter/CHANGELOG.md | 1 + .../lib/src/message_list_view.dart | 27 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index d68549e1..116d1624 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -3,6 +3,7 @@ 🐞 Fixed - [[#888]](https://github.com/GetStream/stream-chat-flutter/issues/888) Fix `unban` command not working in `MessageInput`. +- Fix `showScrollToBottom` in `MessageListView` not respecting false value. ## 3.4.0 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog). diff --git a/packages/stream_chat_flutter/lib/src/message_list_view.dart b/packages/stream_chat_flutter/lib/src/message_list_view.dart index edd9c601..c6e269b9 100644 --- a/packages/stream_chat_flutter/lib/src/message_list_view.dart +++ b/packages/stream_chat_flutter/lib/src/message_list_view.dart @@ -712,20 +712,21 @@ class _MessageListViewState extends State { ); }, ), - BetterStreamBuilder( - stream: streamChannel!.channel.state!.isUpToDateStream, - initialData: streamChannel!.channel.state!.isUpToDate, - builder: (context, snapshot) => ValueListenableBuilder( - valueListenable: _showScrollToBottom, - child: _buildScrollToBottom(), - builder: (context, value, child) { - if (!snapshot || value) { - return child!; - } - return const Offstage(); - }, + if (widget.showScrollToBottom) + BetterStreamBuilder( + stream: streamChannel!.channel.state!.isUpToDateStream, + initialData: streamChannel!.channel.state!.isUpToDate, + builder: (context, snapshot) => ValueListenableBuilder( + valueListenable: _showScrollToBottom, + child: _buildScrollToBottom(), + builder: (context, value, child) { + if (!snapshot || value) { + return child!; + } + return const Offstage(); + }, + ), ), - ), if (widget.showFloatingDateDivider) _buildFloatingDateDivider(itemCount), ], From 27cb7d2f9806136158491966ae8315d744f9c9bb Mon Sep 17 00:00:00 2001 From: S-ecki <75510543+S-ecki@users.noreply.github.com> Date: Fri, 18 Feb 2022 17:08:32 +0100 Subject: [PATCH 18/18] Update CHANGELOG.md --- packages/stream_chat_flutter/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/stream_chat_flutter/CHANGELOG.md b/packages/stream_chat_flutter/CHANGELOG.md index d68549e1..48aaacfc 100644 --- a/packages/stream_chat_flutter/CHANGELOG.md +++ b/packages/stream_chat_flutter/CHANGELOG.md @@ -3,6 +3,7 @@ 🐞 Fixed - [[#888]](https://github.com/GetStream/stream-chat-flutter/issues/888) Fix `unban` command not working in `MessageInput`. +- [[#805]](https://github.com/GetStream/stream-chat-flutter/issues/805) Updated chewie dependency version to 1.3.0 ## 3.4.0 - Updated `stream_chat_flutter_core` dependency to [`3.4.0`](https://pub.dev/packages/stream_chat_flutter_core/changelog).