dkforest

commit 9aeec0a690dcd93422cb341585c1861d7dae5a31
parent 6a85beb5dd8aec7e0efc201963ec90ba923515b8
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu, 22 Jun 2023 10:32:00 -0700

rid of referer

Diffstat:
M
pkg/web/handlers/admin.go
 | 
12
++++++------
M
pkg/web/handlers/forum.go
 | 
20
++++++++++----------
M
pkg/web/handlers/links.go
 | 
6
+++---
M
pkg/web/handlers/settings.go
 | 
10
+++++-----

4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/pkg/web/handlers/admin.go b/pkg/web/handlers/admin.go
@@ -162,7 +162,7 @@ func AdminUploadsHandler(c echo.Context) error {
 			if err := file.Delete(db); err != nil {
 				logrus.Error(err)
 			}
-			return hutils.RedirectReferer(c)
+			return c.Redirect(http.StatusFound, "/admin/uploads")
 		}
 	}
 
@@ -183,18 +183,18 @@ func AdminFiledropsHandler(c echo.Context) error {
 			if _, err := db.CreateFiledrop(); err != nil {
 				logrus.Error(err)
 			}
-			return hutils.RedirectReferer(c)
+			return c.Redirect(http.StatusFound, "/admin/filedrops")
 
 		} else if formName == "deleteFiledrop" {
 			fileName := c.Request().PostFormValue("file_name")
 			file, err := db.GetFiledropByFileName(fileName)
 			if err != nil {
-				return c.Redirect(http.StatusFound, "/")
+				return c.Redirect(http.StatusFound, "/admin/filedrops")
 			}
 			if err := file.Delete(db); err != nil {
 				logrus.Error(err)
 			}
-			return hutils.RedirectReferer(c)
+			return c.Redirect(http.StatusFound, "/admin/filedrops")
 		}
 	}
 
@@ -516,7 +516,7 @@ func IgnoredDeleteHandler(c echo.Context) error {
 	userID := dutils.DoParseUserID(c.Request().PostFormValue("user_id"))
 	ignoredUserID := dutils.DoParseUserID(c.Request().PostFormValue("ignored_user_id"))
 	db.UnIgnoreUser(userID, ignoredUserID)
-	return hutils.RedirectReferer(c)
+	return c.Redirect(http.StatusFound, "/admin/ignored")
 }
 
 // AdminDeleteRoomHandler ...
@@ -524,7 +524,7 @@ func AdminDeleteRoomHandler(c echo.Context) error {
 	db := c.Get("database").(*database.DkfDB)
 	id := dutils.DoParseRoomID(c.Param("roomID"))
 	db.DeleteChatRoomByID(id)
-	return hutils.RedirectReferer(c)
+	return c.Redirect(http.StatusFound, "/admin/rooms")
 }
 
 func AdminUserSecurityLogsHandler(c echo.Context) error {
diff --git a/pkg/web/handlers/forum.go b/pkg/web/handlers/forum.go
@@ -121,11 +121,11 @@ func ThreadEditHandler(c echo.Context) error {
 		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)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 	var data editForumThreadData
 	data.Thread = thread
@@ -134,7 +134,7 @@ func ThreadEditHandler(c echo.Context) error {
 	if c.Request().Method == http.MethodPost {
 		thread.CategoryID = database.ForumCategoryID(utils.DoParseInt64(c.Request().PostFormValue("category_id")))
 		thread.DoSave(db)
-		return c.Redirect(http.StatusFound, "/forum")
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 
 	return c.Render(http.StatusOK, "thread-edit", data)
@@ -152,11 +152,11 @@ func ThreadDeleteHandler(c echo.Context) error {
 	}
 	thread, err := db.GetForumThreadByUUID(threadUUID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/forum")
 	}
 
 	if !authUser.IsAdmin {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/forum")
 	}
 
 	var data deleteForumThreadData
@@ -304,21 +304,21 @@ func ThreadDeleteMessageHandler(c echo.Context) error {
 	messageUUID := database.ForumMessageUUID(c.Param("messageUUID"))
 	msg, err := db.GetForumMessageByUUID(messageUUID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 
 	if authUser.ID != msg.UserID && !authUser.IsAdmin {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 
 	if !msg.CanEdit() && !authUser.IsAdmin {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 
 	var data deleteForumMessageData
 	data.Thread, err = db.GetForumThreadByID(msg.ThreadID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/t/"+string(threadUUID))
 	}
 	data.Message = msg
 
@@ -414,5 +414,5 @@ func ForumReindexHandler(c echo.Context) error {
 	if err := db.DB().Exec(`INSERT INTO fts5_forum_messages(fts5_forum_messages) VALUES('rebuild')`).Error; err != nil {
 		logrus.Error(err)
 	}
-	return hutils.RedirectReferer(c)
+	return c.Redirect(http.StatusFound, "/forum")
 }
diff --git a/pkg/web/handlers/links.go b/pkg/web/handlers/links.go
@@ -510,15 +510,15 @@ func LinkMirrorDeleteHandler(c echo.Context) error {
 	linkMirrorID := utils.DoParseInt64(c.Param("linkMirrorID"))
 	linkMirror, err := db.GetLinkMirrorByID(linkMirrorID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/links")
 	}
 	link, err := db.GetLinkByID(linkMirror.LinkID)
 	if err != nil {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/links")
 	}
 
 	if !authUser.IsModerator() {
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/links")
 	}
 
 	var data deleteLinkMirrorData
diff --git a/pkg/web/handlers/settings.go b/pkg/web/handlers/settings.go
@@ -378,12 +378,12 @@ func SettingsChatPMHandler(c echo.Context) error {
 			return c.Render(http.StatusOK, "settings.chat-pm", data)
 		}
 		db.AddWhitelistedUser(authUser.ID, user.ID)
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/settings/chat/pm")
 
 	} else if formName == "rmWhitelist" {
 		userID := dutils.DoParseUserID(c.Request().PostFormValue("userID"))
 		db.RmWhitelistedUser(authUser.ID, userID)
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/settings/chat/pm")
 
 	} else if formName == "addBlacklist" {
 		data.AddBlacklist = database.Username(strings.TrimSpace(c.Request().PostFormValue("username")))
@@ -393,19 +393,19 @@ func SettingsChatPMHandler(c echo.Context) error {
 			return c.Render(http.StatusOK, "settings.chat-pm", data)
 		}
 		db.AddBlacklistedUser(authUser.ID, user.ID)
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/settings/chat/pm")
 
 	} else if formName == "rmBlacklist" {
 		userID := dutils.DoParseUserID(c.Request().PostFormValue("userID"))
 		db.RmBlacklistedUser(authUser.ID, userID)
-		return hutils.RedirectReferer(c)
+		return c.Redirect(http.StatusFound, "/settings/chat/pm")
 	}
 
 	data.PmMode = utils.Clamp(utils.DoParseInt64(c.Request().PostFormValue("pm_mode")), 0, 1)
 	authUser.BlockNewUsersPm = utils.DoParseBool(c.Request().PostFormValue("block_new_users_pm"))
 	authUser.PmMode = data.PmMode
 	authUser.DoSave(db)
-	return hutils.RedirectReferer(c)
+	return c.Redirect(http.StatusFound, "/settings/chat/pm")
 }
 
 func SettingsChatIgnoreHandler(c echo.Context) error {