Skip to content

fix: prevent duplicate replies and enforce max 5 reply targets #110

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

Open
gabrielfordevelopment wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

fix: prevent duplicate replies and enforce max 5 reply targets #110

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
24 changes: 8 additions & 16 deletions app/src/main/java/chat/stoat/screens/chat/views/channel/ChannelScreenViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ import javax.inject.Inject
class ChannelScreenViewModel @Inject constructor(
private val kvStorage: KVStorage,
) : ViewModel() {
private companion object {
const val MAX_REPLY_TARGETS = 5
}

var items = mutableStateListOf<ChannelScreenItem>()
var typingUsers = mutableStateListOf<String>()

Expand Down Expand Up @@ -282,7 +286,7 @@ class ChannelScreenViewModel @Inject constructor(
}

suspend fun addReplyTo(messageId: String) {
if (draftReplyTo.size >= 5) return
if (draftReplyTo.size >= MAX_REPLY_TARGETS) return
if (draftReplyTo.any { it.id == messageId }) return

val shouldMention = kvStorage.getBoolean("mentionOnReply") ?: false
Expand Down Expand Up @@ -337,7 +341,7 @@ class ChannelScreenViewModel @Inject constructor(
// 2. if the user changes the content while the message is being sent we want to persist
// the original content
val content = MessageProcessor.processOutgoing(draftContent, channel?.server)
val replyTo = draftReplyTo.toList()
val replyTo = draftReplyTo.distinctBy { it.id }.take(MAX_REPLY_TARGETS)

// First we upload (the next 5) attachments...
viewModelScope.launch {
Expand Down Expand Up @@ -717,13 +721,7 @@ class ChannelScreenViewModel @Inject constructor(
m is ChannelScreenItem.RegularMessage && m.message.id == it.messageId
} as? ChannelScreenItem.RegularMessage ?: return@onEach

val shouldMention = kvStorage.getBoolean("mentionOnReply") ?: false
draftReplyTo.add(
SendMessageReply(
message.message.id ?: return@onEach,
shouldMention
)
)
addReplyTo(message.message.id ?: return@onEach)
}

is UiCallback.EditMessage -> {
Expand All @@ -742,13 +740,7 @@ class ChannelScreenViewModel @Inject constructor(
m is ChannelScreenItem.RegularMessage && m.message.id == it.messageId
} as? ChannelScreenItem.RegularMessage ?: return@onEach

val shouldMention = kvStorage.getBoolean("mentionOnReply") ?: false
draftReplyTo.add(
SendMessageReply(
message.message.id ?: return@onEach,
shouldMention
)
)
addReplyTo(message.message.id ?: return@onEach)
putDraftContent(it.content, true)
}
}
Expand Down
Loading