dkforest

commit 5ee0e5c50374f828dcd9507f191e129ae58eb7de
parent 647b0c28f9a1ab2b33cac31133e4d89197df2392
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 14 Dec 2022 21:20:22 -0500

cleanup

Diffstat:
M
pkg/global/global.go
 | 
2
+-
M
pkg/web/handlers/handlers.go
 | 
16
++++++++--------

2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkg/global/global.go b/pkg/global/global.go
@@ -22,6 +22,6 @@ func GetUserNotificationCount(userID database.UserID, sessionToken string) int64
 	if sessionToken != "" {
 		count += database.GetUserSessionNotificationsCount(sessionToken)
 	}
-	notifCountCache.Set(userID, count, 30*time.Second)
+	notifCountCache.SetD(userID, count)
 	return count
 }
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -150,7 +150,7 @@ func protectHomeHandler(c echo.Context) error {
 	if !found {
 		loginLink.ID, loginLink.Img = captcha.NewWithParams(captcha.Params{Store: tempLoginStore})
 		loginLink.ValidUntil = time.Now().Add(3 * time.Minute)
-		tempLoginCache.Set("login_link", loginLink, 3*time.Minute)
+		tempLoginCache.SetD("login_link", loginLink)
 	}
 
 	waitTime := int64(time.Until(loginLink.ValidUntil).Seconds())
@@ -3391,7 +3391,7 @@ func SettingsAgeHandler(c echo.Context) error {
 
 func generateAgeEncryptedTokenMessage(userID database.UserID, pkey string) (string, error) {
 	token := utils.GenerateToken32()
-	ageTokenCache.Set(userID, ValueTokenCache{Value: token, PKey: pkey}, 10*time.Minute)
+	ageTokenCache.SetD(userID, ValueTokenCache{Value: token, PKey: pkey})
 
 	recipient, err := age.ParseX25519Recipient(pkey)
 	if err != nil {
@@ -3415,7 +3415,7 @@ func generateAgeEncryptedTokenMessage(userID database.UserID, pkey string) (stri
 
 func generatePgpEncryptedTokenMessage(userID database.UserID, pkey string) (string, error) {
 	token := utils.GenerateToken32()
-	pgpTokenCache.Set(userID, ValueTokenCache{Value: token, PKey: pkey}, 10*time.Minute)
+	pgpTokenCache.SetD(userID, ValueTokenCache{Value: token, PKey: pkey})
 	msg := "The required code is below the line.\n----------------------------------------------------------------------------------\n" + token + "\n"
 	return utils.GeneratePgpEncryptedMessage(pkey, msg)
 }
@@ -3423,7 +3423,7 @@ func generatePgpEncryptedTokenMessage(userID database.UserID, pkey string) (stri
 func generatePgpToBeSignedTokenMessage(userID database.UserID, pkey string) string {
 	token := utils.GenerateToken10()
 	msg := fmt.Sprintf("dkf_%s{%s}", time.Now().UTC().Format("2006.01.02"), token)
-	pgpTokenCache.Set(userID, ValueTokenCache{Value: msg, PKey: pkey}, 10*time.Minute)
+	pgpTokenCache.SetD(userID, ValueTokenCache{Value: msg, PKey: pkey})
 	return msg
 }
 
@@ -3794,7 +3794,7 @@ func VipDownloadsHandler(c echo.Context) error {
 		} else {
 			data.FlagMessage = "Invalid flag"
 		}
-		flagValidationCache.Set(authUser.ID, true, time.Minute)
+		flagValidationCache.SetD(authUser.ID, true)
 	}
 
 	return c.Render(http.StatusOK, "vip.re-1", data)
@@ -4129,7 +4129,7 @@ func ByteRoadChallengeHandler(c echo.Context) error {
 			}
 			token := utils.GenerateToken32()
 			setCookie(token)
-			byteRoadSignUpSessionCache.Set(token, true, 10*time.Minute)
+			byteRoadSignUpSessionCache.SetD(token, true)
 			data.CaptchaSolved = true
 			return c.Render(http.StatusOK, "vip.byte-road-challenge", data)
 
@@ -4187,7 +4187,7 @@ func ByteRoadChallengeHandler(c echo.Context) error {
 			setCookie(token)
 
 			payload := ByteRoadPayload{Count: 1, Usernames: map[string]struct{}{data.Username: {}}}
-			byteRoadUsersCountCache.Set(authUser.ID, payload, 5*time.Minute)
+			byteRoadUsersCountCache.SetD(authUser.ID, payload)
 			return c.Render(http.StatusOK, "vip.byte-road-challenge", data)
 
 		}
@@ -4308,7 +4308,7 @@ func Stego1ChallengeHandler(c echo.Context) error {
 		} else {
 			data.FlagMessage = "Invalid flag"
 		}
-		flagValidationCache.Set(authUser.ID, true, time.Minute)
+		flagValidationCache.SetD(authUser.ID, true)
 	}
 
 	return c.Render(http.StatusOK, "vip.stego1", data)