szx/NewSzxcn-Email
1
0
Fork 0
Code Issues Pull Requests Actions 57 Packages Projects Releases Wiki Activity

chore: revert some wrong changes

Browse Source
This commit is contained in:
killerprojecte
2026-06-22 19:56:43 +08:00
parent 8d29dbd126
commit 84cc47e3cf
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/api/internal/app/mail_handlers.go
+5 -5
View File
@@ -233,15 +233,15 @@ func (a *App) handleDeleteMailLabel(w http.ResponseWriter, r *http.Request) {
return return
} }
tx, err := a.db.BeginTx(ctx, nil) 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 { 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") respondError(w, http.StatusInternalServerError, "failed to remove label associations")
return 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) result, err := tx.ExecContext(ctx, `DELETE FROM mail_labels WHERE id=? AND mailbox_id=?`, labelID, mb.ID)
if err != nil { if err != nil {
respondError(w, http.StatusInternalServerError, "failed to delete label") respondError(w, http.StatusInternalServerError, "failed to delete label")