summaryrefslogtreecommitdiff
path: root/internal/timeline
diff options
context:
space:
mode:
Diffstat (limited to 'internal/timeline')
-rw-r--r--internal/timeline/get.go31
-rw-r--r--internal/timeline/index.go19
-rw-r--r--internal/timeline/manager.go41
-rw-r--r--internal/timeline/prepare.go25
-rw-r--r--internal/timeline/remove.go24
5 files changed, 73 insertions, 67 deletions
diff --git a/internal/timeline/get.go b/internal/timeline/get.go
index a3cc8ef9b..cb6399ec9 100644
--- a/internal/timeline/get.go
+++ b/internal/timeline/get.go
@@ -24,20 +24,21 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const retries = 5
func (t *timeline) Get(ctx context.Context, amount int, maxID string, sinceID string, minID string, prepareNext bool) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Get",
- "accountID": t.accountID,
- "amount": amount,
- "maxID": maxID,
- "sinceID": sinceID,
- "minID": minID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountID", t.accountID},
+ {"amount", amount},
+ {"maxID", maxID},
+ {"sinceID", sinceID},
+ {"minID", minID},
+ }...)
l.Debug("entering get")
var items []Preparable
@@ -136,12 +137,12 @@ func (t *timeline) GetXFromTop(ctx context.Context, amount int) ([]Preparable, e
}
func (t *timeline) GetXBehindID(ctx context.Context, amount int, behindID string, attempts *int) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "GetXBehindID",
- "amount": amount,
- "behindID": behindID,
- "attempts": *attempts,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ {"behindID", behindID},
+ {"attempts", attempts},
+ }...)
newAttempts := *attempts
newAttempts++
diff --git a/internal/timeline/index.go b/internal/timeline/index.go
index bda3a9c6c..76c16977b 100644
--- a/internal/timeline/index.go
+++ b/internal/timeline/index.go
@@ -24,14 +24,15 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) IndexBefore(ctx context.Context, itemID string, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "IndexBefore",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize index if it hasn't been done already
if t.itemIndex.data == nil {
@@ -81,10 +82,10 @@ grabloop:
}
func (t *timeline) IndexBehind(ctx context.Context, itemID string, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "IndexBehind",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize index if it hasn't been done already
if t.itemIndex.data == nil {
diff --git a/internal/timeline/manager.go b/internal/timeline/manager.go
index 02a388aba..51bd65fbf 100644
--- a/internal/timeline/manager.go
+++ b/internal/timeline/manager.go
@@ -24,7 +24,8 @@ import (
"strings"
"sync"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
const (
@@ -98,11 +99,11 @@ type manager struct {
}
func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Ingest",
- "timelineAccountID": timelineAccountID,
- "itemID": item.GetID(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", item.GetID()},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -114,11 +115,11 @@ func (m *manager) Ingest(ctx context.Context, item Timelineable, timelineAccount
}
func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timelineAccountID string) (bool, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "IngestAndPrepare",
- "timelineAccountID": timelineAccountID,
- "itemID": item.GetID(),
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", item.GetID()},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -130,11 +131,11 @@ func (m *manager) IngestAndPrepare(ctx context.Context, item Timelineable, timel
}
func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Remove",
- "timelineAccountID": timelineAccountID,
- "itemID": itemID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ {"itemID", itemID},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
@@ -146,10 +147,10 @@ func (m *manager) Remove(ctx context.Context, timelineAccountID string, itemID s
}
func (m *manager) GetTimeline(ctx context.Context, timelineAccountID string, maxID string, sinceID string, minID string, limit int, local bool) ([]Preparable, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "GetTimeline",
- "timelineAccountID": timelineAccountID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"timelineAccountID", timelineAccountID},
+ }...)
t, err := m.getOrCreateTimeline(ctx, timelineAccountID)
if err != nil {
diff --git a/internal/timeline/prepare.go b/internal/timeline/prepare.go
index dae9031e5..c643d1873 100644
--- a/internal/timeline/prepare.go
+++ b/internal/timeline/prepare.go
@@ -24,18 +24,19 @@ import (
"errors"
"fmt"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
"github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) prepareNextQuery(ctx context.Context, amount int, maxID string, sinceID string, minID string) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "prepareNextQuery",
- "amount": amount,
- "maxID": maxID,
- "sinceID": sinceID,
- "minID": minID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ {"maxID", maxID},
+ {"sinceID", sinceID},
+ {"minID", minID},
+ }...)
var err error
@@ -169,10 +170,10 @@ prepareloop:
}
func (t *timeline) PrepareFromTop(ctx context.Context, amount int) error {
- l := logrus.WithFields(logrus.Fields{
- "func": "PrepareFromTop",
- "amount": amount,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"amount", amount},
+ }...)
// lazily initialize prepared posts if it hasn't been done already
if t.preparedItems.data == nil {
diff --git a/internal/timeline/remove.go b/internal/timeline/remove.go
index 60d8108ec..1e70e28a7 100644
--- a/internal/timeline/remove.go
+++ b/internal/timeline/remove.go
@@ -23,15 +23,17 @@ import (
"context"
"errors"
- "github.com/sirupsen/logrus"
+ "codeberg.org/gruf/go-kv"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
)
func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "Remove",
- "accountTimeline": t.accountID,
- "statusID": statusID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountTimeline", t.accountID},
+ {"statusID", statusID},
+ }...)
+
t.Lock()
defer t.Unlock()
var removed int
@@ -79,11 +81,11 @@ func (t *timeline) Remove(ctx context.Context, statusID string) (int, error) {
}
func (t *timeline) RemoveAllBy(ctx context.Context, accountID string) (int, error) {
- l := logrus.WithFields(logrus.Fields{
- "func": "RemoveAllBy",
- "accountTimeline": t.accountID,
- "accountID": accountID,
- })
+ l := log.WithFields(kv.Fields{
+
+ {"accountTimeline", t.accountID},
+ {"accountID", accountID},
+ }...)
t.Lock()
defer t.Unlock()
var removed int
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 04:19:37 +0000