From f101d6a555c6d3453def332f2c230b37ae5c81b4 Mon Sep 17 00:00:00 2001 From: SayaAndy Date: Thu, 23 Oct 2025 19:32:11 +0700 Subject: fix: disable subscription form if user has no verified email fix: check properly if the email was already taken --- internal/mailer/mailer.go | 7 ++++++- internal/router/api-v1-email-verify.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'internal') diff --git a/internal/mailer/mailer.go b/internal/mailer/mailer.go index cd5eda8..ba2202e 100644 --- a/internal/mailer/mailer.go +++ b/internal/mailer/mailer.go @@ -145,7 +145,8 @@ func (m *Mailer) MailIsTaken(email string) (bool, error) { defer tx.Commit() defer rows.Close() - return rows.Next(), nil + isTaken := rows.Next() + return isTaken, nil } func (m *Mailer) GetInfo(userId string) (email string, lang string, err error) { @@ -355,3 +356,7 @@ func (m *Mailer) Subscribe(userId string, subscriptionType SubscriptionType, tag return nil } + +func SendNewPost() { + +} diff --git a/internal/router/api-v1-email-verify.go b/internal/router/api-v1-email-verify.go index fad174b..7fbfdec 100644 --- a/internal/router/api-v1-email-verify.go +++ b/internal/router/api-v1-email-verify.go @@ -45,7 +45,7 @@ func Api_V1_Email_Verify(l map[string]*locale.LocaleConfig) func(c *fiber.Ctx) e slog.Error("verification code is invalid", slog.String("verification_code", verificationCode), slog.String("error", err.Error())) return api_v1_email_sendStatusHtml(c, "verification-message", l, "Failed", fiber.ErrUnprocessableEntity.Code, lang, l[lang].UserProfile.VerificationFailed, map[string]string{}) } - return api_v1_email_sendStatusHtml(c, "verification-message", l, "OK", fiber.StatusOK, lang, l[lang].UserProfile.VerificationSuccess, map[string]string{ + return api_v1_email_sendStatusHtml(c, "verification-message", l, "OK", fiber.StatusOK, lang, l[lang].UserProfile.VerificationSuccess+"\n\n"+l[lang].UserProfile.RefreshPage, map[string]string{ "hide-verification-panel": "true", }) } -- cgit v1.3.1+13