Skip to content

merge queue: checking #7402 on main (ec58243) #7410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 3 commits into from
Closed

merge queue: checking #7402 on main (ec58243) #7410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9bc9a7a
fix: unfollow race condition
aecsocket Sep 1, 2026
ca1e979
remove test since it's lowkey useless
aecsocket Sep 1, 2026
2cf6e76
Merge of #7402
mergify[bot] Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions ...abrinth/.sqlx/query-0fb1cca8a2a37107104244953371fe2f8a5e6edd57f4b325c5842c6571eb16b4.json
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...65ccbef5ad166ec9511ab20621c336446da6.json → ...034c7a4450e5e89d24a6f2e2b326da6abcbe.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...58623dca175dc27a2d3cd4aace9cfdecf789.json → ...244fa341ff98f31b3eb1010697e3939ab6d4.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

171 changes: 81 additions & 90 deletions apps/labrinth/src/routes/v3/projects.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3318,76 +3318,74 @@ pub async fn project_follow_internal(
.1;
let string = info.into_inner().0;

let result = db_models::DBProject::get(&string, &**pool, &redis)
let project = db_models::DBProject::get(&string, &**pool, &redis)
.await
.wrap_api_err("fetching project from database")?
.wrap_request_err_with(|| {
"the specified project does not exist!".to_string()
})?;

let user_id: db_ids::DBUserId = user.id.into();
let project_id: db_ids::DBProjectId = result.inner.id;
let project_id: db_ids::DBProjectId = project.inner.id;

if !is_visible_project(&result.inner, &Some(user), &pool, false)
if !is_visible_project(&project.inner, &Some(user), &pool, false)
.await
.wrap_api_err("checking project visibility")?
{
return Err(ApiError::NotFound(eyre::eyre!("resource not found")));
}

let following = sqlx::query!(
let mut transaction = pool
.begin()
.await
.wrap_internal_err("starting database transaction")?;

let insert_result = sqlx::query!(
"
SELECT EXISTS(SELECT 1 FROM mod_follows mf WHERE mf.follower_id = $1 AND mf.mod_id = $2)
",
INSERT INTO mod_follows (follower_id, mod_id)
VALUES ($1, $2)
ON CONFLICT DO NOTHING
",
user_id as db_ids::DBUserId,
project_id as db_ids::DBProjectId
)
.fetch_one(&**pool)
.await.wrap_internal_err("fetching project follow status from database")?
.exists
.unwrap_or(false);

if !following {
let mut transaction = pool
.begin()
.await
.wrap_internal_err("starting database transaction")?;
.execute(&mut transaction)
.await
.wrap_internal_err("querying database for `project_follow_internal`")?;

sqlx::query!(
"
if insert_result.rows_affected() == 0 {
return Err(ApiError::Request(eyre::eyre!(
"you are already following this project",
)));
}

sqlx::query!(
"
UPDATE mods
SET follows = follows + 1
WHERE id = $1
",
project_id as db_ids::DBProjectId,
)
.execute(&mut transaction)
.await
.wrap_internal_err("querying database for `project_follow_internal`")?;
project_id as db_ids::DBProjectId,
)
.execute(&mut transaction)
.await
.wrap_internal_err("querying database for `project_follow_internal`")?;

sqlx::query!(
"
INSERT INTO mod_follows (follower_id, mod_id)
VALUES ($1, $2)
",
user_id as db_ids::DBUserId,
project_id as db_ids::DBProjectId
)
.execute(&mut transaction)
transaction
.commit()
.await
.wrap_internal_err("querying database for `project_follow_internal`")?;
.wrap_internal_err("committing database transaction")?;

transaction
.commit()
.await
.wrap_internal_err("committing database transaction")?;
db_models::DBProject::clear_cache(
project_id,
project.inner.slug,
None,
&redis,
)
.await
.wrap_internal_err("clearing cached project data")?;

Ok(HttpResponse::NoContent().body(""))
} else {
Err(ApiError::Request(eyre::eyre!(
"You are already following this project!",
)))
}
Ok(HttpResponse::NoContent().body(""))
}

/// Unfollow a project.
Expand Down Expand Up @@ -3425,73 +3423,66 @@ pub async fn project_unfollow_internal(
.1;
let string = info.into_inner().0;

let result = db_models::DBProject::get(&string, &**pool, &redis)
let project = db_models::DBProject::get(&string, &**pool, &redis)
.await
.wrap_api_err("fetching project from database")?
.wrap_request_err_with(|| {
"the specified project does not exist!".to_string()
})?;

let user_id: db_ids::DBUserId = user.id.into();
let project_id = result.inner.id;
let project_id = project.inner.id;

let following = sqlx::query!(
let mut transaction = pool
.begin()
.await
.wrap_internal_err("starting database transaction")?;

let delete_result = sqlx::query!(
"
SELECT EXISTS(SELECT 1 FROM mod_follows mf WHERE mf.follower_id = $1 AND mf.mod_id = $2)
",
DELETE FROM mod_follows
WHERE follower_id = $1 AND mod_id = $2
",
user_id as db_ids::DBUserId,
project_id as db_ids::DBProjectId
)
.fetch_one(&**pool)
.await.wrap_internal_err("fetching project follow status from database")?
.exists
.unwrap_or(false);

if following {
let mut transaction = pool
.begin()
.await
.wrap_internal_err("starting database transaction")?;
.execute(&mut transaction)
.await
.wrap_internal_err("querying database for `project_unfollow_internal`")?;

sqlx::query!(
"
if delete_result.rows_affected() == 0 {
return Err(ApiError::Request(eyre::eyre!(
"you are not following this project",
)));
}

sqlx::query!(
"
UPDATE mods
SET follows = follows - 1
SET follows = GREATEST(follows - 1, 0)
WHERE id = $1
",
project_id as db_ids::DBProjectId,
)
.execute(&mut transaction)
.await
.wrap_internal_err(
"querying database for `project_unfollow_internal`",
)?;
project_id as db_ids::DBProjectId,
)
.execute(&mut transaction)
.await
.wrap_internal_err("querying database for `project_unfollow_internal`")?;

sqlx::query!(
"
DELETE FROM mod_follows
WHERE follower_id = $1 AND mod_id = $2
",
user_id as db_ids::DBUserId,
project_id as db_ids::DBProjectId
)
.execute(&mut transaction)
transaction
.commit()
.await
.wrap_internal_err(
"querying database for `project_unfollow_internal`",
)?;
.wrap_internal_err("committing database transaction")?;

transaction
.commit()
.await
.wrap_internal_err("committing database transaction")?;
db_models::DBProject::clear_cache(
project_id,
project.inner.slug,
None,
&redis,
)
.await
.wrap_internal_err("clearing cached project data")?;

Ok(HttpResponse::NoContent().body(""))
} else {
Err(ApiError::Request(eyre::eyre!(
"You are not following this project!",
)))
}
Ok(HttpResponse::NoContent().body(""))
}

/// Get a project's organization.
Expand Down
Loading