mirror of
https://github.com/elk-zone/elk.git
synced 2024-11-28 13:28:52 +03:00
revert: "feat: reorder consecutive posts that have others in between"
This reverts commit 364acd998e
.
This commit is contained in:
parent
012432bf19
commit
1ac1ce19fa
1 changed files with 3 additions and 21 deletions
|
@ -160,35 +160,17 @@ async function fetchRelationships() {
|
||||||
}
|
}
|
||||||
|
|
||||||
const maxDistance = 10
|
const maxDistance = 10
|
||||||
|
|
||||||
// Checks if (b) is a reply to (a)
|
|
||||||
function areStatusesConsecutive(a: Status, b: Status) {
|
|
||||||
const inReplyToId = b.inReplyToId ?? b.reblog?.inReplyToId
|
|
||||||
return !!inReplyToId && (inReplyToId === a.reblog?.id || inReplyToId === a.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
export function timelineWithReorderedReplies(items: Status[]) {
|
export function timelineWithReorderedReplies(items: Status[]) {
|
||||||
const newItems = [...items]
|
const newItems = [...items]
|
||||||
// TODO: Basic reordering, we should get something more efficient and robust
|
// TODO: Basic reordering, we should get something more efficient and robust
|
||||||
for (let i = items.length - 1; i > 0; i--) {
|
for (let i = items.length - 1; i > 0; i--) {
|
||||||
for (let k = 1; k <= maxDistance && i - k >= 0; k++) {
|
for (let k = 1; k <= maxDistance && i - k >= 0; k++) {
|
||||||
// Check if the [i-k] item is a reply to the [i] item
|
const inReplyToId = newItems[i - k].inReplyToId ?? newItems[i - k].reblog?.inReplyToId
|
||||||
// This means that they are in the wrong order
|
if (inReplyToId && (inReplyToId === newItems[i].reblog?.id || inReplyToId === newItems[i].id)) {
|
||||||
if (areStatusesConsecutive(newItems[i], newItems[i - k])) {
|
|
||||||
const item = newItems.splice(i, 1)[0]
|
const item = newItems.splice(i, 1)[0]
|
||||||
newItems.splice(i - k, 0, item) // insert older item before the newer one
|
newItems.splice(i - k, 0, item)
|
||||||
k = 1
|
k = 1
|
||||||
}
|
}
|
||||||
else if (k > 1) {
|
|
||||||
// Check if the [i] item is a reply to the [i-k] item
|
|
||||||
// This means that they are in the correct order but there are posts between them
|
|
||||||
if (areStatusesConsecutive(newItems[i - k], newItems[i])) {
|
|
||||||
const item = newItems.splice(i, 1)[0]
|
|
||||||
// insert older item after the newer one
|
|
||||||
newItems.splice(i - k + 1, 0, item)
|
|
||||||
k = 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return newItems
|
return newItems
|
||||||
|
|
Loading…
Reference in a new issue