diff options
author | 2021-08-15 18:43:08 +0200 | |
---|---|---|
committer | 2021-08-15 18:43:08 +0200 | |
commit | ff406be68f0fe6fc0b2dae9a091ce164ac039b3f (patch) | |
tree | 622473ad500239f890b116f8bd30164b92a7dfc5 /internal/timeline/manager.go | |
parent | Don't run tests+lint on merge to main (#139) (diff) | |
download | gotosocial-ff406be68f0fe6fc0b2dae9a091ce164ac039b3f.tar.xz |
Timeline loop fix (#140)
* uwu we made a fucky wucky
* uwu we made a fucky wucky
* work on timeline fixes a little
* fiddle with tests some more
* bleep bloop more tests
* more tests
* update drone yml
* update some sturf
* make the timeline code a bit lazier
* go fmt
* fix drone.yml
Diffstat (limited to 'internal/timeline/manager.go')
-rw-r--r-- | internal/timeline/manager.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go index 00d87bb26..a592670a8 100644 --- a/internal/timeline/manager.go +++ b/internal/timeline/manager.go @@ -75,11 +75,11 @@ type Manager interface { // PrepareXFromTop prepares limit n amount of posts, based on their indexed representations, from the top of the index. PrepareXFromTop(timelineAccountID string, limit int) error // Remove removes one status from the timeline of the given timelineAccountID - Remove(statusID string, timelineAccountID string) (int, error) + Remove(timelineAccountID string, statusID string) (int, error) // WipeStatusFromAllTimelines removes one status from the index and prepared posts of all timelines WipeStatusFromAllTimelines(statusID string) error // WipeStatusesFromAccountID removes all statuses by the given accountID from the timelineAccountID's timelines. - WipeStatusesFromAccountID(accountID string, timelineAccountID string) error + WipeStatusesFromAccountID(timelineAccountID string, accountID string) error } // NewManager returns a new timeline manager with the given database, typeconverter, config, and log. @@ -133,7 +133,7 @@ func (m *manager) IngestAndPrepare(status *gtsmodel.Status, timelineAccountID st return t.IndexAndPrepareOne(status.CreatedAt, status.ID, status.BoostOfID, status.AccountID, status.BoostOfAccountID) } -func (m *manager) Remove(statusID string, timelineAccountID string) (int, error) { +func (m *manager) Remove(timelineAccountID string, statusID string) (int, error) { l := m.log.WithFields(logrus.Fields{ "func": "Remove", "timelineAccountID": timelineAccountID, @@ -160,7 +160,7 @@ func (m *manager) HomeTimeline(timelineAccountID string, maxID string, sinceID s return nil, err } - statuses, err := t.Get(limit, maxID, sinceID, minID) + statuses, err := t.Get(limit, maxID, sinceID, minID, true) if err != nil { l.Errorf("error getting statuses: %s", err) } @@ -221,7 +221,7 @@ func (m *manager) WipeStatusFromAllTimelines(statusID string) error { return err } -func (m *manager) WipeStatusesFromAccountID(accountID string, timelineAccountID string) error { +func (m *manager) WipeStatusesFromAccountID(timelineAccountID string, accountID string) error { t, err := m.getOrCreateTimeline(timelineAccountID) if err != nil { return err |