Updated handling of URLs in link attachments

martinmitrevski · martinmitrevski · commit 461531e64565 · 2022-05-31T11:50:03.000+02:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/LinkAttachmentView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/LinkAttachmentView.swift
@@ -81,7 +81,7 @@ public struct LinkAttachmentView: View {
         VStack(alignment: .leading, spacing: padding) {
             if !imageHidden {
                 ZStack {
-                    LazyImage(source: linkAttachment.previewURL!)
+                    LazyImage(source: linkAttachment.previewURL ?? linkAttachment.originalURL)
                         .onDisappear(.cancel)
                         .processors([ImageProcessors.Resize(width: width)])
                         .priority(.high)
@@ -90,7 +90,7 @@ public struct LinkAttachmentView: View {
                     
                     if !authorHidden {
                         BottomLeftView {
-                            Text(linkAttachment.author!)
+                            Text(linkAttachment.author ?? "")
                                 .foregroundColor(colors.tintColor)
                                 .font(fonts.bodyBold)
                                 .standardPadding()
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift b/Sources/StreamChatSwiftUI/ChatChannel/MessageList/QuotedMessageView.swift
@@ -108,10 +108,13 @@ public struct QuotedMessageView<Factory: ViewFactory>: View {
                             cornerRadius: 0
                         )
                     } else if !quotedMessage.linkAttachments.isEmpty {
-                        LazyImage(source: quotedMessage.linkAttachments[0].previewURL!)
-                            .onDisappear(.cancel)
-                            .processors([ImageProcessors.Resize(width: attachmentWidth)])
-                            .priority(.high)
+                        LazyImage(
+                            source: quotedMessage.linkAttachments[0].previewURL ?? quotedMessage.linkAttachments[0]
+                                .originalURL
+                        )
+                        .onDisappear(.cancel)
+                        .processors([ImageProcessors.Resize(width: attachmentWidth)])
+                        .priority(.high)
                     }
                 }
                 .frame(width: attachmentWidth, height: attachmentWidth)

Original file line number	Diff line number	Diff line change
`@@ -108,10 +108,13 @@ public struct QuotedMessageView<Factory: ViewFactory>: View {`
`108`	`108`	`cornerRadius: 0`
`109`	`109`	`)`
`110`	`110`	`} else if !quotedMessage.linkAttachments.isEmpty {`
`111`		`- LazyImage(source: quotedMessage.linkAttachments[0].previewURL!)`
`112`		`- .onDisappear(.cancel)`
`113`		`- .processors([ImageProcessors.Resize(width: attachmentWidth)])`
`114`		`- .priority(.high)`
	`111`	`+ LazyImage(`
	`112`	`+ source: quotedMessage.linkAttachments[0].previewURL ?? quotedMessage.linkAttachments[0]`
	`113`	`+ .originalURL`
	`114`	`+ )`
	`115`	`+ .onDisappear(.cancel)`
	`116`	`+ .processors([ImageProcessors.Resize(width: attachmentWidth)])`
	`117`	`+ .priority(.high)`
`115`	`118`	`}`
`116`	`119`	`}`
`117`	`120`	`.frame(width: attachmentWidth, height: attachmentWidth)`