From 6ac6f8d614d17910d929981bde7d80d8ec2c0b6e Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Mon, 31 May 2021 17:36:35 +0200 Subject: Tidy + timeline embetterment (#38) * tidy up timelines a bit + stub out some endpoints * who's faved and who's boosted, reblog notifs * linting * Update progress with new endpoints --- internal/processing/timeline.go | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'internal/processing/timeline.go') diff --git a/internal/processing/timeline.go b/internal/processing/timeline.go index b7c8e5dc7..7de2d63a9 100644 --- a/internal/processing/timeline.go +++ b/internal/processing/timeline.go @@ -28,13 +28,36 @@ import ( ) func (p *processor) HomeTimelineGet(authed *oauth.Auth, maxID string, sinceID string, minID string, limit int, local bool) ([]apimodel.Status, ErrorWithCode) { - l := p.log.WithField("func", "HomeTimelineGet") - statuses, err := p.db.GetHomeTimelineForAccount(authed.Account.ID, maxID, sinceID, minID, limit, local) if err != nil { return nil, NewErrorInternalError(err) } + s, err := p.filterStatuses(authed, statuses) + if err != nil { + return nil, NewErrorInternalError(err) + } + + return s, nil +} + +func (p *processor) PublicTimelineGet(authed *oauth.Auth, maxID string, sinceID string, minID string, limit int, local bool) ([]apimodel.Status, ErrorWithCode) { + statuses, err := p.db.GetPublicTimelineForAccount(authed.Account.ID, maxID, sinceID, minID, limit, local) + if err != nil { + return nil, NewErrorInternalError(err) + } + + s, err := p.filterStatuses(authed, statuses) + if err != nil { + return nil, NewErrorInternalError(err) + } + + return s, nil +} + +func (p *processor) filterStatuses(authed *oauth.Auth, statuses []*gtsmodel.Status) ([]apimodel.Status, error) { + l := p.log.WithField("func", "filterStatuses") + apiStatuses := []apimodel.Status{} for _, s := range statuses { targetAccount := >smodel.Account{} -- cgit v1.2.3