From cb8688f4298a1a3ed5e28565004588be3c071df0 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Mon, 20 Dec 2021 15:19:53 +0100
Subject: Remove unnecessary storage config variables (#344)

* rewire config to not use extraneous serve vars

* rename 'file' to 'local' for consistency

* use Type and Size again
---
 internal/federation/authenticate.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'internal/federation/authenticate.go')

diff --git a/internal/federation/authenticate.go b/internal/federation/authenticate.go
index 9d715c549..44e527dcb 100644
--- a/internal/federation/authenticate.go
+++ b/internal/federation/authenticate.go
@@ -35,10 +35,10 @@ import (
 	"github.com/superseriousbusiness/activity/pub"
 	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/activity/streams/vocab"
+	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
-	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
 
 /*
@@ -123,7 +123,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
 	var err error
 
 	// thanks to signaturecheck.go in the security package, we should already have a signature verifier set on the context
-	vi := ctx.Value(util.APRequestingPublicKeyVerifier)
+	vi := ctx.Value(ap.ContextRequestingPublicKeyVerifier)
 	if vi == nil {
 		l.Debug("request wasn't signed")
 		return nil, false, nil // request wasn't signed
@@ -136,7 +136,7 @@ func (f *federator) AuthenticateFederatedRequest(ctx context.Context, requestedU
 	}
 
 	// we should have the signature itself set too
-	si := ctx.Value(util.APRequestingPublicKeySignature)
+	si := ctx.Value(ap.ContextRequestingPublicKeySignature)
 	if vi == nil {
 		l.Debug("request wasn't signed")
 		return nil, false, nil // request wasn't signed
-- 
cgit v1.2.3