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

fix: moderation locking fixes (#5843)

Browse Source 
* fix: moderation locking fixes

* fix: lint

* wip: override always available

* fix: newmodal base z

* fix: cargo fmt
This commit is contained in:
Calum H.
2026-04-18 19:55:33 +01:00
committed by GitHub
parent 3a44def301
commit 2236dd8ade
19 changed files with 1630 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/labrinth/src/test/api_v2/project.rs
View File

@@ -22,7 +22,7 @@ use async_trait::async_trait;
use bytes::Bytes;
use serde_json::json;
use crate::test::database::MOD_USER_PAT;
use crate::test::database::ADMIN_USER_PAT;
use super::{
ApiV2,
@@ -95,10 +95,10 @@ impl ApiProject for ApiV2 {
let resp = self.create_project(creation_data, pat).await;
assert_status!(&resp, StatusCode::OK);
// Approve as a moderator.
// Approve as admin so fixture setup is not blocked by the moderation-lock guard.
let req = TestRequest::patch()
.uri(&format!("/v2/project/{slug}"))
.append_pat(MOD_USER_PAT)
.append_pat(ADMIN_USER_PAT)
.set_json(json!(
{
"status": "approved"

7
apps/labrinth/src/test/api_v3/project.rs
View File

@@ -23,7 +23,7 @@ use crate::test::{
models::{CommonItemType, CommonProject, CommonVersion},
request_data::{ImageData, ProjectCreationRequestData},
},
database::MOD_USER_PAT,
database::ADMIN_USER_PAT,
dummy_data::TestFile,
};
@@ -49,10 +49,11 @@ impl ApiProject for ApiV3 {
let resp = self.create_project(creation_data, pat).await;
assert_status!(&resp, StatusCode::OK);
// Approve as a moderator.
// Approve as admin so fixture setup is not blocked by the moderation-lock guard
// (non-admin moderators must hold a lock to move a project out of processing).
let req = TestRequest::patch()
.uri(&format!("/v3/project/{slug}"))
.append_pat(MOD_USER_PAT)
.append_pat(ADMIN_USER_PAT)
.set_json(json!(
{
"status": "approved"