Skip to content

[stable-25.0.x] hide system messages for unpin messages #6629

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
mahibi merged 1 commit into from
Sep 3, 2026
Merged

[stable-25.0.x] hide system messages for unpin messages #6629

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
6 changes: 5 additions & 1 deletion app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,8 @@ class ChatViewModel @AssistedInject constructor(
isReactionsMessage(currentMessage) ||
isPollVotedMessage(currentMessage) ||
isEditMessage(currentMessage) ||
isThreadCreatedMessage(currentMessage)
isThreadCreatedMessage(currentMessage) ||
isUnpinnedMessage(currentMessage)

val chatMessageMap = chatMessageList.associateBy { it.jsonMessageId }.toMutableMap()
val chatMessageIterator = chatMessageMap.iterator()
Expand Down Expand Up @@ -1668,6 +1669,9 @@ class ChatViewModel @AssistedInject constructor(
private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED

private fun isUnpinnedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.MESSAGE_UNPINNED

private fun handleThreadMessages(chatMessageList: List<ChatMessage>): List<ChatMessage> {
fun isThreadChildMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
currentMessage.value.isThread &&
Expand Down
Loading