summaryrefslogtreecommitdiff
path: root/internal/timeline
diff options
context:
space:
mode:
Diffstat (limited to 'internal/timeline')
-rw-r--r--internal/timeline/index.go19
-rw-r--r--internal/timeline/manager.go14
-rw-r--r--internal/timeline/postindex.go14
-rw-r--r--internal/timeline/timeline.go10
4 files changed, 36 insertions, 21 deletions
diff --git a/internal/timeline/index.go b/internal/timeline/index.go
index bc1bf996b..8d0506a9e 100644
--- a/internal/timeline/index.go
+++ b/internal/timeline/index.go
@@ -40,7 +40,7 @@ grabloop:
}
for _, s := range filtered {
- if err := t.IndexOne(s.CreatedAt, s.ID, s.BoostOfID); err != nil {
+ if _, err := t.IndexOne(s.CreatedAt, s.ID, s.BoostOfID); err != nil {
return fmt.Errorf("IndexBehindAndIncluding: error indexing status with id %s: %s", s.ID, err)
}
}
@@ -52,7 +52,7 @@ func (t *timeline) IndexOneByID(statusID string) error {
return nil
}
-func (t *timeline) IndexOne(statusCreatedAt time.Time, statusID string, boostOfID string) error {
+func (t *timeline) IndexOne(statusCreatedAt time.Time, statusID string, boostOfID string) (bool, error) {
t.Lock()
defer t.Unlock()
@@ -64,7 +64,7 @@ func (t *timeline) IndexOne(statusCreatedAt time.Time, statusID string, boostOfI
return t.postIndex.insertIndexed(postIndexEntry)
}
-func (t *timeline) IndexAndPrepareOne(statusCreatedAt time.Time, statusID string) error {
+func (t *timeline) IndexAndPrepareOne(statusCreatedAt time.Time, statusID string) (bool, error) {
t.Lock()
defer t.Unlock()
@@ -72,15 +72,18 @@ func (t *timeline) IndexAndPrepareOne(statusCreatedAt time.Time, statusID string
statusID: statusID,
}
- if err := t.postIndex.insertIndexed(postIndexEntry); err != nil {
- return fmt.Errorf("IndexAndPrepareOne: error inserting indexed: %s", err)
+ inserted, err := t.postIndex.insertIndexed(postIndexEntry)
+ if err != nil {
+ return inserted, fmt.Errorf("IndexAndPrepareOne: error inserting indexed: %s", err)
}
- if err := t.prepare(statusID); err != nil {
- return fmt.Errorf("IndexAndPrepareOne: error preparing: %s", err)
+ if inserted {
+ if err := t.prepare(statusID); err != nil {
+ return inserted, fmt.Errorf("IndexAndPrepareOne: error preparing: %s", err)
+ }
}
- return nil
+ return inserted, nil
}
func (t *timeline) OldestIndexedPostID() (string, error) {
diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go
index c389a6b8a..2770f9e96 100644
--- a/internal/timeline/manager.go
+++ b/internal/timeline/manager.go
@@ -51,12 +51,18 @@ type Manager interface {
// Ingest takes one status and indexes it into the timeline for the given account ID.
//
// It should already be established before calling this function that the status/post actually belongs in the timeline!
- Ingest(status *gtsmodel.Status, timelineAccountID string) error
+ //
+ // The returned bool indicates whether the status was actually put in the timeline. This could be false in cases where
+ // the status is a boost, but a boost of the original post or the post itself already exists recently in the timeline.
+ Ingest(status *gtsmodel.Status, timelineAccountID string) (bool, error)
// IngestAndPrepare takes one status and indexes it into the timeline for the given account ID, and then immediately prepares it for serving.
// This is useful in cases where we know the status will need to be shown at the top of a user's timeline immediately (eg., a new status is created).
//
// It should already be established before calling this function that the status/post actually belongs in the timeline!
- IngestAndPrepare(status *gtsmodel.Status, timelineAccountID string) error
+ //
+ // The returned bool indicates whether the status was actually put in the timeline. This could be false in cases where
+ // the status is a boost, but a boost of the original post or the post itself already exists recently in the timeline.
+ IngestAndPrepare(status *gtsmodel.Status, timelineAccountID string) (bool, error)
// HomeTimeline returns limit n amount of entries from the home timeline of the given account ID, in descending chronological order.
// If maxID is provided, it will return entries from that maxID onwards, inclusive.
HomeTimeline(accountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]*apimodel.Status, error)
@@ -95,7 +101,7 @@ type manager struct {
log *logrus.Logger
}
-func (m *manager) Ingest(status *gtsmodel.Status, timelineAccountID string) error {
+func (m *manager) Ingest(status *gtsmodel.Status, timelineAccountID string) (bool, error) {
l := m.log.WithFields(logrus.Fields{
"func": "Ingest",
"timelineAccountID": timelineAccountID,
@@ -108,7 +114,7 @@ func (m *manager) Ingest(status *gtsmodel.Status, timelineAccountID string) erro
return t.IndexOne(status.CreatedAt, status.ID, status.BoostOfID)
}
-func (m *manager) IngestAndPrepare(status *gtsmodel.Status, timelineAccountID string) error {
+func (m *manager) IngestAndPrepare(status *gtsmodel.Status, timelineAccountID string) (bool, error) {
l := m.log.WithFields(logrus.Fields{
"func": "IngestAndPrepare",
"timelineAccountID": timelineAccountID,
diff --git a/internal/timeline/postindex.go b/internal/timeline/postindex.go
index 7142035a7..44765bf50 100644
--- a/internal/timeline/postindex.go
+++ b/internal/timeline/postindex.go
@@ -14,7 +14,7 @@ type postIndexEntry struct {
boostOfID string
}
-func (p *postIndex) insertIndexed(i *postIndexEntry) error {
+func (p *postIndex) insertIndexed(i *postIndexEntry) (bool, error) {
if p.data == nil {
p.data = &list.List{}
}
@@ -22,7 +22,7 @@ func (p *postIndex) insertIndexed(i *postIndexEntry) error {
// 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)
- return nil
+ return true, nil
}
var insertMark *list.Element
@@ -34,14 +34,14 @@ func (p *postIndex) insertIndexed(i *postIndexEntry) error {
entry, ok := e.Value.(*postIndexEntry)
if !ok {
- return errors.New("index: could not parse e as a postIndexEntry")
+ return false, errors.New("index: could not parse e as a postIndexEntry")
}
// don't insert this if it's a boost of a status we've seen recently
if i.boostOfID != "" {
if i.boostOfID == entry.boostOfID || i.boostOfID == entry.statusID {
if position < boostReinsertionDepth {
- return nil
+ return false, nil
}
}
}
@@ -55,16 +55,16 @@ func (p *postIndex) insertIndexed(i *postIndexEntry) error {
// make sure we don't insert a duplicate
if entry.statusID == i.statusID {
- return nil
+ return false, nil
}
}
if insertMark != nil {
p.data.InsertBefore(i, insertMark)
- return nil
+ return true, nil
}
// if we reach this point it's the oldest post we've seen so put it at the back
p.data.PushBack(i)
- return nil
+ return true, nil
}
diff --git a/internal/timeline/timeline.go b/internal/timeline/timeline.go
index 363c0999c..5e274b572 100644
--- a/internal/timeline/timeline.go
+++ b/internal/timeline/timeline.go
@@ -62,7 +62,10 @@ type Timeline interface {
*/
// IndexOne puts a status into the timeline at the appropriate place according to its 'createdAt' property.
- IndexOne(statusCreatedAt time.Time, statusID string, boostOfID string) error
+ //
+ // The returned bool indicates whether or not the status was actually inserted into the timeline. This will be false
+ // if the status is a boost and the original post or another boost of it already exists < boostReinsertionDepth back in the timeline.
+ IndexOne(statusCreatedAt time.Time, statusID string, boostOfID string) (bool, error)
// OldestIndexedPostID returns the id of the rearmost (ie., the oldest) indexed post, or an error if something goes wrong.
// If nothing goes wrong but there's no oldest post, an empty string will be returned so make sure to check for this.
@@ -79,7 +82,10 @@ type Timeline interface {
PrepareBehind(statusID string, amount int) error
// IndexOne puts a status into the timeline at the appropriate place according to its 'createdAt' property,
// and then immediately prepares it.
- IndexAndPrepareOne(statusCreatedAt time.Time, statusID string) error
+ //
+ // The returned bool indicates whether or not the status was actually inserted into the timeline. This will be false
+ // if the status is a boost and the original post or another boost of it already exists < boostReinsertionDepth back in the timeline.
+ IndexAndPrepareOne(statusCreatedAt time.Time, statusID string) (bool, error)
// OldestPreparedPostID returns the id of the rearmost (ie., the oldest) prepared post, or an error if something goes wrong.
// If nothing goes wrong but there's no oldest post, an empty string will be returned so make sure to check for this.
OldestPreparedPostID() (string, error)
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-04 12:18:23 +0000