From 14c6df9891d25fcb8f10fc3b4766a59bfdd76b7a Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Sun, 19 Apr 2026 20:52:38 -0500 Subject: [PATCH] cleanup for deleting community conferences --- database/conference.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/database/conference.go b/database/conference.go index 48fa794..128ccfd 100644 --- a/database/conference.go +++ b/database/conference.go @@ -959,16 +959,15 @@ func (*conferenceServiceVTable) OnDeleteCommunity(ctx context.Context, tx *sqlx. if _, err = tx.ExecContext(ctx, "DELETE FROM commtoconf WHERE commid = ? AND confid = ?", commid, confid); err != nil { return err } + if _, err = tx.ExecContext(ctx, "DELETE FROM confalias WHERE commid = ? AND confid = ?", commid, confid); err != nil { + return err + } if refCount > 0 { confids[i] = -1 continue // done with this conference } // We have to delete all the conference core data now. - _, err = tx.ExecContext(ctx, "DELETE FROM confs WHERE confid = ?", confid) - if err == nil { - _, err = tx.ExecContext(ctx, "DELETE FROM confalias WHERE confid = ?", confid) - } - if err != nil { + if _, err = tx.ExecContext(ctx, "DELETE FROM confs WHERE confid = ?", confid); err != nil { return err } // kick the conference out of the cache