MrSphay/Modrinth-plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix various user/project deletion queries (#5511)

Browse Source
This commit is contained in:
aecsocket
2026-03-12 12:46:39 +00:00
committed by GitHub
parent 407e6217f5
commit 1c1683adb6
30 changed files with 298 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
apps/labrinth/src/database/models/user_item.rs
View File

@@ -573,9 +573,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM notifications_actions
WHERE notification_id = ANY($1)
",
DELETE FROM notifications_actions
WHERE notification_id = ANY($1)
",
&notifications
)
.execute(&mut *transaction)
@@ -584,9 +584,20 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM notifications_deliveries
WHERE user_id = $1
",
DELETE FROM notifications_deliveries
WHERE notification_id = ANY($1)
",
&notifications
)
.execute(&mut *transaction)
.await
.wrap_err("failed to delete notifications_deliveries")?;
sqlx::query!(
"
DELETE FROM notifications_deliveries
WHERE user_id = $1
",
id as DBUserId
)
.execute(&mut *transaction)
@@ -785,9 +796,9 @@ impl DBUser {
sqlx::query!(
"
UPDATE payouts_values
SET user_id = $1
WHERE user_id = $2",
UPDATE payouts_values
SET user_id = $1
WHERE user_id = $2",
deleted_user as DBUserId,
id as DBUserId,
)
@@ -795,6 +806,18 @@ impl DBUser {
.await
.wrap_err("failed to update payouts_values user_id")?;
sqlx::query!(
"
UPDATE payouts
SET user_id = $1
WHERE user_id = $2",
deleted_user as DBUserId,
id as DBUserId,
)
.execute(&mut *transaction)
.await
.wrap_err("failed to update payouts user_id")?;
sqlx::query!(
"
DELETE FROM payouts_values_notifications
@@ -866,9 +889,22 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM users
WHERE id = $1
",
UPDATE oauth_clients
SET created_by = $1
WHERE created_by = $2
",
deleted_user as DBUserId,
id as DBUserId,
)
.execute(&mut *transaction)
.await
.wrap_err("failed to update oauth_clients created_by")?;
sqlx::query!(
"
DELETE FROM users
WHERE id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -877,9 +913,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM oauth_client_authorizations
WHERE user_id = $1
",
DELETE FROM oauth_client_authorizations
WHERE user_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -888,9 +924,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM shared_instance_users
WHERE user_id = $1
",
DELETE FROM shared_instance_users
WHERE user_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -899,9 +935,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM shared_instance_invited_users
WHERE invited_user_id = $1
",
DELETE FROM shared_instance_invited_users
WHERE invited_user_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -910,10 +946,10 @@ impl DBUser {
sqlx::query!(
"
UPDATE users_redeemals
SET user_id = $1
WHERE user_id = $2
",
UPDATE users_redeemals
SET user_id = $1
WHERE user_id = $2
",
deleted_user as DBUserId,
id as DBUserId,
)
@@ -923,10 +959,10 @@ impl DBUser {
sqlx::query!(
"
UPDATE users_compliance
SET user_id = $1
WHERE user_id = $2
",
UPDATE users_compliance
SET user_id = $1
WHERE user_id = $2
",
deleted_user as DBUserId,
id as DBUserId,
)
@@ -936,9 +972,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM user_limits
WHERE user_id = $1
",
DELETE FROM user_limits
WHERE user_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -947,9 +983,9 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM users_notifications_preferences
WHERE user_id = $1
",
DELETE FROM users_notifications_preferences
WHERE user_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
@@ -958,28 +994,15 @@ impl DBUser {
sqlx::query!(
"
DELETE FROM moderation_locks
WHERE moderator_id = $1
",
DELETE FROM moderation_locks
WHERE moderator_id = $1
",
id as DBUserId,
)
.execute(&mut *transaction)
.await
.wrap_err("failed to delete moderation_locks")?;
sqlx::query!(
"
UPDATE oauth_clients
SET created_by = $1
WHERE created_by = $2
",
deleted_user as DBUserId,
id as DBUserId,
)
.execute(&mut *transaction)
.await
.wrap_err("failed to update oauth_clients created_by")?;
Ok(Some(()))
} else {
Ok(None)