dkforest

commit dde53779d585619805be6594f4577de8d38eab3d
parent bfceb4fdd070f7b57889f0a01b856745aa25337c
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 14 Dec 2022 22:26:41 -0500

cleanup

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

1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -156,7 +156,7 @@ func protectHomeHandler(c echo.Context) error {
 	waitTime := int64(time.Until(loginLink.ValidUntil).Seconds())
 
 	// Generate css frames
-	frames := generateCaptchaCssFrames(waitTime, func(i int64) string {
+	frames := generateCssFrames(waitTime, func(i int64) string {
 		return utils.ShortDur(time.Duration(i) * time.Second)
 	}, true)
 
@@ -785,7 +785,7 @@ func waitPageWrapper(c echo.Context, clb echo.HandlerFunc, cookieName string) er
 
 		var data1 waitData
 		// Generate css frames
-		data1.Frames = generateCaptchaCssFrames(waitTime, nil, true)
+		data1.Frames = generateCssFrames(waitTime, nil, true)
 		data1.WaitTime = waitTime
 		data1.SignupToken = signupToken
 		return c.Render(http.StatusOK, "signup-wait", data1)
@@ -851,7 +851,7 @@ func signupHandler(c echo.Context) error {
 	config.SignupPageLoad.Inc()
 
 	data.CaptchaSec = 120
-	data.Frames = generateCaptchaCssFrames(data.CaptchaSec, nil, true)
+	data.Frames = generateCssFrames(data.CaptchaSec, nil, true)
 
 	hbCookie, hbCookieErr := c.Cookie(hutils.HBCookieName)
 	hasHBCookie := hbCookieErr == nil && hbCookie.Value != ""
@@ -975,19 +975,20 @@ const (
 	RecoveryGpgValidated
 )
 
-func generateCaptchaCssFrames(captchaSec int64, contentFn func(int64) string, reverse bool) (frames []string) {
-	step := 100.0 / float64(captchaSec)
+func generateCssFrames(n int64, contentFn func(int64) string, reverse bool) (frames []string) {
+	step := 100.0 / float64(n)
 	pct := 0.0
-	for i := int64(0); i <= captchaSec; i++ {
+	for i := int64(0); i <= n; i++ {
 		num := i
 		if reverse {
-			num = captchaSec - i
+			num = n - i
 		}
 		if contentFn == nil {
-			frames = append(frames, fmt.Sprintf(`%.2f%% { content: "%d"; }`, pct, num))
-		} else {
-			frames = append(frames, fmt.Sprintf(`%.2f%% { content: "%s"; }`, pct, contentFn(num)))
+			contentFn = func(i int64) string {
+				return utils.FormatInt64(i)
+			}
 		}
+		frames = append(frames, fmt.Sprintf(`%.2f%% { content: "%s"; }`, pct, contentFn(num)))
 		pct += step
 	}
 	return
@@ -1003,7 +1004,7 @@ func forgotPasswordHandler(c echo.Context) error {
 	data.Step = 1
 
 	data.CaptchaSec = 120
-	data.Frames = generateCaptchaCssFrames(data.CaptchaSec, nil, true)
+	data.Frames = generateCssFrames(data.CaptchaSec, nil, true)
 
 	data.CaptchaID, data.CaptchaImg = captcha.New()
 
@@ -3876,7 +3877,7 @@ func CaptchaHandler(c echo.Context) error {
 	//fmt.Println("Seed:", seed)
 
 	data.CaptchaSec = 120
-	data.Frames = generateCaptchaCssFrames(data.CaptchaSec, func(i int64) string {
+	data.Frames = generateCssFrames(data.CaptchaSec, func(i int64) string {
 		return fmt.Sprintf("%ds", i)
 	}, false)