diff options
author | 2021-08-20 12:26:56 +0200 | |
---|---|---|
committer | 2021-08-20 12:26:56 +0200 | |
commit | 4920229a3b6e1d7dde536bc9ff766542b05d935c (patch) | |
tree | a9423beccec5331c372f01eedf38949dfb171e9e /internal/timeline/index.go | |
parent | Text/status parsing fixes (#141) (diff) | |
download | gotosocial-4920229a3b6e1d7dde536bc9ff766542b05d935c.tar.xz |
Database updates (#144)
* start moving some database stuff around
* continue moving db stuff around
* more fiddling
* more updates
* and some more
* and yet more
* i broke SOMETHING but what, it's a mystery
* tidy up
* vendor ttlcache
* use ttlcache
* fix up some tests
* rename some stuff
* little reminder
* some more updates
Diffstat (limited to 'internal/timeline/index.go')
-rw-r--r-- | internal/timeline/index.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/internal/timeline/index.go b/internal/timeline/index.go index 1e1a9d7bb..7cffe7ab9 100644 --- a/internal/timeline/index.go +++ b/internal/timeline/index.go @@ -50,9 +50,9 @@ func (t *timeline) IndexBefore(statusID string, include bool, amount int) error i := 0 grabloop: for ; len(filtered) < amount && i < 5; i = i + 1 { // try the grabloop 5 times only - statuses, err := t.db.GetHomeTimelineForAccount(t.accountID, "", "", offsetStatus, amount, false) + statuses, err := t.db.GetHomeTimeline(t.accountID, "", "", offsetStatus, amount, false) if err != nil { - if _, ok := err.(db.ErrNoEntries); ok { + if err == db.ErrNoEntries { break grabloop // we just don't have enough statuses left in the db so index what we've got and then bail } return fmt.Errorf("IndexBefore: error getting statuses from db: %s", err) @@ -130,9 +130,9 @@ positionLoop: grabloop: for ; len(filtered) < amount && i < 5; i = i + 1 { // try the grabloop 5 times only l.Tracef("entering grabloop; i is %d; len(filtered) is %d", i, len(filtered)) - statuses, err := t.db.GetHomeTimelineForAccount(t.accountID, offsetStatus, "", "", amount, false) + statuses, err := t.db.GetHomeTimeline(t.accountID, offsetStatus, "", "", amount, false) if err != nil { - if _, ok := err.(db.ErrNoEntries); ok { + if err == db.ErrNoEntries { break grabloop // we just don't have enough statuses left in the db so index what we've got and then bail } return fmt.Errorf("IndexBehind: error getting statuses from db: %s", err) |