diff options
Diffstat (limited to 'internal/timeline/prepareditems.go')
-rw-r--r-- | internal/timeline/prepareditems.go | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/internal/timeline/prepareditems.go b/internal/timeline/prepareditems.go index 07a8c69ee..39433fbc7 100644 --- a/internal/timeline/prepareditems.go +++ b/internal/timeline/prepareditems.go @@ -37,30 +37,30 @@ type preparedItemsEntry struct { prepared Preparable } -func (p *preparedItems) insertPrepared(ctx context.Context, i *preparedItemsEntry) error { +func (p *preparedItems) insertPrepared(ctx context.Context, newEntry *preparedItemsEntry) error { if p.data == nil { p.data = &list.List{} } // if we have no entries yet, this is both the newest and oldest entry, so just put it in the front if p.data.Len() == 0 { - p.data.PushFront(i) + p.data.PushFront(newEntry) return nil } 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*). + // We need to iterate through the index to make sure we put this entry in the appropriate place according to when it was created. + // We also need to make sure we're not inserting a duplicate entry -- this can happen sometimes and it's not nice UX (*shudder*). for e := p.data.Front(); e != nil; e = e.Next() { position++ entry, ok := e.Value.(*preparedItemsEntry) if !ok { - return errors.New("index: could not parse e as a preparedPostsEntry") + return errors.New("insertPrepared: could not parse e as a preparedItemsEntry") } - skip, err := p.skipInsert(ctx, i.itemID, i.accountID, i.boostOfID, i.boostOfAccountID, entry.itemID, entry.accountID, entry.boostOfID, entry.boostOfAccountID, position) + skip, err := p.skipInsert(ctx, newEntry.itemID, newEntry.accountID, newEntry.boostOfID, newEntry.boostOfAccountID, entry.itemID, entry.accountID, entry.boostOfID, entry.boostOfAccountID, position) if err != nil { return err } @@ -68,25 +68,25 @@ func (p *preparedItems) insertPrepared(ctx context.Context, i *preparedItemsEntr return nil } - // if the post to index is newer than e, insert it before e in the list + // if the entry to index is newer than e, insert it before e in the list if insertMark == nil { - if i.itemID > entry.itemID { + if newEntry.itemID > entry.itemID { insertMark = e } } // make sure we don't insert a duplicate - if entry.itemID == i.itemID { + if entry.itemID == newEntry.itemID { return nil } } if insertMark != nil { - p.data.InsertBefore(i, insertMark) + p.data.InsertBefore(newEntry, insertMark) return nil } - // if we reach this point it's the oldest post we've seen so put it at the back - p.data.PushBack(i) + // if we reach this point it's the oldest entry we've seen so put it at the back + p.data.PushBack(newEntry) return nil } |