From 0a0ef1ce811e1ea6359d246a518bae964a22f22c Mon Sep 17 00:00:00 2001 From: aecsocket <43144841+aecsocket@users.noreply.github.com> Date: Mon, 22 Jun 2026 15:27:31 +0100 Subject: [PATCH] Fix account deletion deleting incorrect report threads (#6465) --- ...c6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1.json} | 4 ++-- apps/labrinth/src/database/models/user_item.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename apps/labrinth/.sqlx/{query-531e556fa37da6b74aab2e539bcc13b66ced32452152f20e8fa5df4b3d14f292.json => query-af770d434cbfc6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1.json} (67%) diff --git a/apps/labrinth/.sqlx/query-531e556fa37da6b74aab2e539bcc13b66ced32452152f20e8fa5df4b3d14f292.json b/apps/labrinth/.sqlx/query-af770d434cbfc6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1.json similarity index 67% rename from apps/labrinth/.sqlx/query-531e556fa37da6b74aab2e539bcc13b66ced32452152f20e8fa5df4b3d14f292.json rename to apps/labrinth/.sqlx/query-af770d434cbfc6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1.json index d05f826d13..e4a8d1ec01 100644 --- a/apps/labrinth/.sqlx/query-531e556fa37da6b74aab2e539bcc13b66ced32452152f20e8fa5df4b3d14f292.json +++ b/apps/labrinth/.sqlx/query-af770d434cbfc6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT t.id\n FROM threads t\n INNER JOIN reports r ON t.report_id = r.id AND (r.user_id = $1 OR r.reporter = $1)\n WHERE report_id IS NOT NULL\n ", + "query": "\n SELECT t.id\n FROM threads t\n INNER JOIN reports r ON t.report_id = r.id AND r.reporter = $1\n WHERE report_id IS NOT NULL\n ", "describe": { "columns": [ { @@ -18,5 +18,5 @@ false ] }, - "hash": "531e556fa37da6b74aab2e539bcc13b66ced32452152f20e8fa5df4b3d14f292" + "hash": "af770d434cbfc6bb73239a8af03f5cde101fa7cfd35f550973a77bb40e46cfe1" } diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs index 57653b2604..92dc3d15c0 100644 --- a/apps/labrinth/src/database/models/user_item.rs +++ b/apps/labrinth/src/database/models/user_item.rs @@ -719,7 +719,7 @@ impl DBUser { " SELECT t.id FROM threads t - INNER JOIN reports r ON t.report_id = r.id AND (r.user_id = $1 OR r.reporter = $1) + INNER JOIN reports r ON t.report_id = r.id AND r.reporter = $1 WHERE report_id IS NOT NULL ", id as DBUserId,