summaryrefslogtreecommitdiff
path: root/internal/processing/processor.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing/processor.go')
-rw-r--r--internal/processing/processor.go25
1 files changed, 15 insertions, 10 deletions
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index b571ff499..65f05f49e 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -30,6 +30,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/processing/list"
"github.com/superseriousbusiness/gotosocial/internal/processing/markers"
"github.com/superseriousbusiness/gotosocial/internal/processing/media"
+ "github.com/superseriousbusiness/gotosocial/internal/processing/polls"
"github.com/superseriousbusiness/gotosocial/internal/processing/report"
"github.com/superseriousbusiness/gotosocial/internal/processing/search"
"github.com/superseriousbusiness/gotosocial/internal/processing/status"
@@ -64,6 +65,7 @@ type Processor struct {
list list.Processor
markers markers.Processor
media media.Processor
+ polls polls.Processor
report report.Processor
search search.Processor
status status.Processor
@@ -97,6 +99,10 @@ func (p *Processor) Media() *media.Processor {
return &p.media
}
+func (p *Processor) Polls() *polls.Processor {
+ return &p.polls
+}
+
func (p *Processor) Report() *report.Processor {
return &p.report
}
@@ -151,23 +157,22 @@ func NewProcessor(
// Start with sub processors that will
// be required by the workers processor.
commonProcessor := common.New(state, converter, federator, filter)
- accountProcessor := account.New(&commonProcessor, state, converter, mediaManager, oauthServer, federator, filter, parseMentionFunc)
- mediaProcessor := media.New(state, converter, mediaManager, federator.TransportController())
- streamProcessor := stream.New(state, oauthServer)
+ processor.account = account.New(&commonProcessor, state, converter, mediaManager, oauthServer, federator, filter, parseMentionFunc)
+ processor.media = media.New(state, converter, mediaManager, federator.TransportController())
+ processor.stream = stream.New(state, oauthServer)
// Instantiate the rest of the sub
// processors + pin them to this struct.
- processor.account = accountProcessor
+ processor.account = account.New(&commonProcessor, state, converter, mediaManager, oauthServer, federator, filter, parseMentionFunc)
processor.admin = admin.New(state, cleaner, converter, mediaManager, federator.TransportController(), emailSender)
processor.fedi = fedi.New(state, converter, federator, filter)
processor.list = list.New(state, converter)
processor.markers = markers.New(state, converter)
- processor.media = mediaProcessor
+ processor.polls = polls.New(&commonProcessor, state, converter)
processor.report = report.New(state, converter)
processor.timeline = timeline.New(state, converter, filter)
processor.search = search.New(state, federator, converter, filter)
- processor.status = status.New(&commonProcessor, state, federator, converter, filter, parseMentionFunc)
- processor.stream = streamProcessor
+ processor.status = status.New(state, &commonProcessor, &processor.polls, federator, converter, filter, parseMentionFunc)
processor.user = user.New(state, emailSender)
// Workers processor handles asynchronous
@@ -179,9 +184,9 @@ func NewProcessor(
converter,
filter,
emailSender,
- &accountProcessor,
- &mediaProcessor,
- &streamProcessor,
+ &processor.account,
+ &processor.media,
+ &processor.stream,
)
return processor