dkforest

commit 850b4bc8db66bfe7128ad37d11998f002b9f88b0
parent b3112dfa927eba11c029a3b5c76847f2697892b2
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 11 Jan 2023 11:53:23 -0800

cleanup

Diffstat:
M
pkg/web/handlers/chat.go
 | 
14
+++++++-------
M
pkg/web/public/views/pages/chat.gohtml
 | 
5
++---

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/pkg/web/handlers/chat.go b/pkg/web/handlers/chat.go
@@ -64,15 +64,10 @@ func chatHandler(c echo.Context, redRoom bool) error {
 	}
 
 	if c.Request().Method == http.MethodPost {
-
-		btnSubmit := c.Request().PostFormValue("btn_submit")
-		if btnSubmit == "logout" {
-			hutils.DeleteRoomCookie(c, int64(room.ID))
-			return c.Redirect(http.StatusFound, "/chat")
-		}
-
 		formName := c.Request().PostFormValue("formName")
 		switch formName {
+		case "logout":
+			return handleLogoutPost(c, room)
 		case "toggle-hb":
 			return handleToggleHBPost(c, authUser)
 		case "toggle-m":
@@ -109,6 +104,11 @@ func getRoomName(c echo.Context) string {
 	return roomName
 }
 
+func handleLogoutPost(c echo.Context, room database.ChatRoom) error {
+	hutils.DeleteRoomCookie(c, int64(room.ID))
+	return c.Redirect(http.StatusFound, "/chat")
+}
+
 func handleToggleHBPost(c echo.Context, authUser *database.User) error {
 	if authUser.CanSeeHB() {
 		authUser.DisplayHellbanned = !authUser.DisplayHellbanned
diff --git a/pkg/web/public/views/pages/chat.gohtml b/pkg/web/public/views/pages/chat.gohtml
@@ -20,8 +20,6 @@
             padding: 0 4px !important;
             font-size: 11px !important;
         }
-        #logout_btn {
-        }
         body {
             {{ if eq .AuthUser.Theme 1 }}
                 background-image: url("/public/img/trees_christmas.png");
@@ -165,7 +163,8 @@
                 {{ if .Data.Room.Password }}
                     <form method="post" style="display: inline-block">
                         <input type="hidden" name="csrf" value="{{ .CSRF }}" />
-                        <button type="submit" value="logout" name="btn_submit" id="logout_btn" class="btn btn-xs btn-secondary">{{ t "Logout" . }}</button>
+                        <input type="hidden" name="formName" value="logout" />
+                        <button type="submit" class="btn btn-xs btn-secondary">{{ t "Logout" . }}</button>
                     </form>
                 {{ end }}
                 {{ if not .Data.IsOfficialRoom }}