Skip to content

Do not show giphy in channel's preview message #669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laevandus merged 1 commit into from
Nov 27, 2024
Merged

Do not show giphy in channel's preview message #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).

# Upcoming

### 🔄 Changed
### 🐞 Fixed
- Fix showing giphy message in the channel list [#669](https://github.com/GetStream/stream-chat-swiftui/pull/669)

# [4.67.0](https://github.com/GetStream/stream-chat-swiftui/releases/tag/4.67.0)
_November 25, 2024_
Expand Down
10 changes: 8 additions & 2 deletions Sources/StreamChatSwiftUI/ChatChannelList/ChatChannelListItem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ public struct InjectedChannelInfo {

extension ChatChannel {

public var previewMessageText: String? {
guard let previewMessage else { return nil }
let messageFormatter = InjectedValues[\.utils].messagePreviewFormatter
return messageFormatter.format(previewMessage)
}

public var lastMessageText: String? {
guard let latestMessage = latestMessages.first else { return nil }
let messageFormatter = InjectedValues[\.utils].messagePreviewFormatter
Expand All @@ -293,8 +299,8 @@ extension ChatChannel {
return L10n.Channel.Item.muted
} else if shouldShowTypingIndicator {
return typingIndicatorString(currentUserId: InjectedValues[\.chatClient].currentUserId)
} else if let lastMessageText = lastMessageText {
return lastMessageText
} else if let previewMessageText {
return previewMessageText
} else {
return L10n.Channel.Item.emptyMessages
}
Expand Down
23 changes: 12 additions & 11 deletions StreamChatSwiftUITests/Tests/ChatChannelList/ChatChannelListItemView_Tests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_audioMessage() throws {
// Given
let message = try mockAudioMessage(text: "Audio", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -42,7 +42,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_imageMessage() throws {
// Given
let message = try mockImageMessage(text: "Image", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -61,7 +61,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_videoMessage() throws {
// Given
let message = try mockVideoMessage(text: "Video", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -80,7 +80,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_fileMessage() throws {
// Given
let message = try mockFileMessage(title: "Filename", text: "File", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -96,10 +96,11 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
assertSnapshot(matching: view, as: .image(perceptualPrecision: precision))
}

func test_channelListItem_giphyMessage() throws {
func test_channelListItem_giphyMessageLatestButPreviewIsAnotherMessage() throws {
// Given
let message = try mockGiphyMessage(text: "Giphy", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let previewMessage = try mockImageMessage(text: "Hi!", isSentByCurrentUser: true)
let latestMessage = try mockGiphyMessage(text: "Giphy", isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [latestMessage], previewMessage: previewMessage)

// When
let view = ChatChannelListItem(
Expand All @@ -118,7 +119,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_pollMessage_youCreated() throws {
// Given
let message = try mockPollMessage(isSentByCurrentUser: true)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -137,7 +138,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
func test_channelListItem_pollMessage_someoneCreated() throws {
// Given
let message = try mockPollMessage(isSentByCurrentUser: false)
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, latestMessages: [message], previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -161,7 +162,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
.unique,
.unique
])
let channel = ChatChannel.mock(cid: .unique, membership: .mock(id: currentUserId), latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, membership: .mock(id: currentUserId), previewMessage: message)

// When
let view = ChatChannelListItem(
Expand All @@ -185,7 +186,7 @@ final class ChatChannelListItemView_Tests: StreamChatTestCase {
.unique,
.mock(pollId: .unique, optionId: .unique, user: .mock(id: currentUserId))
])
let channel = ChatChannel.mock(cid: .unique, membership: .mock(id: currentUserId), latestMessages: [message])
let channel = ChatChannel.mock(cid: .unique, membership: .mock(id: currentUserId), previewMessage: message)

// When
let view = ChatChannelListItem(
Expand Down
Binary file removed ...apshots__/ChatChannelListItemView_Tests/test_channelListItem_giphyMessage.1.png
View file
Open in desktop
Binary file not shown.
Binary file added ...w_Tests/test_channelListItem_giphyMessageLatestButPreviewIsAnotherMessage.1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading