From 39e999acca518b7b73d1d55e1f3f3335c8b09a45 Mon Sep 17 00:00:00 2001
From: Jan-Lukas Else <mail@jlelse.de>
Date: Sat, 19 Dec 2020 11:06:55 +0100
Subject: [PATCH] Simplify webmention routing

---
 http.go                          |  6 +++---
 templates/webmentionadmin.gohtml |  8 +++++---
 webmention.go                    | 10 ++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/http.go b/http.go
index 220262e..cc998fe 100644
--- a/http.go
+++ b/http.go
@@ -134,9 +134,9 @@ func buildHandler() (http.Handler, error) {
 	r.Route("/webmention", func(webmentionRouter chi.Router) {
 		webmentionRouter.Use(middleware.NoCache)
 		webmentionRouter.Post("/", handleWebmention)
-		webmentionRouter.With(authMiddleware, minifier.Middleware).Get("/admin", webmentionAdmin)
-		webmentionRouter.With(authMiddleware).Post("/admin/delete/{id:\\d+}", webmentionAdminDelete)
-		webmentionRouter.With(authMiddleware).Post("/admin/approve/{id:\\d+}", webmentionAdminApprove)
+		webmentionRouter.With(authMiddleware, minifier.Middleware).Get("/", webmentionAdmin)
+		webmentionRouter.With(authMiddleware).Post("/delete", webmentionAdminDelete)
+		webmentionRouter.With(authMiddleware).Post("/approve", webmentionAdminApprove)
 	})
 
 	// Posts
diff --git a/templates/webmentionadmin.gohtml b/templates/webmentionadmin.gohtml
index c4aabed..fbe4f15 100644
--- a/templates/webmentionadmin.gohtml
+++ b/templates/webmentionadmin.gohtml
@@ -15,8 +15,9 @@
           Created: {{ unixtodate $mention.Created }}
         </p>
         <form method="post">
-          <input type="submit" formaction="/webmention/admin/approve/{{ $mention.ID }}" value="{{ string $blog.Lang "approve" }}">
-          <input type="submit" formaction="/webmention/admin/delete/{{ $mention.ID }}" value="{{ string $blog.Lang "delete" }}">
+          <input type="hidden" name="mentionid" value="{{ $mention.ID }}">
+          <input type="submit" formaction="/webmention/approve" value="{{ string $blog.Lang "approve" }}">
+          <input type="submit" formaction="/webmention/delete" value="{{ string $blog.Lang "delete" }}">
         </form>
       </div>
     {{ end }}
@@ -29,7 +30,8 @@
           Created: {{ unixtodate $mention.Created }}
         </p>
         <form method="post">
-          <input type="submit" formaction="/webmention/admin/delete/{{ $mention.ID }}" value="{{ string $blog.Lang "delete" }}">
+          <input type="hidden" name="mentionid" value="{{ $mention.ID }}">
+          <input type="submit" formaction="/webmention/delete" value="{{ string $blog.Lang "delete" }}">
         </form>
       </div>
     {{ end }}
diff --git a/webmention.go b/webmention.go
index 7cb1c0b..5863b2f 100644
--- a/webmention.go
+++ b/webmention.go
@@ -9,8 +9,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/go-chi/chi"
 )
 
 type webmentionStatus string
@@ -106,7 +104,7 @@ func webmentionAdmin(w http.ResponseWriter, r *http.Request) {
 }
 
 func webmentionAdminDelete(w http.ResponseWriter, r *http.Request) {
-	id, err := strconv.Atoi(chi.URLParam(r, "id"))
+	id, err := strconv.Atoi(r.FormValue("mentionid"))
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
@@ -117,12 +115,12 @@ func webmentionAdminDelete(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	purgeCache()
-	http.Redirect(w, r, "/webmention/admin", http.StatusFound)
+	http.Redirect(w, r, "/webmention", http.StatusFound)
 	return
 }
 
 func webmentionAdminApprove(w http.ResponseWriter, r *http.Request) {
-	id, err := strconv.Atoi(chi.URLParam(r, "id"))
+	id, err := strconv.Atoi(r.FormValue("mentionid"))
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
@@ -133,7 +131,7 @@ func webmentionAdminApprove(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	purgeCache()
-	http.Redirect(w, r, "/webmention/admin", http.StatusFound)
+	http.Redirect(w, r, "/webmention", http.StatusFound)
 	return
 }