From 10b71871ecafd6a1994cff85bb0fd682653de2e9 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Fri, 13 Nov 2020 21:29:09 +0100
Subject: [PATCH] Change response codes for activitypub inbox

---
 activityPub.go | 9 +++++----
 http.go        | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/activityPub.go b/activityPub.go
index 59ddd9b..bc27509 100644
--- a/activityPub.go
+++ b/activityPub.go
@@ -88,7 +88,8 @@ func apHandleInbox(w http.ResponseWriter, r *http.Request) {
 	// Verify request
 	requestActor, requestKey, requestActorStatus, err := apVerifySignature(r)
 	if err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
+		// Send 401 because signature could not be verified
+		http.Error(w, err.Error(), http.StatusUnauthorized)
 		return
 	}
 	if requestActorStatus != 0 {
@@ -98,7 +99,7 @@ func apHandleInbox(w http.ResponseWriter, r *http.Request) {
 				u.Fragment = ""
 				u.RawFragment = ""
 				apRemoveFollower(blogName, u.String())
-				w.WriteHeader(http.StatusAccepted)
+				w.WriteHeader(http.StatusOK)
 				return
 			}
 		}
@@ -179,8 +180,8 @@ func apHandleInbox(w http.ResponseWriter, r *http.Request) {
 			}
 		}
 	}
-	// Return 201
-	w.WriteHeader(http.StatusCreated)
+	// Return 200
+	w.WriteHeader(http.StatusOK)
 }
 
 func apVerifySignature(r *http.Request) (*asPerson, string, int, error) {
diff --git a/http.go b/http.go
index 4e46ee7..73e078c 100644
--- a/http.go
+++ b/http.go
@@ -112,8 +112,8 @@ func buildHandler() (http.Handler, error) {
 
 	// Micropub
 	r.Route(micropubPath, func(mpRouter chi.Router) {
-		mpRouter.Use(middleware.NoCache, checkIndieAuth)
-		mpRouter.Get("/", serveMicropubQuery)
+		mpRouter.Use(checkIndieAuth)
+		mpRouter.With(middleware.NoCache).Get("/", serveMicropubQuery)
 		mpRouter.Post("/", serveMicropubPost)
 		if appConfig.Micropub.MediaStorage != nil {
 			mpRouter.Post(micropubMediaSubPath, serveMicropubMedia)