dkforest

commit 32401db3e4e4351f998a7fd20b0a31b35dc453da
parent 99fc0c9a2c88041ced5632181daa1a7d5e231549
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 22 Jun 2023 09:57:01 -0700

cleanup

Diffstat:
M
pkg/web/handlers/forum.go
 | 
14
+++++++-------
M
pkg/web/handlers/utils/utils.go
 | 
1
+

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkg/web/handlers/forum.go b/pkg/web/handlers/forum.go
@@ -113,7 +113,7 @@ where fts5_forum_threads match ? and t.is_club = 0 order by rank limit 100`, dat
 func ThreadEditHandler(c echo.Context) error {
 	db := c.Get("database").(*database.DkfDB)
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.ForumDisabledErr.Error(), Redirect: "/", Type: "alert-danger"})
 	}
 	authUser := c.Get("authUser").(*database.User)
 	if !authUser.CanUseForumFn() {
@@ -142,7 +142,7 @@ func ThreadEditHandler(c echo.Context) error {
 
 func ThreadDeleteHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		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)
@@ -174,7 +174,7 @@ func ThreadDeleteHandler(c echo.Context) error {
 
 func ThreadReplyHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		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)
@@ -224,7 +224,7 @@ func ThreadReplyHandler(c echo.Context) error {
 
 func ThreadRawMessageHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		return c.Render(http.StatusOK, "flash", FlashResponse{Message: hutils.ForumDisabledErr.Error(), Redirect: "/", Type: "alert-danger"})
 	}
 	db := c.Get("database").(*database.DkfDB)
 	messageUUID := database.ForumMessageUUID(c.Param("messageUUID"))
@@ -237,7 +237,7 @@ func ThreadRawMessageHandler(c echo.Context) error {
 
 func ThreadEditMessageHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		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)
@@ -292,7 +292,7 @@ func isForumSpam(msg string) bool {
 
 func ThreadDeleteMessageHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		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)
@@ -332,7 +332,7 @@ func ThreadDeleteMessageHandler(c echo.Context) error {
 
 func NewThreadHandler(c echo.Context) error {
 	if config.ForumEnabled.IsFalse() {
-		return c.Render(http.StatusOK, "flash", FlashResponse{Message: "Forum is temporarily disabled", Redirect: "/", Type: "alert-danger"})
+		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)
diff --git a/pkg/web/handlers/utils/utils.go b/pkg/web/handlers/utils/utils.go
@@ -31,6 +31,7 @@ const (
 	ByteRoadCookieName  = "challenge_byte_road_session"
 )
 
+var ForumDisabledErr = errors.New("forum is temporarily disabled")
 var AccountTooYoungErr = errors.New("account must be at least 3 days old")
 
 func CreateCookie(name, value string, maxAge int64) *http.Cookie {