1 files changed, 18 insertions, 0 deletions
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 {