From d32bc3755656239c7cd423c70c5160dbbb28d7a7 Mon Sep 17 00:00:00 2001
From: elle <0xllx0@noreply.codeberg.org>
Date: Mon, 13 Apr 2026 20:55:17 +0000
Subject: [PATCH] fixup: rebase fixes

---
 routers/api/v1/activitypub/reqsignature.go       | 10 +++-------
 tests/integration/api_federation_httpsig_test.go |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/routers/api/v1/activitypub/reqsignature.go b/routers/api/v1/activitypub/reqsignature.go
index 8332048201..b4d5e5e56d 100644
--- a/routers/api/v1/activitypub/reqsignature.go
+++ b/routers/api/v1/activitypub/reqsignature.go
@@ -102,13 +102,9 @@ func verifyHTTPMessageSignature(ctx app_context.APIContext) (authenticated bool,
 		}
 		keyID := *msgDetails.KeyID
 
-		pubKey, err := federation.FindOrCreateFederatedUserKey(ctx, keyID)
-		if err != nil || pubKey == nil {
-			_, err = federation.FindOrCreateFederationHostKey(ctx, keyID)
-			if err != nil {
-				log.Debug("For %q verification failed: %v", r.URL.Path, err)
-				return false, err
-			}
+		if _, err = federation.FindOrCreateActorKey(ctx, keyID); err != nil {
+			log.Debug("For %q verification failed: %v", r.URL.Path, err)
+			return false, err
 		}
 
 		clientKey, err := activitypub.NewClientPublicKey(keyID, alg).ClientKey(ctx)
diff --git a/tests/integration/api_federation_httpsig_test.go b/tests/integration/api_federation_httpsig_test.go
index 0e1817ca3f..9df064f70b 100644
--- a/tests/integration/api_federation_httpsig_test.go
+++ b/tests/integration/api_federation_httpsig_test.go
@@ -22,6 +22,7 @@ import (
 	"forgejo.org/modules/test"
 	"forgejo.org/routers"
 	"forgejo.org/services/contexttest"
+	"forgejo.org/services/federation"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"