From 070ea5cc204c0eb024d8a2c3be35f994a832db42 Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Mon, 20 Sep 2021 10:17:53 -0500 Subject: [PATCH] Redirect old blog URLs to new --- local/download_database.sh | 0 local/resetdb.sh | 0 src/hmnurl/urls.go | 2 +- src/website/routes.go | 6 ++++++ 4 files changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 local/download_database.sh mode change 100644 => 100755 local/resetdb.sh diff --git a/local/download_database.sh b/local/download_database.sh old mode 100644 new mode 100755 diff --git a/local/resetdb.sh b/local/resetdb.sh old mode 100644 new mode 100755 diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index f2be182..feba779 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -439,7 +439,7 @@ var RegexWikiArticle = regexp.MustCompile(`^/wiki/(?P\d+)(-([^/]+))?$` * Blog */ -var RegexBlogsRedirect = regexp.MustCompile(`^/blogs`) +var RegexBlogsRedirect = regexp.MustCompile(`^/blogs(?P.*)`) var RegexBlog = regexp.MustCompile(`^/blog(/(?P\d+))?$`) diff --git a/src/website/routes.go b/src/website/routes.go index 96ca312..de30daa 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -224,6 +224,12 @@ func NewWebsiteRoutes(longRequestContext context.Context, conn *pgxpool.Pool, pe mainRoutes.POST(hmnurl.RegexBlogPostEdit, authMiddleware(csrfMiddleware(BlogPostEditSubmit))) mainRoutes.GET(hmnurl.RegexBlogPostDelete, authMiddleware(BlogPostDelete)) mainRoutes.POST(hmnurl.RegexBlogPostDelete, authMiddleware(csrfMiddleware(BlogPostDeleteSubmit))) + mainRoutes.GET(hmnurl.RegexBlogsRedirect, func(c *RequestContext) ResponseData { + return c.Redirect(hmnurl.ProjectUrl( + fmt.Sprintf("blog%s", c.PathParams["remainder"]), nil, + c.CurrentProject.Slug, + ), http.StatusMovedPermanently) + }) mainRoutes.GET(hmnurl.RegexPodcast, PodcastIndex) mainRoutes.GET(hmnurl.RegexPodcastEdit, PodcastEdit)