From e04b187702acb0c9908237a35b3a9857e2167b3f Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 4 Oct 2021 15:24:19 +0200
Subject: Refactor/tidy (#261)

* tidy up streaming

* cut down code duplication

* test get followers/following

* test streaming processor

* fix some test models

* add TimeMustParse

* fix uri / url typo

* make trace logging less verbose

* make logging more consistent

* disable quote on logging

* remove context.Background

* remove many extraneous mastodon references

* regenerate swagger

* don't log query on no rows result

* log latency first for easier reading
---
 internal/cliactions/server/server.go   | 4 ++--
 internal/cliactions/testrig/testrig.go | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/cliactions')

diff --git a/internal/cliactions/server/server.go b/internal/cliactions/server/server.go
index e2f6a24b4..e75eff7c5 100644
--- a/internal/cliactions/server/server.go
+++ b/internal/cliactions/server/server.go
@@ -88,7 +88,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config, log
 
 	// build backend handlers
 	mediaHandler := media.New(c, dbService, storage, log)
-	oauthServer := oauth.New(dbService, log)
+	oauthServer := oauth.New(ctx, dbService, log)
 	transportController := transport.NewController(c, dbService, &federation.Clock{}, http.DefaultClient, log)
 	federator := federation.NewFederator(dbService, federatingDB, transportController, c, log, typeConverter, mediaHandler)
 	processor := processing.NewProcessor(c, typeConverter, federator, oauthServer, mediaHandler, storage, timelineManager, dbService, log)
@@ -96,7 +96,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config, log
 		return fmt.Errorf("error starting processor: %s", err)
 	}
 
-	idp, err := oidc.NewIDP(c, log)
+	idp, err := oidc.NewIDP(ctx, c, log)
 	if err != nil {
 		return fmt.Errorf("error creating oidc idp: %s", err)
 	}
diff --git a/internal/cliactions/testrig/testrig.go b/internal/cliactions/testrig/testrig.go
index 7badca556..482ec34f8 100644
--- a/internal/cliactions/testrig/testrig.go
+++ b/internal/cliactions/testrig/testrig.go
@@ -67,7 +67,7 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log
 		return fmt.Errorf("error starting processor: %s", err)
 	}
 
-	idp, err := oidc.NewIDP(c, log)
+	idp, err := oidc.NewIDP(ctx, c, log)
 	if err != nil {
 		return fmt.Errorf("error creating oidc idp: %s", err)
 	}
-- 
cgit v1.3