mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 21:12:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into media_refactor

Browse source
This commit is contained in:
tsmethurst 2022-02-08 12:17:18 +01:00
commit 4c294a596a
78 changed files with 1853 additions and 794 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/processing/processor.go
View file

@ -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),