dkforest

commit 6a85beb5dd8aec7e0efc201963ec90ba923515b8
parent 972658caafe75156324c46546b0490b43b6e94dc
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 22 Jun 2023 10:15:49 -0700

cleanup

Diffstat:
M
pkg/web/handlers/forum.go
 | 
20
+++++++++++---------

1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/pkg/web/handlers/forum.go b/pkg/web/handlers/forum.go
@@ -116,13 +116,13 @@ func ThreadEditHandler(c echo.Context) error {
 		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.ForumDisabledErr.Error(), Redirect: "/", Type: "alert-danger"})
 	}
 	authUser := c.Get("authUser").(*database.User)
+	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	if !authUser.CanUseForumFn() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: hutils.GetReferer(c), Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: "/t/" + string(threadUUID), Type: "alert-danger"})
 	}
 	if !authUser.IsAdmin {
 		return hutils.RedirectReferer(c)
 	}
-	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
 		return hutils.RedirectReferer(c)
@@ -146,10 +146,10 @@ func ThreadDeleteHandler(c echo.Context) error {
 	}
 	authUser := c.Get("authUser").(*database.User)
 	db := c.Get("database").(*database.DkfDB)
+	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	if !authUser.CanUseForumFn() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: hutils.GetReferer(c), Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: "/t/" + string(threadUUID), Type: "alert-danger"})
 	}
-	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
 		return hutils.RedirectReferer(c)
@@ -173,16 +173,17 @@ func ThreadDeleteHandler(c echo.Context) error {
 }
 
 func ThreadReplyHandler(c echo.Context) error {
+	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
+
 	if config.ForumEnabled.IsFalse() {
 		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.ForumDisabledErr.Error(), Redirect: "/", Type: "alert-danger"})
 	}
 	authUser := c.Get("authUser").(*database.User)
 	db := c.Get("database").(*database.DkfDB)
 	if !authUser.CanUseForumFn() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: hutils.GetReferer(c), Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: "/t/" + string(threadUUID), Type: "alert-danger"})
 	}
 
-	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
 		return c.Redirect(http.StatusFound, "/")
@@ -241,10 +242,10 @@ func ThreadEditMessageHandler(c echo.Context) error {
 	}
 	authUser := c.Get("authUser").(*database.User)
 	db := c.Get("database").(*database.DkfDB)
+	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	if !authUser.CanUseForumFn() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: hutils.GetReferer(c), Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: "/t/" + string(threadUUID), Type: "alert-danger"})
 	}
-	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	messageUUID := database.ForumMessageUUID(c.Param("messageUUID"))
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
@@ -294,10 +295,11 @@ func ThreadDeleteMessageHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
 		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.ForumDisabledErr.Error(), Redirect: "/", Type: "alert-danger"})
 	}
+	threadUUID := database.ForumThreadUUID(c.Param("threadUUID"))
 	authUser := c.Get("authUser").(*database.User)
 	db := c.Get("database").(*database.DkfDB)
 	if !authUser.CanUseForumFn() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: hutils.GetReferer(c), Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.AccountTooYoungErr.Error(), Redirect: "/t/" + string(threadUUID), Type: "alert-danger"})
 	}
 	messageUUID := database.ForumMessageUUID(c.Param("messageUUID"))
 	msg, err := db.GetForumMessageByUUID(messageUUID)