From eb5675f0b0dff0dade095976b336900a6bda9861 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Tue, 23 Mar 2021 07:27:12 +0100
Subject: [PATCH] Fix ActivityStreams, only serve AS on desired paths

---
 http.go  | 20 ++++++--------------
 posts.go |  4 ++++
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/http.go b/http.go
index 30042fa..492166a 100644
--- a/http.go
+++ b/http.go
@@ -112,14 +112,7 @@ var (
 
 	captchaHandler http.Handler
 
-	micropubRouter      *chi.Mux
-	indieAuthRouter     *chi.Mux
-	webmentionsRouter   *chi.Mux
-	notificationsRouter *chi.Mux
-	activitypubRouter   *chi.Mux
-	editorRouter        *chi.Mux
-	commentsRouter      *chi.Mux
-	searchRouter        *chi.Mux
+	micropubRouter, indieAuthRouter, webmentionsRouter, notificationsRouter, activitypubRouter, editorRouter, commentsRouter, searchRouter *chi.Mux
 
 	setBlogMiddlewares     = map[string]func(http.Handler) http.Handler{}
 	sectionMiddlewares     = map[string]func(http.Handler) http.Handler{}
@@ -274,7 +267,6 @@ func buildDynamicRouter() (*chi.Mux, error) {
 	r.Use(checkIsLogin)
 	r.Use(checkIsCaptcha)
 	r.Use(checkLoggedIn)
-	r.Use(checkActivityStreamsRequest)
 
 	// Logout
 	r.With(authMiddleware).Get("/login", serveLogin)
@@ -308,7 +300,7 @@ func buildDynamicRouter() (*chi.Mux, error) {
 	}
 	r.Group(func(r chi.Router) {
 		r.Use(privateModeHandler...)
-		r.Use(cacheMiddleware)
+		r.Use(checkActivityStreamsRequest, cacheMiddleware)
 		for _, path := range pp {
 			r.Get(path, servePost)
 		}
@@ -465,10 +457,10 @@ func buildDynamicRouter() (*chi.Mux, error) {
 		if !blogConfig.PostAsHome {
 			r.Group(func(r chi.Router) {
 				r.Use(privateModeHandler...)
-				r.Use(cacheMiddleware, sbm)
-				r.Get(blogConfig.Path, serveHome)
-				r.Get(blogConfig.Path+feedPath, serveHome)
-				r.Get(blogPath+paginationPath, serveHome)
+				r.Use(sbm)
+				r.With(checkActivityStreamsRequest, cacheMiddleware).Get(blogConfig.Path, serveHome)
+				r.With(cacheMiddleware).Get(blogConfig.Path+feedPath, serveHome)
+				r.With(cacheMiddleware).Get(blogPath+paginationPath, serveHome)
 			})
 		}
 
diff --git a/posts.go b/posts.go
index 661c548..c25693d 100644
--- a/posts.go
+++ b/posts.go
@@ -53,6 +53,10 @@ func servePost(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if asRequest, ok := r.Context().Value(asRequestKey).(bool); ok && asRequest {
+		if r.URL.Path == blogPath(p.Blog) {
+			appConfig.Blogs[p.Blog].serveActivityStreams(p.Blog, w, r)
+			return
+		}
 		p.serveActivityStreams(w)
 		return
 	}