Lemmy/Raccoon
1
0
Fork 0
mirror of https://github.com/LiveFastEatTrashRaccoon/RaccoonForLemmy.git synced 2025-02-03 13:37:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(common-ui): comment ordering in post detail

Browse Source
This commit is contained in:
Diego Beraldin 2023-09-19 23:01:22 +02:00
parent 01f63bf8b8
commit ec5562876d
2 changed files with 70 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
core-commonui/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/core/commonui/postdetail/PostDetailViewModel.kt
View File

@ -146,9 +146,12 @@ class PostDetailViewModel(
page = currentPage,
sort = sort,
maxDepth = CommentRepository.MAX_COMMENT_DEPTH,
)
).let {
processCommentsToGetNestedOrder(it)
}
currentPage++
val canFetchMore = commentList.size >= CommentRepository.DEFAULT_PAGE_SIZE
val topLevelItems = commentList.filter { it.depth == 0 }
val canFetchMore = topLevelItems.size >= CommentRepository.DEFAULT_PAGE_SIZE
mvi.updateState {
val newcomments = if (refreshing) {
commentList
@ -180,7 +183,9 @@ class PostDetailViewModel(
parentId = parentId,
sort = sort,
maxDepth = CommentRepository.MAX_COMMENT_DEPTH,
)
).let {
processCommentsToGetNestedOrder(it)
}
val newList = uiState.value.comments.let { list ->
val index = list.indexOfFirst { c -> c.id == parentId }
list.toMutableList().apply {
@ -452,3 +457,60 @@ class PostDetailViewModel(
}
}
}
private data class Node(
val comment: CommentModel?,
val children: MutableList<Node> = mutableListOf(),
)
private fun findNode(id: String, node: Node): Node? {
if (node.comment?.id.toString() == id) {
return node
}
for (c in node.children) {
val res = findNode(id, c)
if (res != null) {
return res
}
}
return null
}
private fun linearize(node: Node, list: MutableList<CommentModel>) {
if (node.children.isEmpty()) {
if (node.comment != null) {
list.add(node.comment)
}
return
}
for (c in node.children) {
linearize(c, list)
}
if (node.comment != null) {
list.add(node.comment)
}
}
private fun processCommentsToGetNestedOrder(items: List<CommentModel>): List<CommentModel> {
val root = Node(null)
// reconstructs the tree
for (c in items) {
val parentId = c.parentId
if (parentId == null) {
root.children += Node(c)
} else {
val parent = findNode(parentId, root)
if (parent != null) {
parent.children += Node(c)
}
}
}
// linearize the tree depth first
val result = mutableListOf<CommentModel>()
linearize(root, result)
return result.reversed().toList()
}

5
domain-lemmy/data/src/commonMain/kotlin/com/github/diegoberaldin/raccoonforlemmy/domain/lemmy/data/CommentModel.kt
View File

@ -14,4 +14,9 @@ data class CommentModel(
val path: String = "",
) : JavaSerializable {
val depth: Int get() = (path.split(".").size - 2).coerceAtLeast(0)
val parentId: String?
get() = path.split(".")
.let {
it.getOrNull(it.lastIndex - 1)
}?.takeIf { it != "0" }
}