diff --git a/internal/db/pg/timeline.go b/internal/db/pg/timeline.go index edecc60b2..585ca3067 100644 --- a/internal/db/pg/timeline.go +++ b/internal/db/pg/timeline.go @@ -29,7 +29,7 @@ import ( func (ps *postgresService) GetHomeTimelineForAccount(accountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]*gtsmodel.Status, error) { statuses := []*gtsmodel.Status{} q := ps.conn.Model(&statuses) - + q = q.ColumnExpr("status.*"). // Find out who accountID follows. Join("LEFT JOIN follows AS f ON f.target_account_id = status.account_id"). diff --git a/internal/timeline/get.go b/internal/timeline/get.go index ac5714086..d800da4e3 100644 --- a/internal/timeline/get.go +++ b/internal/timeline/get.go @@ -135,8 +135,8 @@ func (t *timeline) GetXFromTop(amount int) ([]*apimodel.Status, error) { func (t *timeline) GetXBehindID(amount int, behindID string, attempts *int) ([]*apimodel.Status, error) { l := t.log.WithFields(logrus.Fields{ - "func": "GetXBehindID", - "amount": amount, + "func": "GetXBehindID", + "amount": amount, "behindID": behindID, "attempts": *attempts, }) diff --git a/internal/timeline/prepare.go b/internal/timeline/prepare.go index a9228ea3b..51846c816 100644 --- a/internal/timeline/prepare.go +++ b/internal/timeline/prepare.go @@ -30,14 +30,13 @@ import ( func (t *timeline) prepareNextQuery(amount int, maxID string, sinceID string, minID string) error { l := t.log.WithFields(logrus.Fields{ - "func": "prepareNextQuery", - "amount": amount, - "maxID": maxID, + "func": "prepareNextQuery", + "amount": amount, + "maxID": maxID, "sinceID": sinceID, - "minID": minID, + "minID": minID, }) - var err error // maxID is defined but sinceID isn't so take from behind @@ -171,7 +170,7 @@ prepareloop: func (t *timeline) PrepareFromTop(amount int) error { l := t.log.WithFields(logrus.Fields{ - "func": "PrepareFromTop", + "func": "PrepareFromTop", "amount": amount, })