From 82d9f88e424fffacfa9a9c1c26f2f702b97f3e3a Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Thu, 17 Jun 2021 18:02:33 +0200 Subject: Timeline improvements (#41) Tidying up. Parent/child statuses now display correctly in status/id/context. --- internal/timeline/preparedposts.go | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'internal/timeline/preparedposts.go') diff --git a/internal/timeline/preparedposts.go b/internal/timeline/preparedposts.go index 429ce5415..1976189c8 100644 --- a/internal/timeline/preparedposts.go +++ b/internal/timeline/preparedposts.go @@ -28,14 +28,32 @@ func (p *preparedPosts) insertPrepared(i *preparedPostsEntry) error { } var insertMark *list.Element + var position int // We need to iterate through the index to make sure we put this post in the appropriate place according to when it was created. // We also need to make sure we're not inserting a duplicate post -- this can happen sometimes and it's not nice UX (*shudder*). for e := p.data.Front(); e != nil; e = e.Next() { + position = position + 1 + entry, ok := e.Value.(*preparedPostsEntry) if !ok { return errors.New("index: could not parse e as a preparedPostsEntry") } + // don't insert this if it's a boost of a status we've seen recently + if i.prepared.Reblog != nil { + if entry.prepared.Reblog != nil && i.prepared.Reblog.ID == entry.prepared.Reblog.ID { + if position < boostReinsertionDepth { + return nil + } + } + + if i.prepared.Reblog.ID == entry.statusID { + if position < boostReinsertionDepth { + return nil + } + } + } + // if the post to index is newer than e, insert it before e in the list if insertMark == nil { if i.statusID > entry.statusID { -- cgit v1.2.3