dkforest

commit ad0f44374c2dc77d1b5a77132d7b1a0f4b13a69e
parent a0ff4de59256de022a7bf545811ad53b7fe6a03c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Sun,  4 Dec 2022 07:42:25 -0500

cleanup

Diffstat:
M
pkg/web/handlers/utils/utils.go
 | 
31
++++++++++++++++++++++---------

1 file changed, 22 insertions(+), 9 deletions(-)
diff --git a/pkg/web/handlers/utils/utils.go b/pkg/web/handlers/utils/utils.go
@@ -3,6 +3,7 @@ package utils
 import (
 	"dkforest/pkg/captcha"
 	"errors"
+	"fmt"
 	"net/http"
 	"strconv"
 	"time"
@@ -42,34 +43,46 @@ func DeleteCookie(name string) *http.Cookie {
 	return CreateCookie(name, "", -1)
 }
 
+func getRoomCookieName(roomID int64) string {
+	return fmt.Sprintf("room_%d_auth", roomID)
+}
+
+func getRoomKeyCookieName(roomID int64) string {
+	return fmt.Sprintf("room_%d_key", roomID)
+}
+
+func getGistCookieName(gistUUID string) string {
+	return fmt.Sprintf("gist_%s_auth", gistUUID)
+}
+
 func GetRoomCookie(c echo.Context, roomID int64) (*http.Cookie, error) {
-	return c.Cookie("room_" + utils.FormatInt64(roomID) + "_auth")
+	return c.Cookie(getRoomCookieName(roomID))
 }
 
 func GetRoomKeyCookie(c echo.Context, roomID int64) (*http.Cookie, error) {
-	return c.Cookie("room_" + utils.FormatInt64(roomID) + "_key")
+	return c.Cookie(getRoomKeyCookieName(roomID))
 }
 
 func DeleteRoomCookie(c echo.Context, roomID int64) {
-	c.SetCookie(DeleteCookie("room_" + utils.FormatInt64(roomID) + "_auth"))
-	c.SetCookie(DeleteCookie("room_" + utils.FormatInt64(roomID) + "_key"))
+	c.SetCookie(DeleteCookie(getRoomCookieName(roomID)))
+	c.SetCookie(DeleteCookie(getRoomKeyCookieName(roomID)))
 }
 
 func CreateRoomCookie(c echo.Context, roomID int64, v, key string) {
-	c.SetCookie(CreateCookie("room_"+utils.FormatInt64(roomID)+"_auth", v, utils.OneDaySecs))
-	c.SetCookie(CreateCookie("room_"+utils.FormatInt64(roomID)+"_key", key, utils.OneDaySecs))
+	c.SetCookie(CreateCookie(getRoomCookieName(roomID), v, utils.OneDaySecs))
+	c.SetCookie(CreateCookie(getRoomKeyCookieName(roomID), key, utils.OneDaySecs))
 }
 
 func GetGistCookie(c echo.Context, gistUUID string) (*http.Cookie, error) {
-	return c.Cookie("gist_" + gistUUID + "_auth")
+	return c.Cookie(getGistCookieName(gistUUID))
 }
 
 func DeleteGistCookie(c echo.Context, gistUUID string) {
-	c.SetCookie(DeleteCookie("gist_" + gistUUID + "_auth"))
+	c.SetCookie(DeleteCookie(getGistCookieName(gistUUID)))
 }
 
 func CreateGistCookie(c echo.Context, gistUUID, v string) {
-	c.SetCookie(CreateCookie("gist_"+gistUUID+"_auth", v, utils.OneDaySecs))
+	c.SetCookie(CreateCookie(getGistCookieName(gistUUID), v, utils.OneDaySecs))
 }
 
 func GetAprilFoolCookie(c echo.Context) int {