From 84cc47e3cf9ea591893a2ff873d1c8f888e48aed Mon Sep 17 00:00:00 2001 From: killerprojecte Date: Mon, 22 Jun 2026 19:56:43 +0800 Subject: [PATCH] chore: revert some wrong changes --- apps/api/internal/app/mail_handlers.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/api/internal/app/mail_handlers.go b/apps/api/internal/app/mail_handlers.go index f219d78..ad666d9 100644 --- a/apps/api/internal/app/mail_handlers.go +++ b/apps/api/internal/app/mail_handlers.go @@ -233,15 +233,15 @@ func (a *App) handleDeleteMailLabel(w http.ResponseWriter, r *http.Request) { return } tx, err := a.db.BeginTx(ctx, nil) + if err != nil { + respondError(w, http.StatusInternalServerError, "failed to begin transaction") + return + } + defer tx.Rollback() if (_, err := tx.ExecContext(ctx, "DELETE FROM message_labels WHERE label_id = ? AND EXISTS (SELECT 1 FROM mail_labels WHERE id = ? AND mailbox_id = ?)", labelID, labelID, mb.ID); err != nil { respondError(w, http.StatusInternalServerError, "failed to remove label associations") return } - defer tx.Rollback() - if _, err := tx.ExecContext(ctx, `DELETE FROM message_labels WHERE label_id=?`, labelID); err != nil { - respondError(w, http.StatusInternalServerError, "failed to remove label associations") - return - } result, err := tx.ExecContext(ctx, `DELETE FROM mail_labels WHERE id=? AND mailbox_id=?`, labelID, mb.ID) if err != nil { respondError(w, http.StatusInternalServerError, "failed to delete label")