jlelse
/
GoBlog
mirror of https://github.com/jlelse/GoBlog
1
Fork 0
Code Packages Releases Activity

Fix ActivityStreams, only serve AS on desired paths

This commit is contained in:
Jan-Lukas Else 2021-03-23 07:27:12 +01:00
parent c4baa47456
commit eb5675f0b0
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
http.go
View File

@ -112,14 +112,7 @@ var (
captchaHandler http.Handler captchaHandler http.Handler
micropubRouter *chi.Mux micropubRouter, indieAuthRouter, webmentionsRouter, notificationsRouter, activitypubRouter, editorRouter, commentsRouter, searchRouter *chi.Mux
indieAuthRouter *chi.Mux
webmentionsRouter *chi.Mux
notificationsRouter *chi.Mux
activitypubRouter *chi.Mux
editorRouter *chi.Mux
commentsRouter *chi.Mux
searchRouter *chi.Mux
setBlogMiddlewares = map[string]func(http.Handler) http.Handler{} setBlogMiddlewares = map[string]func(http.Handler) http.Handler{}
sectionMiddlewares = 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(checkIsLogin)
r.Use(checkIsCaptcha) r.Use(checkIsCaptcha)
r.Use(checkLoggedIn) r.Use(checkLoggedIn)
r.Use(checkActivityStreamsRequest)
// Logout // Logout
r.With(authMiddleware).Get("/login", serveLogin) r.With(authMiddleware).Get("/login", serveLogin)
@ -308,7 +300,7 @@ func buildDynamicRouter() (*chi.Mux, error) {
} }
r.Group(func(r chi.Router) { r.Group(func(r chi.Router) {
r.Use(privateModeHandler...) r.Use(privateModeHandler...)
r.Use(cacheMiddleware) r.Use(checkActivityStreamsRequest, cacheMiddleware)
for _, path := range pp { for _, path := range pp {
r.Get(path, servePost) r.Get(path, servePost)
} }
@ -465,10 +457,10 @@ func buildDynamicRouter() (*chi.Mux, error) {
if !blogConfig.PostAsHome { if !blogConfig.PostAsHome {
r.Group(func(r chi.Router) { r.Group(func(r chi.Router) {
r.Use(privateModeHandler...) r.Use(privateModeHandler...)
r.Use(cacheMiddleware, sbm) r.Use(sbm)
r.Get(blogConfig.Path, serveHome) r.With(checkActivityStreamsRequest, cacheMiddleware).Get(blogConfig.Path, serveHome)
r.Get(blogConfig.Path+feedPath, serveHome) r.With(cacheMiddleware).Get(blogConfig.Path+feedPath, serveHome)
r.Get(blogPath+paginationPath, serveHome) r.With(cacheMiddleware).Get(blogPath+paginationPath, serveHome)
}) })
} }

4
posts.go
View File

@ -53,6 +53,10 @@ func servePost(w http.ResponseWriter, r *http.Request) {
return return
} }
if asRequest, ok := r.Context().Value(asRequestKey).(bool); ok && asRequest { 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) p.serveActivityStreams(w)
return return
} }