You've already forked AstralRinth
forked from didirus/AstralRinth
feat: moderation locking (#5070)
* feat: base locking impl * feat: lock logic in place in rev endpoint + fetch rev * feat: frontend impl and finalize * feat: auto skip if using the moderation queue page * fix: qa issues * fix: async state + locking fix * fix: lint * fix: fmt * fix: qa issue * fix: qa + redirect bug * fix: lint * feat: delete all locks endpoint for admins * fix: dedupe * fix: fmt * fix: project redirect move to middleware * fix: lint
This commit is contained in:
@@ -11,6 +11,7 @@ pub mod ids;
|
||||
pub mod image_item;
|
||||
pub mod legacy_loader_fields;
|
||||
pub mod loader_fields;
|
||||
pub mod moderation_lock_item;
|
||||
pub mod notification_item;
|
||||
pub mod notifications_deliveries_item;
|
||||
pub mod notifications_template_item;
|
||||
@@ -53,6 +54,8 @@ pub use thread_item::{DBThread, DBThreadMessage};
|
||||
pub use user_item::DBUser;
|
||||
pub use version_item::DBVersion;
|
||||
|
||||
pub use moderation_lock_item::{DBModerationLock, ModerationLockWithUser};
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
pub enum DatabaseError {
|
||||
#[error("Error while interacting with the database: {0}")]
|
||||
|
||||
163
apps/labrinth/src/database/models/moderation_lock_item.rs
Normal file
163
apps/labrinth/src/database/models/moderation_lock_item.rs
Normal file
@@ -0,0 +1,163 @@
|
||||
use chrono::{DateTime, Utc};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::PgPool;
|
||||
|
||||
use crate::database::models::{DBProjectId, DBUserId};
|
||||
|
||||
const LOCK_EXPIRY_MINUTES: i64 = 15;
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct DBModerationLock {
|
||||
pub project_id: DBProjectId,
|
||||
pub moderator_id: DBUserId,
|
||||
pub locked_at: DateTime<Utc>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||
pub struct ModerationLockWithUser {
|
||||
pub project_id: DBProjectId,
|
||||
pub moderator_id: DBUserId,
|
||||
pub moderator_username: String,
|
||||
pub moderator_avatar_url: Option<String>,
|
||||
pub locked_at: DateTime<Utc>,
|
||||
pub expired: bool,
|
||||
}
|
||||
|
||||
impl DBModerationLock {
|
||||
/// Check if a lock is expired (older than 15 minutes)
|
||||
pub fn is_expired(&self) -> bool {
|
||||
Utc::now()
|
||||
.signed_duration_since(self.locked_at)
|
||||
.num_minutes()
|
||||
>= LOCK_EXPIRY_MINUTES
|
||||
}
|
||||
|
||||
/// Try to acquire or refresh a lock for a project.
|
||||
/// Returns Ok(Ok(())) if lock acquired/refreshed, Ok(Err(lock)) if blocked by another moderator.
|
||||
pub async fn acquire(
|
||||
project_id: DBProjectId,
|
||||
moderator_id: DBUserId,
|
||||
pool: &PgPool,
|
||||
) -> Result<Result<(), ModerationLockWithUser>, sqlx::Error> {
|
||||
// First check if there's an existing lock
|
||||
let existing = Self::get_with_user(project_id, pool).await?;
|
||||
|
||||
if let Some(lock) = existing {
|
||||
// Same moderator - refresh the lock
|
||||
if lock.moderator_id == moderator_id {
|
||||
sqlx::query!(
|
||||
"UPDATE moderation_locks SET locked_at = NOW() WHERE project_id = $1",
|
||||
project_id as DBProjectId
|
||||
)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
return Ok(Ok(()));
|
||||
}
|
||||
|
||||
// Different moderator but lock expired - take over
|
||||
if lock.expired {
|
||||
sqlx::query!(
|
||||
"UPDATE moderation_locks SET moderator_id = $1, locked_at = NOW() WHERE project_id = $2",
|
||||
moderator_id as DBUserId,
|
||||
project_id as DBProjectId
|
||||
)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
return Ok(Ok(()));
|
||||
}
|
||||
|
||||
// Different moderator, not expired - blocked
|
||||
return Ok(Err(lock));
|
||||
}
|
||||
|
||||
// No existing lock - create new one
|
||||
sqlx::query!(
|
||||
"INSERT INTO moderation_locks (project_id, moderator_id, locked_at)
|
||||
VALUES ($1, $2, NOW())
|
||||
ON CONFLICT (project_id) DO UPDATE
|
||||
SET moderator_id = EXCLUDED.moderator_id, locked_at = EXCLUDED.locked_at",
|
||||
project_id as DBProjectId,
|
||||
moderator_id as DBUserId
|
||||
)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
|
||||
Ok(Ok(()))
|
||||
}
|
||||
|
||||
/// Get lock status for a project, including moderator username
|
||||
pub async fn get_with_user(
|
||||
project_id: DBProjectId,
|
||||
pool: &PgPool,
|
||||
) -> Result<Option<ModerationLockWithUser>, sqlx::Error> {
|
||||
let row = sqlx::query!(
|
||||
r#"
|
||||
SELECT
|
||||
ml.project_id,
|
||||
ml.moderator_id,
|
||||
u.username as moderator_username,
|
||||
u.avatar_url as moderator_avatar_url,
|
||||
ml.locked_at
|
||||
FROM moderation_locks ml
|
||||
INNER JOIN users u ON u.id = ml.moderator_id
|
||||
WHERE ml.project_id = $1
|
||||
"#,
|
||||
project_id as DBProjectId
|
||||
)
|
||||
.fetch_optional(pool)
|
||||
.await?;
|
||||
|
||||
Ok(row.map(|r| {
|
||||
let locked_at: DateTime<Utc> = r.locked_at;
|
||||
let expired =
|
||||
Utc::now().signed_duration_since(locked_at).num_minutes()
|
||||
>= LOCK_EXPIRY_MINUTES;
|
||||
|
||||
ModerationLockWithUser {
|
||||
project_id: DBProjectId(r.project_id),
|
||||
moderator_id: DBUserId(r.moderator_id),
|
||||
moderator_username: r.moderator_username,
|
||||
moderator_avatar_url: r.moderator_avatar_url,
|
||||
locked_at,
|
||||
expired,
|
||||
}
|
||||
}))
|
||||
}
|
||||
|
||||
/// Release a lock (only if held by the specified moderator)
|
||||
pub async fn release(
|
||||
project_id: DBProjectId,
|
||||
moderator_id: DBUserId,
|
||||
pool: &PgPool,
|
||||
) -> Result<bool, sqlx::Error> {
|
||||
let result = sqlx::query!(
|
||||
"DELETE FROM moderation_locks WHERE project_id = $1 AND moderator_id = $2",
|
||||
project_id as DBProjectId,
|
||||
moderator_id as DBUserId
|
||||
)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
|
||||
Ok(result.rows_affected() > 0)
|
||||
}
|
||||
|
||||
/// Clean up expired locks (can be called periodically)
|
||||
pub async fn cleanup_expired(pool: &PgPool) -> Result<u64, sqlx::Error> {
|
||||
let result = sqlx::query!(
|
||||
"DELETE FROM moderation_locks WHERE locked_at < NOW() - INTERVAL '15 minutes'"
|
||||
)
|
||||
.execute(pool)
|
||||
.await?;
|
||||
|
||||
Ok(result.rows_affected())
|
||||
}
|
||||
|
||||
/// Delete all moderation locks (admin only)
|
||||
pub async fn delete_all(pool: &PgPool) -> Result<u64, sqlx::Error> {
|
||||
let result = sqlx::query!("DELETE FROM moderation_locks")
|
||||
.execute(pool)
|
||||
.await?;
|
||||
|
||||
Ok(result.rows_affected())
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,7 @@
|
||||
use super::ApiError;
|
||||
use crate::auth::get_user_from_headers;
|
||||
use crate::database;
|
||||
use crate::database::models::DBModerationLock;
|
||||
use crate::database::redis::RedisPool;
|
||||
use crate::models::ids::OrganizationId;
|
||||
use crate::models::projects::{Project, ProjectStatus};
|
||||
@@ -7,8 +9,9 @@ use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata};
|
||||
use crate::queue::session::AuthQueue;
|
||||
use crate::util::error::Context;
|
||||
use crate::{auth::check_is_moderator_from_headers, models::pats::Scopes};
|
||||
use actix_web::{HttpRequest, get, post, web};
|
||||
use actix_web::{HttpRequest, delete, get, post, web};
|
||||
use ariadne::ids::{UserId, random_base62};
|
||||
use chrono::{DateTime, Utc};
|
||||
use ownership::get_projects_ownership;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use sqlx::PgPool;
|
||||
@@ -21,6 +24,10 @@ pub fn config(cfg: &mut utoipa_actix_web::service_config::ServiceConfig) {
|
||||
cfg.service(get_projects)
|
||||
.service(get_project_meta)
|
||||
.service(set_project_meta)
|
||||
.service(acquire_lock)
|
||||
.service(get_lock_status)
|
||||
.service(release_lock)
|
||||
.service(delete_all_locks)
|
||||
.service(
|
||||
utoipa_actix_web::scope("/tech-review")
|
||||
.configure(tech_review::config),
|
||||
@@ -76,6 +83,59 @@ pub enum Ownership {
|
||||
},
|
||||
}
|
||||
|
||||
/// Response for lock status check
|
||||
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct LockStatusResponse {
|
||||
/// Whether the project is currently locked
|
||||
pub locked: bool,
|
||||
/// Information about who holds the lock (if locked)
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub locked_by: Option<LockedByUser>,
|
||||
/// When the lock was acquired
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub locked_at: Option<DateTime<Utc>>,
|
||||
/// Whether the lock has expired (>15 minutes old)
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub expired: Option<bool>,
|
||||
}
|
||||
|
||||
/// Information about the moderator holding the lock
|
||||
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct LockedByUser {
|
||||
/// User ID (base62 encoded)
|
||||
pub id: String,
|
||||
/// Username
|
||||
pub username: String,
|
||||
/// Avatar URL
|
||||
pub avatar_url: Option<String>,
|
||||
}
|
||||
|
||||
/// Response for successful lock acquisition
|
||||
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct LockAcquireResponse {
|
||||
/// Whether lock was successfully acquired
|
||||
pub success: bool,
|
||||
/// If blocked, info about who holds the lock
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub locked_by: Option<LockedByUser>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub locked_at: Option<DateTime<Utc>>,
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
pub expired: Option<bool>,
|
||||
}
|
||||
|
||||
/// Response for lock release
|
||||
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct LockReleaseResponse {
|
||||
pub success: bool,
|
||||
}
|
||||
|
||||
/// Response for deleting all locks
|
||||
#[derive(Debug, Serialize, Deserialize, utoipa::ToSchema)]
|
||||
pub struct DeleteAllLocksResponse {
|
||||
pub deleted_count: u64,
|
||||
}
|
||||
|
||||
/// Fetch all projects which are in the moderation queue.
|
||||
#[utoipa::path(
|
||||
responses((status = OK, body = inline(Vec<FetchedProject>)))
|
||||
@@ -422,3 +482,185 @@ async fn set_project_meta(
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Acquire or refresh a moderation lock on a project.
|
||||
/// Returns success if acquired, or info about who holds the lock if blocked.
|
||||
#[utoipa::path(
|
||||
responses(
|
||||
(status = OK, body = LockAcquireResponse),
|
||||
(status = NOT_FOUND, description = "Project not found")
|
||||
)
|
||||
)]
|
||||
#[post("/lock/{project_id}")]
|
||||
async fn acquire_lock(
|
||||
req: HttpRequest,
|
||||
pool: web::Data<PgPool>,
|
||||
redis: web::Data<RedisPool>,
|
||||
session_queue: web::Data<AuthQueue>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<web::Json<LockAcquireResponse>, ApiError> {
|
||||
let user = check_is_moderator_from_headers(
|
||||
&req,
|
||||
&**pool,
|
||||
&redis,
|
||||
&session_queue,
|
||||
Scopes::PROJECT_WRITE,
|
||||
)
|
||||
.await?;
|
||||
|
||||
let project_id_str = path.into_inner().0;
|
||||
let project =
|
||||
database::models::DBProject::get(&project_id_str, &**pool, &redis)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound)?;
|
||||
|
||||
let db_project_id = project.inner.id;
|
||||
let db_user_id = database::models::DBUserId::from(user.id);
|
||||
|
||||
match DBModerationLock::acquire(db_project_id, db_user_id, &pool).await? {
|
||||
Ok(()) => Ok(web::Json(LockAcquireResponse {
|
||||
success: true,
|
||||
locked_by: None,
|
||||
locked_at: None,
|
||||
expired: None,
|
||||
})),
|
||||
Err(lock) => Ok(web::Json(LockAcquireResponse {
|
||||
success: false,
|
||||
locked_by: Some(LockedByUser {
|
||||
id: UserId::from(lock.moderator_id).to_string(),
|
||||
username: lock.moderator_username,
|
||||
avatar_url: lock.moderator_avatar_url,
|
||||
}),
|
||||
locked_at: Some(lock.locked_at),
|
||||
expired: Some(lock.expired),
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
/// Check the lock status for a project
|
||||
#[utoipa::path(
|
||||
responses(
|
||||
(status = OK, body = LockStatusResponse),
|
||||
(status = NOT_FOUND, description = "Project not found")
|
||||
)
|
||||
)]
|
||||
#[get("/lock/{project_id}")]
|
||||
async fn get_lock_status(
|
||||
req: HttpRequest,
|
||||
pool: web::Data<PgPool>,
|
||||
redis: web::Data<RedisPool>,
|
||||
session_queue: web::Data<AuthQueue>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<web::Json<LockStatusResponse>, ApiError> {
|
||||
check_is_moderator_from_headers(
|
||||
&req,
|
||||
&**pool,
|
||||
&redis,
|
||||
&session_queue,
|
||||
Scopes::PROJECT_READ,
|
||||
)
|
||||
.await?;
|
||||
|
||||
let project_id_str = path.into_inner().0;
|
||||
let project =
|
||||
database::models::DBProject::get(&project_id_str, &**pool, &redis)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound)?;
|
||||
|
||||
let db_project_id = project.inner.id;
|
||||
|
||||
match DBModerationLock::get_with_user(db_project_id, &pool).await? {
|
||||
Some(lock) => Ok(web::Json(LockStatusResponse {
|
||||
locked: true,
|
||||
locked_by: Some(LockedByUser {
|
||||
id: UserId::from(lock.moderator_id).to_string(),
|
||||
username: lock.moderator_username,
|
||||
avatar_url: lock.moderator_avatar_url,
|
||||
}),
|
||||
locked_at: Some(lock.locked_at),
|
||||
expired: Some(lock.expired),
|
||||
})),
|
||||
None => Ok(web::Json(LockStatusResponse {
|
||||
locked: false,
|
||||
locked_by: None,
|
||||
locked_at: None,
|
||||
expired: None,
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
/// Release a moderation lock on a project
|
||||
#[utoipa::path(
|
||||
responses(
|
||||
(status = OK, body = LockReleaseResponse),
|
||||
(status = NOT_FOUND, description = "Project not found")
|
||||
)
|
||||
)]
|
||||
#[delete("/lock/{project_id}")]
|
||||
async fn release_lock(
|
||||
req: HttpRequest,
|
||||
pool: web::Data<PgPool>,
|
||||
redis: web::Data<RedisPool>,
|
||||
session_queue: web::Data<AuthQueue>,
|
||||
path: web::Path<(String,)>,
|
||||
) -> Result<web::Json<LockReleaseResponse>, ApiError> {
|
||||
let user = check_is_moderator_from_headers(
|
||||
&req,
|
||||
&**pool,
|
||||
&redis,
|
||||
&session_queue,
|
||||
Scopes::PROJECT_WRITE,
|
||||
)
|
||||
.await?;
|
||||
|
||||
let project_id_str = path.into_inner().0;
|
||||
let project =
|
||||
database::models::DBProject::get(&project_id_str, &**pool, &redis)
|
||||
.await?
|
||||
.ok_or(ApiError::NotFound)?;
|
||||
|
||||
let db_project_id = project.inner.id;
|
||||
let db_user_id = database::models::DBUserId::from(user.id);
|
||||
|
||||
let released =
|
||||
DBModerationLock::release(db_project_id, db_user_id, &pool).await?;
|
||||
|
||||
let _ = DBModerationLock::cleanup_expired(&pool).await;
|
||||
|
||||
Ok(web::Json(LockReleaseResponse { success: released }))
|
||||
}
|
||||
|
||||
/// Delete all moderation locks (admin only)
|
||||
#[utoipa::path(
|
||||
responses(
|
||||
(status = OK, body = DeleteAllLocksResponse),
|
||||
(status = UNAUTHORIZED, description = "Not an admin")
|
||||
)
|
||||
)]
|
||||
#[delete("/locks")]
|
||||
async fn delete_all_locks(
|
||||
req: HttpRequest,
|
||||
pool: web::Data<PgPool>,
|
||||
redis: web::Data<RedisPool>,
|
||||
session_queue: web::Data<AuthQueue>,
|
||||
) -> Result<web::Json<DeleteAllLocksResponse>, ApiError> {
|
||||
let user = get_user_from_headers(
|
||||
&req,
|
||||
&**pool,
|
||||
&redis,
|
||||
&session_queue,
|
||||
Scopes::PROJECT_WRITE,
|
||||
)
|
||||
.await?
|
||||
.1;
|
||||
|
||||
if !user.role.is_admin() {
|
||||
return Err(ApiError::CustomAuthentication(
|
||||
"You must be an admin to delete all locks".to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
let deleted_count = DBModerationLock::delete_all(&pool).await?;
|
||||
|
||||
Ok(web::Json(DeleteAllLocksResponse { deleted_count }))
|
||||
}
|
||||
|
||||
@@ -6,7 +6,9 @@ use crate::auth::{filter_visible_projects, get_user_from_headers};
|
||||
use crate::database::models::notification_item::NotificationBuilder;
|
||||
use crate::database::models::project_item::{DBGalleryItem, DBModCategory};
|
||||
use crate::database::models::thread_item::ThreadMessageBuilder;
|
||||
use crate::database::models::{DBTeamMember, ids as db_ids, image_item};
|
||||
use crate::database::models::{
|
||||
DBModerationLock, DBTeamMember, ids as db_ids, image_item,
|
||||
};
|
||||
use crate::database::redis::RedisPool;
|
||||
use crate::database::{self, models as db_models};
|
||||
use crate::file_hosting::{FileHost, FileHostPublicity};
|
||||
@@ -368,6 +370,23 @@ pub async fn project_edit(
|
||||
));
|
||||
}
|
||||
|
||||
// If a moderator is completing a review (changing from Processing to another status),
|
||||
// check if another moderator holds an active lock on this project
|
||||
if user.role.is_mod()
|
||||
&& project_item.inner.status == ProjectStatus::Processing
|
||||
&& status != &ProjectStatus::Processing
|
||||
&& let Some(lock) =
|
||||
DBModerationLock::get_with_user(project_item.inner.id, &pool)
|
||||
.await?
|
||||
&& lock.moderator_id != db_ids::DBUserId::from(user.id)
|
||||
&& !lock.expired
|
||||
{
|
||||
return Err(ApiError::CustomAuthentication(format!(
|
||||
"This project is currently being moderated by @{}. Please wait for them to finish or for the lock to expire.",
|
||||
lock.moderator_username
|
||||
)));
|
||||
}
|
||||
|
||||
if status == &ProjectStatus::Processing {
|
||||
if project_item.versions.is_empty() {
|
||||
return Err(ApiError::InvalidInput(String::from(
|
||||
|
||||
Reference in New Issue
Block a user