3 files changed, 2 insertions, 89 deletions
diff --git a/internal/router/api-v1-subs.go b/internal/router/api-v1-subs.go
index 72f16e0..8995ebe 100644
--- a/internal/router/api-v1-subs.go
+++ b/internal/router/api-v1-subs.go
@@ -58,7 +58,7 @@ func Api_V1_Subs_Put(l map[string]*locale.LocaleConfig) func(c *fiber.Ctx) error
 		}
 
 		specificTags := c.FormValue("tags_picked")
-		if err = Mailer.Subscribe(Mailer.GetHash(id), subscriptionTypeEnum, specificTags); err != nil {
+		if err = Mailer.Subscribe(id, subscriptionTypeEnum, specificTags); err != nil {
 			return api_v1_email_sendStatusHtml(c, "subs-message", l, "Failed", fiber.StatusUnprocessableEntity, lang, l[lang].UserProfile.FailedToSubscribe, map[string]string{})
 		}
 
diff --git a/internal/router/client-cache.go b/internal/router/client-cache.go
index e7cda30..d607cdd 100644
--- a/internal/router/client-cache.go
+++ b/internal/router/client-cache.go
@@ -31,12 +31,10 @@ func NewClientCache(db *sql.DB, salt []byte) (*ClientCache, error) {
 	if err != nil {
 		return nil, fmt.Errorf("fail to init transaction with db to fill cache: %w", err)
 	}
-	slog.Debug("began db transaction", slog.String("method", "NewClientCache"))
 
 	rows, err := tx.Query("select * from blog_likes;")
 	if err != nil {
 		tx.Rollback()
-		slog.Debug("ended db transaction", slog.String("method", "NewClientCache"))
 		return nil, fmt.Errorf("fail to query db for blog_likes to fill cache: %w", err)
 	}
 
@@ -64,7 +62,6 @@ func NewClientCache(db *sql.DB, salt []byte) (*ClientCache, error) {
 	rows, err = tx.Query("select * from blog_views;")
 	if err != nil {
 		tx.Rollback()
-		slog.Debug("ended db transaction", slog.String("method", "NewClientCache"))
 		return nil, fmt.Errorf("fail to query db for blog_views to fill cache: %w", err)
 	}
 
@@ -84,11 +81,8 @@ func NewClientCache(db *sql.DB, salt []byte) (*ClientCache, error) {
 	}
 
 	if err = tx.Commit(); err != nil {
-		tx.Rollback()
-		slog.Debug("ended db transaction", slog.String("method", "NewClientCache"))
 		return nil, fmt.Errorf("fail to commit transaction in db: %w", err)
 	}
-	slog.Debug("ended db transaction", slog.String("method", "NewClientCache"))
 
 	return &ClientCache{
 		hashMap:      make(map[string]string),
@@ -105,28 +99,18 @@ func (c *ClientCache) Close() error {
 	if err != nil {
 		return fmt.Errorf("fail to init transaction with db to dump cache: %w", err)
 	}
-	slog.Debug("began db transaction in ClientCache.Close")
 
 	if err = batchSave(tx, "blog_likes", c.likePageMap); err != nil {
 		tx.Rollback()
-		slog.Debug("ended db transaction in ClientCache.Close")
 		return fmt.Errorf("fail to save blog_likes: %s", err)
 	}
 
 	if err = batchSave(tx, "blog_views", c.viewPageMap); err != nil {
 		tx.Rollback()
-		slog.Debug("ended db transaction in ClientCache.Close")
 		return fmt.Errorf("fail to save blog_views: %s", err)
 	}
 
-	if err = tx.Commit(); err != nil {
-		tx.Rollback()
-		slog.Debug("ended db transaction in ClientCache.Close")
-		return fmt.Errorf("fail to commit all the changes related to cache: %s", err)
-	}
-
-	slog.Debug("ended db transaction in ClientCache.Close")
-	return nil
+	return tx.Commit()
 }
 
 func (c *ClientCache) GetHash(id string) string {
diff --git a/internal/router/lang-user-unsubscribe.go b/internal/router/lang-user-unsubscribe.go
deleted file mode 100644
index c39f5e7..0000000
--- a/internal/router/lang-user-unsubscribe.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"html/template"
-	"log/slog"
-
-	"github.com/SayaAndy/saya-today-web/config"
-	"github.com/SayaAndy/saya-today-web/locale"
-	"github.com/gofiber/fiber/v2"
-)
-
-func init() {
-	assert(0, tm.Add("unsubscribe-page", "views/pages/unsubscribe-page.html"))
-}
-
-func Lang_User_Unsubscribe(l map[string]*locale.LocaleConfig, langs []config.AvailableLanguageConfig) func(c *fiber.Ctx) error {
-	return func(c *fiber.Ctx) error {
-		lang := c.Params("lang")
-		for _, availableLang := range langs {
-			if availableLang.Name == lang {
-				goto langIsAvailable
-			}
-		}
-		return c.Status(fiber.ErrNotFound.Code).SendString(fmt.Sprintf("server does not support '%s' language", lang))
-
-	langIsAvailable:
-		var statusEmoji, statusText, statusColor string
-		var status int
-
-		unsubscribeCode := c.FormValue("code")
-		if unsubscribeCode == "" {
-			statusColor = "0, 0, 255"
-			statusEmoji = "(╭ರ_•́)"
-			statusText = l[lang].UnsubscribePage.UnsetCode
-			status = fiber.ErrBadRequest.Code
-		} else if clientError, serverError := Mailer.Unsubscribe(unsubscribeCode); clientError != nil {
-			slog.Info("got a client error when unsubscribing", slog.String("error", clientError.Error()))
-			statusColor = "255, 0, 0"
-			statusEmoji = "(͠≖~≖  ͡ )"
-			statusText = l[lang].UnsubscribePage.InvalidCode
-			status = fiber.ErrBadRequest.Code
-		} else if serverError != nil {
-			slog.Error("got a server error when unsubscribing", slog.String("error", serverError.Error()))
-			statusColor = "255, 128, 0"
-			statusEmoji = "( ˶°ㅁ°) !!"
-			statusText = l[lang].UnsubscribePage.OnServerError
-			status = fiber.ErrInternalServerError.Code
-		} else {
-			statusColor = "0, 255, 0"
-			statusEmoji = "♡⸜(˶˃ ᵕ ˂˶)⸝♡"
-			statusText = l[lang].UnsubscribePage.Success
-			status = fiber.StatusOK
-		}
-
-		content, err := tm.Render("unsubscribe-page", fiber.Map{
-			"Lang":        lang,
-			"L":           l[lang],
-			"StatusEmoji": statusEmoji,
-			"StatusText":  statusText,
-			"StatusColor": template.HTML(statusColor),
-		})
-		if err != nil {
-			slog.Warn("failed to generate page", slog.String("page", "/"+lang+"/user/unsubscribe"), slog.String("error", err.Error()))
-			c.Set(fiber.HeaderContentType, fiber.MIMETextPlainCharsetUTF8)
-			return c.Status(fiber.ErrInternalServerError.Code).SendString("failed to generate page")
-		}
-
-		return c.Type("html").Status(status).Send(content)
-	}
-}