Skip to content
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

[AND-203] Fix system messages not hidden if showSystemMessages=false. #5546

Merged
merged 3 commits into from
Jan 7, 2025
Merged

[AND-203] Fix system messages not hidden if showSystemMessages=false. #5546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
31464b0
[AND-203] Fix system messages not hidden if showSystemMessages=false.
Jan 6, 2025
97a9252
[AND-203] Update CHANGELOG.md.
Jan 6, 2025
46e84f3
[AND-203] Simplify message filtering logic.
Jan 6, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

## stream-chat-android-ui-common
### 🐞 Fixed
- Fix `MessageListController` not respecting the `showSystemMessages` property when set to `false`. [#5546](https://github.com/GetStream/stream-chat-android/pull/5546)

### ⬆️ Improved

Expand Down
21 changes: 11 additions & 10 deletions ...kotlin/io/getstream/chat/android/ui/common/feature/messages/list/MessageListController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,18 +981,19 @@ public class MessageListController(
): List<Message> {
val currentUser = user.value

return messages.filter {
val shouldNotShowIfDeleted = when (deletedMessageVisibility) {
DeletedMessageVisibility.ALWAYS_VISIBLE -> true
DeletedMessageVisibility.VISIBLE_FOR_CURRENT_USER -> {
!(it.isDeleted() && it.user.id != currentUser?.id)
return messages.filter { message ->
val isDeletedMessage = message.isDeleted()
val isSystemMessage = message.isSystem() || message.isError()

when {
isDeletedMessage -> when (deletedMessageVisibility) {
DeletedMessageVisibility.ALWAYS_VISIBLE -> true
DeletedMessageVisibility.VISIBLE_FOR_CURRENT_USER -> message.user.id == currentUser?.id
DeletedMessageVisibility.ALWAYS_HIDDEN -> false
}

DeletedMessageVisibility.ALWAYS_HIDDEN -> !it.isDeleted()
isSystemMessage -> showSystemMessages
else -> true
}
val isSystemMessage = it.isSystem() || it.isError()

shouldNotShowIfDeleted || (isSystemMessage && showSystemMessages)
}
}

Expand Down
29 changes: 29 additions & 0 deletions ...n/io/getstream/chat/android/ui/common/feature/messages/list/MessageListControllerTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import io.getstream.chat.android.ui.common.state.messages.list.MessageItemState
import io.getstream.chat.android.ui.common.state.messages.list.MessageListState
import io.getstream.chat.android.ui.common.state.messages.list.MessagePosition
import io.getstream.chat.android.ui.common.state.messages.list.Other
import io.getstream.chat.android.ui.common.state.messages.list.SystemMessageItemState
import io.getstream.chat.android.ui.common.state.messages.list.TypingItemState
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
Expand Down Expand Up @@ -608,6 +609,32 @@ internal class MessageListControllerTests {
controller.messageListState.value.newMessageState `should be equal to` Other(newMessage.createdAt?.time)
}

@Test
fun `When showSystemMessages is true, Then system messages should be shown`() = runTest {
val messages = listOf(randomMessage(user = user1, type = MessageType.SYSTEM, deletedAt = null))
val messagesState = MutableStateFlow(messages)
val controller = Fixture()
.givenCurrentUser()
.givenChannelState(messagesState = messagesState)
.get(dateSeparatorHandler = { _, _ -> false }, showSystemMessages = true)

val expectedMessageItems = messages.map(::SystemMessageItemState)
controller.messageListState.value.messageItems `should be equal to` expectedMessageItems
}

@Test
fun `When showSystemMessages is false, Then system messages should be hidden`() = runTest {
val messages = listOf(randomMessage(user = user1, type = MessageType.SYSTEM, deletedAt = null))
val messagesState = MutableStateFlow(messages)
val controller = Fixture()
.givenCurrentUser()
.givenChannelState(messagesState = messagesState)
.get(dateSeparatorHandler = { _, _ -> false }, showSystemMessages = false)

val expectedMessageItems = emptyList<MessageItemState>()
controller.messageListState.value.messageItems `should be equal to` expectedMessageItems
}

private class Fixture(
private val chatClient: ChatClient = mock(),
private val cid: String = CID,
Expand Down Expand Up @@ -693,13 +720,15 @@ internal class MessageListControllerTests {
fun get(
dateSeparatorHandler: DateSeparatorHandler = DateSeparatorHandler.getDefaultDateSeparatorHandler(),
deletedMessageVisibility: DeletedMessageVisibility = DeletedMessageVisibility.ALWAYS_VISIBLE,
showSystemMessages: Boolean = true,
): MessageListController {
return MessageListController(
cid = cid,
chatClient = chatClient,
clipboardHandler = mock(),
dateSeparatorHandler = dateSeparatorHandler,
deletedMessageVisibility = deletedMessageVisibility,
showSystemMessages = showSystemMessages,
threadLoadOrderOlderToNewer = false,
channelState = MutableStateFlow(channelState),
)
Expand Down
Loading