summaryrefslogtreecommitdiff
path: root/internal/processing/processor.go
diff options
context:
space:
mode:
authorLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-02-08 12:17:18 +0100
committerLibravatar tsmethurst <tobi.smethurst@protonmail.com>2022-02-08 12:17:18 +0100
commit4c294a596a9e0524f89b80e1608c3411f4fcf679 (patch)
tree23851533a5f1adb5442fd7c3c034578c34cd3f0d /internal/processing/processor.go
parentupdate outdated comment (diff)
parent[chore] Drone config update (#383) (diff)
downloadgotosocial-4c294a596a9e0524f89b80e1608c3411f4fcf679.tar.xz
Merge branch 'main' into media_refactor
Diffstat (limited to 'internal/processing/processor.go')
-rw-r--r--internal/processing/processor.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index 2406681ea..46d17a160 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -237,7 +237,7 @@ type processor struct {
oauthServer oauth.Server
mediaManager media.Manager
storage *kv.KVStore
- timelineManager timeline.Manager
+ statusTimelines timeline.Manager
db db.DB
filter visibility.Filter
@@ -261,7 +261,6 @@ func NewProcessor(
oauthServer oauth.Server,
mediaManager media.Manager,
storage *kv.KVStore,
- timelineManager timeline.Manager,
db db.DB,
emailSender email.Sender) Processor {
fromClientAPI := make(chan messages.FromClientAPI, 1000)
@@ -274,6 +273,7 @@ func NewProcessor(
mediaProcessor := mediaProcessor.New(db, tc, mediaManager, storage)
userProcessor := user.New(db, emailSender)
federationProcessor := federationProcessor.New(db, tc, federator, fromFederator)
+ filter := visibility.NewFilter(db)
return &processor{
fromClientAPI: fromClientAPI,
@@ -284,7 +284,7 @@ func NewProcessor(
oauthServer: oauthServer,
mediaManager: mediaManager,
storage: storage,
- timelineManager: timelineManager,
+ statusTimelines: timeline.NewManager(StatusGrabFunction(db), StatusFilterFunction(db, filter), StatusPrepareFunction(db, tc), StatusSkipInsertFunction()),
db: db,
filter: visibility.NewFilter(db),