Merge pull request #712 from GetStream/hotfix/CDNAttachments

fix(llc): fixed expired cdn attachment links

packages/stream_chat/CHANGELOG.md

@@ -7,6 +7,7 @@
 🐞 Fixed
 
 - [[#710]](https://github.com/GetStream/stream-chat-flutter/issues/710) Fixed JWT requiring using `String` as id.
+- Fixed expired CDN attachment links not updating correctly.
 
 ## 3.0.0
 

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

@@ -1497,7 +1497,7 @@ class ChannelClientState {
     }
   }
 
-  void _checkExpiredAttachmentMessages(ChannelState channelState) {
+  void _checkExpiredAttachmentMessages(ChannelState channelState) async {
     final expiredAttachmentMessagesId = channelState.messages
         .where((m) =>
             !_updatedMessagesIds.contains(m.id) &&
@@ -1508,20 +1508,24 @@ class ChannelClientState {
                     return false;
                   }
                   final uri = Uri.parse(url);
-                  if (uri.host != 'stream-io-cdn.com' ||
+                  if (!uri.host.endsWith('stream-io-cdn.com') ||
                       uri.queryParameters['Expires'] == null) {
                     return false;
                   }
-                  final expiration =
-                      DateTime.parse(uri.queryParameters['Expires']!);
+                  final secondsFromEpoch =
+                      int.parse(uri.queryParameters['Expires']!);
+                  final expiration = DateTime.fromMillisecondsSinceEpoch(
+                      secondsFromEpoch * 1000);
                   return expiration.isBefore(DateTime.now());
                 }) ==
                 true)
         .map((e) => e.id)
         .toList();
+
     if (expiredAttachmentMessagesId.isNotEmpty == true) {
-      _channel.getMessagesById(expiredAttachmentMessagesId);
+      await _channel._initializedCompleter.future;
       _updatedMessagesIds.addAll(expiredAttachmentMessagesId);
+      _channel.getMessagesById(expiredAttachmentMessagesId);
     }
   }