From c17fbdbf108f88d521c010c8c0f01baf11258740 Mon Sep 17 00:00:00 2001
From: Jia-Han Wu <85153821+jiahan5@users.noreply.github.com>
Date: Thu, 16 Dec 2021 15:46:43 +0800
Subject: [PATCH 1/4] fix: Avoid invalid url

---
 .../stream_chat/lib/src/client/channel.dart   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 51034d3a..8fb01052 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1498,16 +1498,20 @@ class ChannelClientState {
               if (url == null || !url.contains('')) {
                 return false;
               }
-              final uri = Uri.parse(url);
-              if (!uri.host.endsWith('stream-io-cdn.com') ||
-                  uri.queryParameters['Expires'] == null) {
+              try {
+                final uri = Uri.parse(url);
+                if (!uri.host.endsWith('stream-io-cdn.com') ||
+                    uri.queryParameters['Expires'] == null) {
+                  return false;
+                }
+                final secondsFromEpoch =
+                    int.parse(uri.queryParameters['Expires']!);
+                final expiration =
+                    DateTime.fromMillisecondsSinceEpoch(secondsFromEpoch * 1000);
+                return expiration.isBefore(DateTime.now());
+              } catch (_) {
                 return false;
               }
-              final secondsFromEpoch =
-                  int.parse(uri.queryParameters['Expires']!);
-              final expiration =
-                  DateTime.fromMillisecondsSinceEpoch(secondsFromEpoch * 1000);
-              return expiration.isBefore(DateTime.now());
             }))
         .map((e) => e.id)
         .toList();

From 9198e6de3b01fadb67f0adf949795a5cddc7de27 Mon Sep 17 00:00:00 2001
From: Jia-Han Wu <85153821+jiahan5@users.noreply.github.com>
Date: Thu, 16 Dec 2021 15:48:12 +0800
Subject: [PATCH 2/4] Update CHANGELOG.md

---
 packages/stream_chat/CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index f7e02ba4..3e53fcc9 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 - Added `client.enrichUrl` endpoint for enriching URLs with metadata.
 
+🐞 Fixed
+
+- Avoid invalid url
+
 ## 3.3.1
 
 🐞 Fixed
@@ -748,4 +752,4 @@
 
 ## 0.0.2
 
-- first beta version
\ No newline at end of file
+- first beta version

From d7086e7e0e59cd7ef03b6eb296457c4ec7e4db59 Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Mon, 24 Jan 2022 12:10:02 +0100
Subject: [PATCH 3/4] chore(llc): fix analysis

---
 packages/stream_chat/lib/src/client/channel.dart | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/stream_chat/lib/src/client/channel.dart b/packages/stream_chat/lib/src/client/channel.dart
index 8fb01052..b1253cde 100644
--- a/packages/stream_chat/lib/src/client/channel.dart
+++ b/packages/stream_chat/lib/src/client/channel.dart
@@ -1506,8 +1506,9 @@ class ChannelClientState {
                 }
                 final secondsFromEpoch =
                     int.parse(uri.queryParameters['Expires']!);
-                final expiration =
-                    DateTime.fromMillisecondsSinceEpoch(secondsFromEpoch * 1000);
+                final expiration = DateTime.fromMillisecondsSinceEpoch(
+                  secondsFromEpoch * 1000,
+                );
                 return expiration.isBefore(DateTime.now());
               } catch (_) {
                 return false;

From 5f1578a119ac97ba6026c0551bf3ad8d6f1c017e Mon Sep 17 00:00:00 2001
From: Salvatore Giordano <salvatoregiordanoo@gmail.com>
Date: Tue, 1 Feb 2022 16:15:03 +0100
Subject: [PATCH 4/4] Update packages/stream_chat/CHANGELOG.md

---
 packages/stream_chat/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/stream_chat/CHANGELOG.md b/packages/stream_chat/CHANGELOG.md
index e9d29eef..6dadc76f 100644
--- a/packages/stream_chat/CHANGELOG.md
+++ b/packages/stream_chat/CHANGELOG.md
@@ -27,7 +27,7 @@
 
 🐞 Fixed
 
-- Avoid invalid url
+- Add check for invalid image URLs
 
 ## 3.3.1