diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-05-28 13:08:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-05-28 14:08:35 +0200 |
| commit | 5faeb4de2032e112ab49751eeeb906ac43826f3d (patch) | |
| tree | ea94b86f27384954ff93aec864b13b83c7f46db0 /testrig | |
| parent | [docs] Update + simplify roadmap, revise beta estimate (#1826) (diff) | |
| download | gotosocial-5faeb4de2032e112ab49751eeeb906ac43826f3d.tar.xz | |
[chore] tidy up media manager, add calling func to errors, build-script improvements (#1835)
* media manager tidy-up: de-interface and remove unused PostDataFunc
Signed-off-by: kim <grufwub@gmail.com>
* remove last traces of media.Manager being an interface
Signed-off-by: kim <grufwub@gmail.com>
* update error to provide caller, allow tuneable via build tags
Signed-off-by: kim <grufwub@gmail.com>
* remove kim-specific build script changes
Signed-off-by: kim <grufwub@gmail.com>
* fix merge conflicts
Signed-off-by: kim <grufwub@gmail.com>
* update build-script to support externally setting build variables
Signed-off-by: kim <grufwub@gmail.com>
---------
Signed-off-by: kim <grufwub@gmail.com>
Diffstat (limited to 'testrig')
| -rw-r--r-- | testrig/federator.go | 2 | ||||
| -rw-r--r-- | testrig/mediahandler.go | 2 | ||||
| -rw-r--r-- | testrig/processor.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/testrig/federator.go b/testrig/federator.go index 23d780806..765bb31d7 100644 --- a/testrig/federator.go +++ b/testrig/federator.go @@ -25,6 +25,6 @@ import ( ) // NewTestFederator returns a federator with the given database and (mock!!) transport controller. -func NewTestFederator(state *state.State, tc transport.Controller, mediaManager media.Manager) federation.Federator { +func NewTestFederator(state *state.State, tc transport.Controller, mediaManager *media.Manager) federation.Federator { return federation.NewFederator(state, NewTestFederatingDB(state), tc, NewTestTypeConverter(state.DB), mediaManager) } diff --git a/testrig/mediahandler.go b/testrig/mediahandler.go index b52caf284..d35dca97e 100644 --- a/testrig/mediahandler.go +++ b/testrig/mediahandler.go @@ -23,7 +23,7 @@ import ( ) // NewTestMediaManager returns a media handler with the default test config, and the given db and storage. -func NewTestMediaManager(state *state.State) media.Manager { +func NewTestMediaManager(state *state.State) *media.Manager { StartWorkers(state) // ensure started return media.NewManager(state) } diff --git a/testrig/processor.go b/testrig/processor.go index 8cfcb595f..1839b482a 100644 --- a/testrig/processor.go +++ b/testrig/processor.go @@ -26,7 +26,7 @@ import ( ) // NewTestProcessor returns a Processor suitable for testing purposes -func NewTestProcessor(state *state.State, federator federation.Federator, emailSender email.Sender, mediaManager media.Manager) *processing.Processor { +func NewTestProcessor(state *state.State, federator federation.Federator, emailSender email.Sender, mediaManager *media.Manager) *processing.Processor { p := processing.NewProcessor(NewTestTypeConverter(state.DB), federator, NewTestOauthServer(state.DB), mediaManager, state, emailSender) state.Workers.EnqueueClientAPI = p.EnqueueClientAPI state.Workers.EnqueueFederator = p.EnqueueFederator |