diff --git a/apps/frontend/src/components/project-review/project-info/edit/details.vue b/apps/frontend/src/components/project-review/project-info/edit/details.vue index 90b96cb6ea7..aaab5c53a9e 100644 --- a/apps/frontend/src/components/project-review/project-info/edit/details.vue +++ b/apps/frontend/src/components/project-review/project-info/edit/details.vue @@ -84,8 +84,7 @@ const monetizationOptions = [ const patch = computed(() => { const result: Labrinth.Projects.v3.EditProjectRequest = {} if (visibility.value !== currentVisibility.value) { - if (hasPublishedStatus.value) result.status = visibility.value - else result.requested_status = visibility.value + result.visibility = visibility.value === 'approved' ? 'listed' : visibility.value } if ( !project.value?.minecraft_server && diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue index ae92101e3b0..b0874d0adf3 100644 --- a/apps/frontend/src/components/ui/thread/ConversationThread.vue +++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue @@ -872,6 +872,7 @@ const replyMutation = useMutation({ const assertCurrent = () => { if (props.thread.id !== threadId) throw new Error(formatMessage(messages.changedThread)) } + const reason = replyBody.value.trim() || undefined if (replyBody.value.trim()) { const reply = { threadId, @@ -910,7 +911,7 @@ const replyMutation = useMutation({ queryKey: ['project', projectId, 'validation'], }) assertCurrent() - if (status !== null) return (await props.setStatus(status)) !== false + if (status !== null) return (await props.setStatus(status, reason)) !== false return true }, onError: (error) => diff --git a/apps/frontend/src/composables/link-network-validation/submission.ts b/apps/frontend/src/composables/link-network-validation/submission.ts index 8b24dd42b4e..da478f53ebe 100644 --- a/apps/frontend/src/composables/link-network-validation/submission.ts +++ b/apps/frontend/src/composables/link-network-validation/submission.ts @@ -20,6 +20,6 @@ export async function submitProjectForReview( projectId: string, client: Pick, ): Promise { - await client.labrinth.projects_v3.edit(projectId, { status: 'processing' }) + await client.labrinth.projects_v3.setReviewState(projectId, { review_status: 'in_review' }) return await client.labrinth.projects_v3.get(projectId) } diff --git a/apps/frontend/src/pages/[type]/[project]/moderation.vue b/apps/frontend/src/pages/[type]/[project]/moderation.vue index 8d3c6749379..a8b71d3fa9c 100644 --- a/apps/frontend/src/pages/[type]/[project]/moderation.vue +++ b/apps/frontend/src/pages/[type]/[project]/moderation.vue @@ -171,6 +171,7 @@ import { } from '~/composables/link-network-validation/submission' import { getProjectLink, isApproved, isRejected, isUnderReview } from '~/helpers/projects.js' import { isThreadIssueVerified, verifyThreadIssuesForApproval } from '~/helpers/thread-issues' +import { toReviewStatus } from '~/providers/project-review/review-decision' defineEmits(['on-download', 'delete-version']) @@ -528,7 +529,7 @@ function updateThread(newThread: Labrinth.Threads.v3.Thread | null | undefined) ) } -async function setStatus(status: Labrinth.Projects.v2.ProjectStatus) { +async function setStatus(status: Labrinth.Projects.v2.ProjectStatus, reason?: string) { if (status === 'processing') { return await setProcessing() } @@ -541,7 +542,10 @@ async function setStatus(status: Labrinth.Projects.v2.ProjectStatus) { await verifyThreadIssuesForApproval(threadId, client, () => { if (project.value.id !== projectId) throw new Error(formatMessage(messages.projectChanged)) }) - await client.labrinth.projects_v3.edit(projectId, { status }) + await client.labrinth.projects_v3.setReviewState(projectId, { + review_status: toReviewStatus(status), + reason, + }) await invalidate() await queryClient.invalidateQueries({ queryKey: ['thread', threadId] }) return true diff --git a/apps/frontend/src/pages/[type]/[project]/settings/index.vue b/apps/frontend/src/pages/[type]/[project]/settings/index.vue index 61177fee9f4..e552fd3217e 100644 --- a/apps/frontend/src/pages/[type]/[project]/settings/index.vue +++ b/apps/frontend/src/pages/[type]/[project]/settings/index.vue @@ -522,12 +522,11 @@ const basePatchData = computed(() => { if (summary.value !== project.value.summary) { data.summary = summary.value.trim() } - if (tags.value.approvedStatuses.includes(project.value.status)) { - if (visibility.value !== project.value.status) { - data.status = visibility.value - } - } else if (visibility.value !== project.value.requested_status) { - data.requested_status = visibility.value + const currentVisibility = tags.value.approvedStatuses.includes(project.value.status) + ? project.value.status + : project.value.requested_status + if (visibility.value !== currentVisibility) { + data.visibility = visibility.value === 'approved' ? 'listed' : visibility.value } if (project.value.monetization_status !== 'force-demonetized') { diff --git a/apps/frontend/src/providers/project-review/review-decision.ts b/apps/frontend/src/providers/project-review/review-decision.ts index 194c7fc5753..8acc07c29fb 100644 --- a/apps/frontend/src/providers/project-review/review-decision.ts +++ b/apps/frontend/src/providers/project-review/review-decision.ts @@ -25,6 +25,25 @@ export class ReviewIssuesError extends Error { } } +export function toReviewStatus( + status: Labrinth.Projects.v2.ProjectStatus, +): Labrinth.Projects.v3.ReviewStatus { + switch (status) { + case 'processing': + return 'in_review' + case 'approved': + case 'unlisted': + case 'private': + return 'approved' + case 'draft': + case 'rejected': + case 'withheld': + return status + default: + throw new Error(`Cannot set review state from project status: ${status}`) + } +} + /** Applies a review's findings and optional status change. */ export async function applyReviewDecision( decision: ReviewDecision, @@ -33,6 +52,7 @@ export async function applyReviewDecision( onMessageSent: () => void, ): Promise { const threads = client.labrinth.threads_v3 + const reason = decision.body.trim() || undefined const approving = decision.status !== undefined && ['approved', 'unlisted', 'private'].includes(decision.status) async function updateFacets() { @@ -48,10 +68,12 @@ export async function applyReviewDecision( if (decision.techReviewVerdict) { await client.labrinth.tech_review_internal.submitProject(decision.projectId, { verdict: decision.techReviewVerdict, + reason, }) } else if (decision.status) { - await client.labrinth.projects_v3.edit(decision.projectId, { - status: decision.status, + await client.labrinth.projects_v3.setReviewState(decision.projectId, { + review_status: toReviewStatus(decision.status), + reason, }) } assertCurrent() diff --git a/apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json b/apps/labrinth/.sqlx/query-0bc56d356de0ffd5dfc01d0a56bd5db3ac6bfdcbedc4696659e89eab4d6d543d.json similarity index 61% rename from apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json rename to apps/labrinth/.sqlx/query-0bc56d356de0ffd5dfc01d0a56bd5db3ac6bfdcbedc4696659e89eab4d6d543d.json index ecaa7f95598..122002eebda 100644 --- a/apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json +++ b/apps/labrinth/.sqlx/query-0bc56d356de0ffd5dfc01d0a56bd5db3ac6bfdcbedc4696659e89eab4d6d543d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT COUNT(v.id)\n FROM versions v\n INNER JOIN mods m on v.mod_id = m.id AND m.status = ANY($1)\n WHERE v.status = ANY($2)\n ", + "query": "\n SELECT COUNT(v.id)\n FROM versions v\n INNER JOIN mods m on v.mod_id = m.id AND m.visibility = 'listed' AND m.review_status = 'approved'\n WHERE v.status = ANY($1)\n ", "describe": { "columns": [ { @@ -12,7 +12,6 @@ ], "parameters": { "Left": [ - "TextArray", "TextArray" ] }, @@ -20,5 +19,5 @@ null ] }, - "hash": "2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180" + "hash": "0bc56d356de0ffd5dfc01d0a56bd5db3ac6bfdcbedc4696659e89eab4d6d543d" } diff --git a/apps/labrinth/.sqlx/query-12c90d877e07f53abaf2bc2bd1ee43638def10b3102041c07ed5eb5a7445b65a.json b/apps/labrinth/.sqlx/query-12c90d877e07f53abaf2bc2bd1ee43638def10b3102041c07ed5eb5a7445b65a.json new file mode 100644 index 00000000000..e754445a912 --- /dev/null +++ b/apps/labrinth/.sqlx/query-12c90d877e07f53abaf2bc2bd1ee43638def10b3102041c07ed5eb5a7445b65a.json @@ -0,0 +1,236 @@ +{ + "db_name": "PostgreSQL", + "query": "\n WITH filtered_projects AS (\n SELECT\n m.id,\n m.queued,\n m.initial_queued,\n m.published\n FROM mods m\n WHERE\n m.review_status = $1\n AND (\n $6::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n total AS (\n SELECT COUNT(*) AS total_count FROM filtered_projects\n ),\n page_ids AS (\n SELECT\n id,\n queued,\n initial_queued,\n published\n FROM filtered_projects\n ORDER BY\n CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $5 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n OFFSET $4\n LIMIT $3\n ),\n page_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN page_ids page ON page.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n page_external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN page_ids page ON page.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n page_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.icon_url,\n CASE m.review_status\n WHEN 'approved' THEN CASE m.visibility\n WHEN 'listed' THEN 'approved'\n ELSE m.visibility\n END\n WHEN 'in_review' THEN 'processing'\n ELSE m.review_status\n END AS status,\n CASE m.visibility\n WHEN 'listed' THEN 'approved'\n ELSE m.visibility\n END AS requested_status,\n m.queued,\n m.initial_queued,\n m.published,\n m.updated,\n m.organization_id,\n o.name AS organization_name,\n o.icon_url AS organization_icon_url,\n owner.user_id AS owner_id,\n owner.username AS owner_name,\n owner.avatar_url AS owner_icon_url,\n CASE\n WHEN jsonb_typeof(m.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(ppt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count\n FROM page_ids page\n INNER JOIN mods m ON m.id = page.id\n LEFT JOIN organizations o ON o.id = m.organization_id\n LEFT JOIN LATERAL (\n SELECT\n tm.user_id,\n u.username,\n u.avatar_url\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = m.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) owner ON m.organization_id IS NULL\n LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id\n LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id\n )\n SELECT\n total.total_count AS \"total_count!\",\n page_projects.id AS \"id?\",\n page_projects.slug AS \"slug?\",\n page_projects.name AS \"name?\",\n page_projects.summary AS \"summary?\",\n page_projects.icon_url AS \"icon_url?\",\n page_projects.status AS \"status?\",\n page_projects.requested_status AS \"requested_status?\",\n page_projects.queued AS \"queued?\",\n page_projects.initial_queued AS \"initial_queued?\",\n page_projects.published AS \"published?\",\n page_projects.updated AS \"updated?\",\n page_projects.organization_id AS \"organization_id?\",\n page_projects.organization_name AS \"organization_name?\",\n page_projects.organization_icon_url AS \"organization_icon_url?\",\n page_projects.owner_id AS \"owner_id?\",\n page_projects.owner_name AS \"owner_name?\",\n page_projects.owner_icon_url AS \"owner_icon_url?\",\n page_projects.project_types AS \"project_types?: Vec\",\n page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n FROM total\n LEFT JOIN page_projects ON true\n ORDER BY\n CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n CASE WHEN $5 = 'oldest_initial' THEN COALESCE(page_projects.initial_queued, page_projects.published) END ASC NULLS LAST,\n CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n page_projects.id ASC\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "total_count!", + "type_info": "Int8", + "origin": "Expression" + }, + { + "ordinal": 1, + "name": "id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + }, + { + "ordinal": 2, + "name": "slug?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + }, + { + "ordinal": 3, + "name": "name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "name" + } + } + }, + { + "ordinal": 4, + "name": "summary?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "summary" + } + } + }, + { + "ordinal": 5, + "name": "icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "icon_url" + } + } + }, + { + "ordinal": 6, + "name": "status?", + "type_info": "Text", + "origin": "Expression" + }, + { + "ordinal": 7, + "name": "requested_status?", + "type_info": "Text", + "origin": "Expression" + }, + { + "ordinal": 8, + "name": "queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "queued" + } + } + }, + { + "ordinal": 9, + "name": "initial_queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "initial_queued" + } + } + }, + { + "ordinal": 10, + "name": "published?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "published" + } + } + }, + { + "ordinal": 11, + "name": "updated?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "updated" + } + } + }, + { + "ordinal": 12, + "name": "organization_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "organization_id" + } + } + }, + { + "ordinal": 13, + "name": "organization_name?", + "type_info": "Text", + "origin": { + "Table": { + "table": "organizations", + "name": "name" + } + } + }, + { + "ordinal": 14, + "name": "organization_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "organizations", + "name": "icon_url" + } + } + }, + { + "ordinal": 15, + "name": "owner_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "team_members", + "name": "user_id" + } + } + }, + { + "ordinal": 16, + "name": "owner_name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "username" + } + } + }, + { + "ordinal": 17, + "name": "owner_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "avatar_url" + } + } + }, + { + "ordinal": 18, + "name": "project_types?: Vec", + "type_info": "TextArray", + "origin": "Expression" + }, + { + "ordinal": 19, + "name": "external_dependencies_count?", + "type_info": "Int8", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Text", + "TextArray", + "Int8", + "Int8", + "Text", + "Bool" + ] + }, + "nullable": [ + null, + false, + true, + false, + false, + true, + null, + null, + true, + true, + false, + false, + true, + false, + true, + false, + false, + true, + null, + null + ] + }, + "hash": "12c90d877e07f53abaf2bc2bd1ee43638def10b3102041c07ed5eb5a7445b65a" +} diff --git a/apps/labrinth/.sqlx/query-2faa0c02b162d1311260bf29793a3f1a7cf60ee33f2725141fc97747ac574370.json b/apps/labrinth/.sqlx/query-2faa0c02b162d1311260bf29793a3f1a7cf60ee33f2725141fc97747ac574370.json deleted file mode 100644 index c4fe271bc76..00000000000 --- a/apps/labrinth/.sqlx/query-2faa0c02b162d1311260bf29793a3f1a7cf60ee33f2725141fc97747ac574370.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT id\n FROM mods\n WHERE\n status = $1\n AND (\n $3::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = mods.id\n )\n )\n ORDER BY\n CASE WHEN $2 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $2 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $2 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - } - ], - "parameters": { - "Left": [ - "Text", - "Text", - "Bool" - ] - }, - "nullable": [ - false - ] - }, - "hash": "2faa0c02b162d1311260bf29793a3f1a7cf60ee33f2725141fc97747ac574370" -} diff --git a/apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json b/apps/labrinth/.sqlx/query-338139da9904c43c463e88e2ea0fc2f009f08cb587aca89e6356a3c14692863f.json similarity index 66% rename from apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json rename to apps/labrinth/.sqlx/query-338139da9904c43c463e88e2ea0fc2f009f08cb587aca89e6356a3c14692863f.json index c57c1322a37..8e7dd9e5089 100644 --- a/apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json +++ b/apps/labrinth/.sqlx/query-338139da9904c43c463e88e2ea0fc2f009f08cb587aca89e6356a3c14692863f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "WITH random_id_point AS (\n SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point\n )\n SELECT id FROM mods\n WHERE status = ANY($1)\n ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)\n LIMIT $2", + "query": "WITH random_id_point AS (\n SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point\n )\n SELECT id FROM mods\n WHERE visibility = 'listed' AND review_status = 'approved'\n ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)\n LIMIT $1", "describe": { "columns": [ { @@ -17,7 +17,6 @@ ], "parameters": { "Left": [ - "TextArray", "Int8" ] }, @@ -25,5 +24,5 @@ false ] }, - "hash": "20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3" + "hash": "338139da9904c43c463e88e2ea0fc2f009f08cb587aca89e6356a3c14692863f" } diff --git a/apps/labrinth/.sqlx/query-3e8706c1e15f7cb3f58e4ea84ce588a5967ea7348cb38a20035475376fff5382.json b/apps/labrinth/.sqlx/query-3e8706c1e15f7cb3f58e4ea84ce588a5967ea7348cb38a20035475376fff5382.json deleted file mode 100644 index c8bbcb3be68..00000000000 --- a/apps/labrinth/.sqlx/query-3e8706c1e15f7cb3f58e4ea84ce588a5967ea7348cb38a20035475376fff5382.json +++ /dev/null @@ -1,249 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n WITH moderation_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.description,\n m.queued,\n m.initial_queued,\n m.published,\n m.organization_id,\n m.team_id,\n m.components\n FROM mods m\n WHERE\n m.status = $1\n AND (\n $9::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n version_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n queue_projects AS (\n SELECT\n mp.id,\n mp.slug,\n mp.name,\n mp.summary,\n mp.description,\n mp.queued,\n mp.initial_queued,\n mp.published,\n search_organization.name AS organization_name,\n search_owner.username AS owner_name,\n CASE\n WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n FROM moderation_projects mp\n LEFT JOIN organizations search_organization\n ON search_organization.id = mp.organization_id\n AND $3::text IS NOT NULL\n LEFT JOIN LATERAL (\n SELECT\n u.username\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = mp.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) search_owner ON $3::text IS NOT NULL\n AND mp.organization_id IS NULL\n LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n ),\n filtered_projects AS (\n SELECT\n id,\n queued,\n initial_queued,\n published,\n project_types,\n external_dependencies_count\n FROM queue_projects\n WHERE\n (\n $3::text IS NULL\n OR name ILIKE '%' || $3 || '%'\n OR slug ILIKE '%' || $3 || '%'\n OR summary ILIKE '%' || $3 || '%'\n OR description ILIKE '%' || $3 || '%'\n OR owner_name ILIKE '%' || $3 || '%'\n OR organization_name ILIKE '%' || $3 || '%'\n OR EXISTS (\n SELECT 1\n FROM UNNEST(project_types) AS searched_project_type(project_type)\n WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n )\n )\n AND (\n $4::text IS NULL\n OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND\n project_types[1] = $4\n )\n )\n AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n ),\n total AS (\n SELECT COUNT(*) AS total_count FROM filtered_projects\n ),\n page_ids AS (\n SELECT\n id,\n queued,\n initial_queued,\n published,\n project_types,\n external_dependencies_count\n FROM filtered_projects\n ORDER BY\n CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,\n CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,\n CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $8 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n OFFSET $7\n LIMIT $6\n ),\n page_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.icon_url,\n m.status,\n m.requested_status,\n m.queued,\n m.initial_queued,\n m.published,\n m.updated,\n m.organization_id,\n m.team_id,\n o.name AS organization_name,\n o.icon_url AS organization_icon_url,\n owner.user_id AS owner_id,\n owner.username AS owner_name,\n owner.avatar_url AS owner_icon_url,\n page_ids.project_types,\n page_ids.external_dependencies_count\n FROM page_ids\n INNER JOIN mods m ON m.id = page_ids.id\n LEFT JOIN organizations o ON o.id = m.organization_id\n LEFT JOIN LATERAL (\n SELECT\n tm.user_id,\n u.username,\n u.avatar_url\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = m.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) owner ON m.organization_id IS NULL\n )\n SELECT\n total.total_count AS \"total_count!\",\n page_projects.id AS \"id?\",\n page_projects.slug AS \"slug?\",\n page_projects.name AS \"name?\",\n page_projects.summary AS \"summary?\",\n page_projects.icon_url AS \"icon_url?\",\n page_projects.status AS \"status?\",\n page_projects.requested_status AS \"requested_status?\",\n page_projects.queued AS \"queued?\",\n page_projects.initial_queued AS \"initial_queued?\",\n page_projects.published AS \"published?\",\n page_projects.updated AS \"updated?\",\n page_projects.organization_id AS \"organization_id?\",\n page_projects.organization_name AS \"organization_name?\",\n page_projects.organization_icon_url AS \"organization_icon_url?\",\n page_projects.owner_id AS \"owner_id?\",\n page_projects.owner_name AS \"owner_name?\",\n page_projects.owner_icon_url AS \"owner_icon_url?\",\n page_projects.project_types AS \"project_types?: Vec\",\n page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n FROM total\n LEFT JOIN page_projects ON true\n ORDER BY\n CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,\n CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,\n CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n CASE WHEN $8 = 'oldest_initial' THEN COALESCE(page_projects.initial_queued, page_projects.published) END ASC NULLS LAST,\n CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n page_projects.id ASC\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "total_count!", - "type_info": "Int8", - "origin": "Expression" - }, - { - "ordinal": 1, - "name": "id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - }, - { - "ordinal": 2, - "name": "slug?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "slug" - } - } - }, - { - "ordinal": 3, - "name": "name?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "name" - } - } - }, - { - "ordinal": 4, - "name": "summary?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "summary" - } - } - }, - { - "ordinal": 5, - "name": "icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "icon_url" - } - } - }, - { - "ordinal": 6, - "name": "status?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "status" - } - } - }, - { - "ordinal": 7, - "name": "requested_status?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "requested_status" - } - } - }, - { - "ordinal": 8, - "name": "queued?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "queued" - } - } - }, - { - "ordinal": 9, - "name": "initial_queued?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "initial_queued" - } - } - }, - { - "ordinal": 10, - "name": "published?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "published" - } - } - }, - { - "ordinal": 11, - "name": "updated?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "updated" - } - } - }, - { - "ordinal": 12, - "name": "organization_id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "organization_id" - } - } - }, - { - "ordinal": 13, - "name": "organization_name?", - "type_info": "Text", - "origin": { - "Table": { - "table": "organizations", - "name": "name" - } - } - }, - { - "ordinal": 14, - "name": "organization_icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "organizations", - "name": "icon_url" - } - } - }, - { - "ordinal": 15, - "name": "owner_id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "team_members", - "name": "user_id" - } - } - }, - { - "ordinal": 16, - "name": "owner_name?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "users", - "name": "username" - } - } - }, - { - "ordinal": 17, - "name": "owner_icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "users", - "name": "avatar_url" - } - } - }, - { - "ordinal": 18, - "name": "project_types?: Vec", - "type_info": "TextArray", - "origin": "Expression" - }, - { - "ordinal": 19, - "name": "external_dependencies_count?", - "type_info": "Int8", - "origin": "Expression" - } - ], - "parameters": { - "Left": [ - "Text", - "TextArray", - "Text", - "Text", - "Bool", - "Int8", - "Int8", - "Text", - "Bool" - ] - }, - "nullable": [ - null, - false, - true, - false, - false, - true, - false, - true, - true, - true, - false, - false, - true, - false, - true, - false, - false, - true, - null, - null - ] - }, - "hash": "3e8706c1e15f7cb3f58e4ea84ce588a5967ea7348cb38a20035475376fff5382" -} diff --git a/apps/labrinth/.sqlx/query-4330c74866e09c898e472aaf109dab5f6c5b578c6ac02478d621031a4c323670.json b/apps/labrinth/.sqlx/query-4330c74866e09c898e472aaf109dab5f6c5b578c6ac02478d621031a4c323670.json deleted file mode 100644 index a441e629837..00000000000 --- a/apps/labrinth/.sqlx/query-4330c74866e09c898e472aaf109dab5f6c5b578c6ac02478d621031a4c323670.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n WITH moderation_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.description,\n m.queued,\n m.initial_queued,\n m.published,\n m.organization_id,\n m.team_id,\n m.components\n FROM mods m\n WHERE\n m.status = $1\n AND (\n $7::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n version_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n queue_projects AS (\n SELECT\n mp.id,\n mp.slug,\n mp.name,\n mp.summary,\n mp.description,\n mp.queued,\n mp.initial_queued,\n mp.published,\n search_organization.name AS organization_name,\n search_owner.username AS owner_name,\n CASE\n WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n FROM moderation_projects mp\n LEFT JOIN organizations search_organization\n ON search_organization.id = mp.organization_id\n AND $3::text IS NOT NULL\n LEFT JOIN LATERAL (\n SELECT\n u.username\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = mp.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) search_owner ON $3::text IS NOT NULL\n AND mp.organization_id IS NULL\n LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n )\n SELECT id\n FROM queue_projects\n WHERE\n (\n $3::text IS NULL\n OR name ILIKE '%' || $3 || '%'\n OR slug ILIKE '%' || $3 || '%'\n OR summary ILIKE '%' || $3 || '%'\n OR description ILIKE '%' || $3 || '%'\n OR owner_name ILIKE '%' || $3 || '%'\n OR organization_name ILIKE '%' || $3 || '%'\n OR EXISTS (\n SELECT 1\n FROM UNNEST(project_types) AS searched_project_type(project_type)\n WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n )\n )\n AND (\n $4::text IS NULL\n OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)\n )\n AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n ORDER BY\n CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,\n CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,\n CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $6 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - } - ], - "parameters": { - "Left": [ - "Text", - "TextArray", - "Text", - "Text", - "Bool", - "Text", - "Bool" - ] - }, - "nullable": [ - false - ] - }, - "hash": "4330c74866e09c898e472aaf109dab5f6c5b578c6ac02478d621031a4c323670" -} diff --git a/apps/labrinth/.sqlx/query-4479b3b712724a345d06c2a306dc5c71c9bb83a5df986c74cdce79f0c559f583.json b/apps/labrinth/.sqlx/query-4479b3b712724a345d06c2a306dc5c71c9bb83a5df986c74cdce79f0c559f583.json new file mode 100644 index 00000000000..4d99e317ec9 --- /dev/null +++ b/apps/labrinth/.sqlx/query-4479b3b712724a345d06c2a306dc5c71c9bb83a5df986c74cdce79f0c559f583.json @@ -0,0 +1,64 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT visibility AS \"visibility: ProjectVisibility\",\n review_status AS \"review_status: ProjectReviewStatus\", slug,\n webhook_sent\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility: ProjectVisibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 1, + "name": "review_status: ProjectReviewStatus", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_status" + } + } + }, + { + "ordinal": 2, + "name": "slug", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + }, + { + "ordinal": 3, + "name": "webhook_sent", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "webhook_sent" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + true, + false + ] + }, + "hash": "4479b3b712724a345d06c2a306dc5c71c9bb83a5df986c74cdce79f0c559f583" +} diff --git a/apps/labrinth/.sqlx/query-468da2e7bfe70932d61cecd3d2cad1fc6a915d0ec39885ed884ef838836d8014.json b/apps/labrinth/.sqlx/query-468da2e7bfe70932d61cecd3d2cad1fc6a915d0ec39885ed884ef838836d8014.json new file mode 100644 index 00000000000..dc3ef69ea65 --- /dev/null +++ b/apps/labrinth/.sqlx/query-468da2e7bfe70932d61cecd3d2cad1fc6a915d0ec39885ed884ef838836d8014.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO project_history (project_id, done_by, occurred_at, delta)\n VALUES ($1, $2, clock_timestamp(), $3)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Int8", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "468da2e7bfe70932d61cecd3d2cad1fc6a915d0ec39885ed884ef838836d8014" +} diff --git a/apps/labrinth/.sqlx/query-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json b/apps/labrinth/.sqlx/query-4799fd1931cd682776aa711a71cc44dc77e64a1a1f73e14bb90a81a9248df85e.json similarity index 68% rename from apps/labrinth/.sqlx/query-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json rename to apps/labrinth/.sqlx/query-4799fd1931cd682776aa711a71cc44dc77e64a1a1f73e14bb90a81a9248df85e.json index d4b08fd8622..c96c15dfbaf 100644 --- a/apps/labrinth/.sqlx/query-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json +++ b/apps/labrinth/.sqlx/query-4799fd1931cd682776aa711a71cc44dc77e64a1a1f73e14bb90a81a9248df85e.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT COUNT(f.id) FROM files f\n INNER JOIN versions v on f.version_id = v.id AND v.status = ANY($2)\n INNER JOIN mods m on v.mod_id = m.id AND m.status = ANY($1)\n ", + "query": "\n SELECT COUNT(f.id) FROM files f\n INNER JOIN versions v on f.version_id = v.id AND v.status = ANY($1)\n INNER JOIN mods m on v.mod_id = m.id AND m.visibility = 'listed' AND m.review_status = 'approved'\n ", "describe": { "columns": [ { @@ -12,7 +12,6 @@ ], "parameters": { "Left": [ - "TextArray", "TextArray" ] }, @@ -20,5 +19,5 @@ null ] }, - "hash": "a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c" + "hash": "4799fd1931cd682776aa711a71cc44dc77e64a1a1f73e14bb90a81a9248df85e" } diff --git a/apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json b/apps/labrinth/.sqlx/query-49df0a6efd1815f889da0573ace64712ab39f5b9f81d027c26ab823980980fcd.json similarity index 93% rename from apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json rename to apps/labrinth/.sqlx/query-49df0a6efd1815f889da0573ace64712ab39f5b9f81d027c26ab823980980fcd.json index efa955be110..b9aa962c682 100644 --- a/apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json +++ b/apps/labrinth/.sqlx/query-49df0a6efd1815f889da0573ace64712ab39f5b9f81d027c26ab823980980fcd.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color,\n m.components AS \"components: sqlx::types::Json\"\n FROM mods m\n WHERE m.status = ANY($1) AND m.id > $3\n GROUP BY m.id\n ORDER BY m.id ASC\n LIMIT $2;\n ", + "query": "\n SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color,\n m.components AS \"components: sqlx::types::Json\"\n FROM mods m\n WHERE m.visibility = 'listed' AND m.review_status = 'approved' AND m.id > $2\n GROUP BY m.id\n ORDER BY m.id ASC\n LIMIT $1;\n ", "describe": { "columns": [ { @@ -149,7 +149,6 @@ ], "parameters": { "Left": [ - "TextArray", "Int8", "Int8" ] @@ -170,5 +169,5 @@ false ] }, - "hash": "b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f" + "hash": "49df0a6efd1815f889da0573ace64712ab39f5b9f81d027c26ab823980980fcd" } diff --git a/apps/labrinth/.sqlx/query-4aa2b5f557263cc04745648d96cbc8e614044d9163b5f4596ddf022c5c880235.json b/apps/labrinth/.sqlx/query-4aa2b5f557263cc04745648d96cbc8e614044d9163b5f4596ddf022c5c880235.json new file mode 100644 index 00000000000..873da05986f --- /dev/null +++ b/apps/labrinth/.sqlx/query-4aa2b5f557263cc04745648d96cbc8e614044d9163b5f4596ddf022c5c880235.json @@ -0,0 +1,30 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT id\n FROM mods\n WHERE\n review_status = $1\n AND (\n $3::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = mods.id\n )\n )\n ORDER BY\n CASE WHEN $2 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $2 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $2 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + } + ], + "parameters": { + "Left": [ + "Text", + "Text", + "Bool" + ] + }, + "nullable": [ + false + ] + }, + "hash": "4aa2b5f557263cc04745648d96cbc8e614044d9163b5f4596ddf022c5c880235" +} diff --git a/apps/labrinth/.sqlx/query-4ce906f3bec42a2d4b9ed8b8481bd168aaa2f791305f30adbf3b002ba39da7fa.json b/apps/labrinth/.sqlx/query-4ce906f3bec42a2d4b9ed8b8481bd168aaa2f791305f30adbf3b002ba39da7fa.json deleted file mode 100644 index ec8e1a23bd4..00000000000 --- a/apps/labrinth/.sqlx/query-4ce906f3bec42a2d4b9ed8b8481bd168aaa2f791305f30adbf3b002ba39da7fa.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET status = requested_status\n WHERE status = $1 AND approved < CURRENT_DATE AND requested_status IS NOT NULL\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Text" - ] - }, - "nullable": [] - }, - "hash": "4ce906f3bec42a2d4b9ed8b8481bd168aaa2f791305f30adbf3b002ba39da7fa" -} diff --git a/apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json b/apps/labrinth/.sqlx/query-4fe10e91d1d67e6b99dc8955071700a69eeeddf4851a3f6c39e7ea261378cab5.json similarity index 61% rename from apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json rename to apps/labrinth/.sqlx/query-4fe10e91d1d67e6b99dc8955071700a69eeeddf4851a3f6c39e7ea261378cab5.json index a7a5551fe8a..cf7393bfb21 100644 --- a/apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json +++ b/apps/labrinth/.sqlx/query-4fe10e91d1d67e6b99dc8955071700a69eeeddf4851a3f6c39e7ea261378cab5.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n m.id AS \"id!\",\n m.status AS \"status!\",\n m.slug,\n t.id AS \"thread_id!\"\n FROM mods m\n INNER JOIN team_members tm\n ON tm.team_id = m.team_id\n AND tm.user_id = $1\n AND tm.is_owner = TRUE\n INNER JOIN threads t ON t.mod_id = m.id\n ", + "query": "\n SELECT\n m.id AS \"id!\",\n m.review_status AS \"review_status!: ProjectReviewStatus\",\n m.slug,\n t.id AS \"thread_id!\"\n FROM mods m\n INNER JOIN team_members tm\n ON tm.team_id = m.team_id\n AND tm.user_id = $1\n AND tm.is_owner = TRUE\n INNER JOIN threads t ON t.mod_id = m.id\n ", "describe": { "columns": [ { @@ -16,12 +16,12 @@ }, { "ordinal": 1, - "name": "status!", - "type_info": "Varchar", + "name": "review_status!: ProjectReviewStatus", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "status" + "name": "review_status" } } }, @@ -60,5 +60,5 @@ false ] }, - "hash": "7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16" + "hash": "4fe10e91d1d67e6b99dc8955071700a69eeeddf4851a3f6c39e7ea261378cab5" } diff --git a/apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json b/apps/labrinth/.sqlx/query-55746f39a9c5c3fa9bf4070c37d978cf5be8e99ebe7da404e7de5b72ce37754b.json similarity index 75% rename from apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json rename to apps/labrinth/.sqlx/query-55746f39a9c5c3fa9bf4070c37d978cf5be8e99ebe7da404e7de5b72ce37754b.json index 5ede4307657..7ed2418709d 100644 --- a/apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json +++ b/apps/labrinth/.sqlx/query-55746f39a9c5c3fa9bf4070c37d978cf5be8e99ebe7da404e7de5b72ce37754b.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, components AS \"components: Json\"\n FROM mods\n WHERE\n status = ANY($1)\n AND components ? 'minecraft_java_server'\n ", + "query": "\n SELECT id, components AS \"components: Json\"\n FROM mods\n WHERE\n review_status = 'approved'\n AND components ? 'minecraft_java_server'\n ", "describe": { "columns": [ { @@ -27,14 +27,12 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ false, false ] }, - "hash": "f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b" + "hash": "55746f39a9c5c3fa9bf4070c37d978cf5be8e99ebe7da404e7de5b72ce37754b" } diff --git a/apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json b/apps/labrinth/.sqlx/query-64a3414ce90523c6a7622fee0e830f9ea7307dff2004d428655698dc660cb35b.json similarity index 52% rename from apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json rename to apps/labrinth/.sqlx/query-64a3414ce90523c6a7622fee0e830f9ea7307dff2004d428655698dc660cb35b.json index 2731d395fff..552835dc1dd 100644 --- a/apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json +++ b/apps/labrinth/.sqlx/query-64a3414ce90523c6a7622fee0e830f9ea7307dff2004d428655698dc660cb35b.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE mods SET status = 'processing' WHERE id = $1", + "query": "UPDATE mods SET webhook_sent = TRUE WHERE id = $1", "describe": { "columns": [], "parameters": { @@ -10,5 +10,5 @@ }, "nullable": [] }, - "hash": "329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d" + "hash": "64a3414ce90523c6a7622fee0e830f9ea7307dff2004d428655698dc660cb35b" } diff --git a/apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json b/apps/labrinth/.sqlx/query-67ce82ce039d61c55e4b6fc5bf9ab97b821ece5666ab0e41f9555ae4f27c555b.json similarity index 79% rename from apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json rename to apps/labrinth/.sqlx/query-67ce82ce039d61c55e4b6fc5bf9ab97b821ece5666ab0e41f9555ae4f27c555b.json index 2a4920501b8..f035feffc18 100644 --- a/apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json +++ b/apps/labrinth/.sqlx/query-67ce82ce039d61c55e4b6fc5bf9ab97b821ece5666ab0e41f9555ae4f27c555b.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published,\n m.approved approved, m.queued, m.status status, m.requested_status requested_status,\n m.license_url license_url,\n m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body,\n m.webhook_sent, m.color,\n t.id thread_id, m.monetization_status monetization_status,\n m.side_types_migration_review_status side_types_migration_review_status,\n ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is false) categories,\n ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is true) additional_categories,\n m.components AS \"components: sqlx::types::Json\"\n\n FROM mods m\n INNER JOIN threads t ON t.mod_id = m.id\n LEFT JOIN mods_categories mc ON mc.joining_mod_id = m.id\n LEFT JOIN categories c ON mc.joining_category_id = c.id\n\n WHERE m.id = ANY($1) OR m.slug = ANY($2)\n GROUP BY t.id, m.id\n ", + "query": "\n SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published,\n m.approved approved, m.queued,\n m.visibility AS \"visibility: ProjectVisibility\",\n m.review_status AS \"review_status: ProjectReviewStatus\",\n m.license_url license_url,\n m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body,\n m.webhook_sent, m.color,\n t.id thread_id, m.monetization_status monetization_status,\n m.side_types_migration_review_status side_types_migration_review_status,\n ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is false) categories,\n ARRAY_AGG(DISTINCT c.category) filter (where c.category is not null and mc.is_additional is true) additional_categories,\n m.components AS \"components: sqlx::types::Json\"\n\n FROM mods m\n INNER JOIN threads t ON t.mod_id = m.id\n LEFT JOIN mods_categories mc ON mc.joining_mod_id = m.id\n LEFT JOIN categories c ON mc.joining_category_id = c.id\n\n WHERE m.id = ANY($1) OR m.slug = ANY($2)\n GROUP BY t.id, m.id\n ", "describe": { "columns": [ { @@ -126,23 +126,23 @@ }, { "ordinal": 11, - "name": "status", - "type_info": "Varchar", + "name": "visibility: ProjectVisibility", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "status" + "name": "visibility" } } }, { "ordinal": 12, - "name": "requested_status", - "type_info": "Varchar", + "name": "review_status: ProjectReviewStatus", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "requested_status" + "name": "review_status" } } }, @@ -321,7 +321,7 @@ true, true, false, - true, + false, true, false, true, @@ -339,5 +339,5 @@ false ] }, - "hash": "59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377" + "hash": "67ce82ce039d61c55e4b6fc5bf9ab97b821ece5666ab0e41f9555ae4f27c555b" } diff --git a/apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json b/apps/labrinth/.sqlx/query-6e347d6ac508e669dd78dfed62d3ebf646355f1785dbe507ed386da9149de6e4.json similarity index 95% rename from apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json rename to apps/labrinth/.sqlx/query-6e347d6ac508e669dd78dfed62d3ebf646355f1785dbe507ed386da9149de6e4.json index b4812d2f90d..996e8cf4c7f 100644 --- a/apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json +++ b/apps/labrinth/.sqlx/query-6e347d6ac508e669dd78dfed62d3ebf646355f1785dbe507ed386da9149de6e4.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT\n\t\t\teffect.detail_id AS \"detail_id!: DelphiReportIssueDetailsId\",\n\t\t\tdetail.issue_id AS \"issue_id!: DelphiReportIssueId\",\n\t\t\tversion.mod_id AS \"project_id?: DBProjectId\",\n\t\t\tproject.name AS \"project_name?\",\n\t\t\tproject.icon_url AS \"project_icon_url?\",\n\t\t\tversion.id AS \"version_id?: DBVersionId\",\n\t\t\tversion.name AS \"version_name?\",\n\t\t\tversion.version_number AS \"version_number?\",\n\t\t\tissue.issue_type,\n\t\t\tdetail.key,\n\t\t\tdetail.jar,\n\t\t\tdetail.file_path,\n\t\t\tdetail.severity AS \"original_severity!: DelphiSeverity\",\n\t\t\teffect.severity AS \"effect_severity!: DelphiSeverity\"\n\t\tFROM delphi_rule_effects effect\n\t\tINNER JOIN delphi_rule_revisions published\n\t\t\tON published.revision = effect.revision\n\t\tINNER JOIN delphi_report_issue_details detail\n\t\t\tON detail.id = effect.detail_id\n\t\tINNER JOIN delphi_report_issues issue ON issue.id = detail.issue_id\n\t\tINNER JOIN delphi_reports report ON report.id = issue.report_id\n\t\tLEFT JOIN files file ON file.id = report.file_id\n\t\tLEFT JOIN versions version ON version.id = file.version_id\n\t\tLEFT JOIN mods project ON project.id = version.mod_id\n\t\tWHERE\n\t\t\teffect.rule_id = $1\n\t\t\tAND (NOT $2 OR project.status = 'processing')\n\t\tORDER BY effect.detail_id DESC\n\t\tLIMIT $3 OFFSET $4\n\t\t", + "query": "\n\t\tSELECT\n\t\t\teffect.detail_id AS \"detail_id!: DelphiReportIssueDetailsId\",\n\t\t\tdetail.issue_id AS \"issue_id!: DelphiReportIssueId\",\n\t\t\tversion.mod_id AS \"project_id?: DBProjectId\",\n\t\t\tproject.name AS \"project_name?\",\n\t\t\tproject.icon_url AS \"project_icon_url?\",\n\t\t\tversion.id AS \"version_id?: DBVersionId\",\n\t\t\tversion.name AS \"version_name?\",\n\t\t\tversion.version_number AS \"version_number?\",\n\t\t\tissue.issue_type,\n\t\t\tdetail.key,\n\t\t\tdetail.jar,\n\t\t\tdetail.file_path,\n\t\t\tdetail.severity AS \"original_severity!: DelphiSeverity\",\n\t\t\teffect.severity AS \"effect_severity!: DelphiSeverity\"\n\t\tFROM delphi_rule_effects effect\n\t\tINNER JOIN delphi_rule_revisions published\n\t\t\tON published.revision = effect.revision\n\t\tINNER JOIN delphi_report_issue_details detail\n\t\t\tON detail.id = effect.detail_id\n\t\tINNER JOIN delphi_report_issues issue ON issue.id = detail.issue_id\n\t\tINNER JOIN delphi_reports report ON report.id = issue.report_id\n\t\tLEFT JOIN files file ON file.id = report.file_id\n\t\tLEFT JOIN versions version ON version.id = file.version_id\n\t\tLEFT JOIN mods project ON project.id = version.mod_id\n\t\tWHERE\n\t\t\teffect.rule_id = $1\n\t\t\tAND (NOT $2 OR project.review_status = 'in_review')\n\t\tORDER BY effect.detail_id DESC\n\t\tLIMIT $3 OFFSET $4\n\t\t", "describe": { "columns": [ { @@ -211,5 +211,5 @@ false ] }, - "hash": "abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0" + "hash": "6e347d6ac508e669dd78dfed62d3ebf646355f1785dbe507ed386da9149de6e4" } diff --git a/apps/labrinth/.sqlx/query-6f1e8275bdfab4c6f9dad5b56ecb02b015555d7eebf3c404e9f075bcc960e54c.json b/apps/labrinth/.sqlx/query-6f1e8275bdfab4c6f9dad5b56ecb02b015555d7eebf3c404e9f075bcc960e54c.json new file mode 100644 index 00000000000..315a1085cbb --- /dev/null +++ b/apps/labrinth/.sqlx/query-6f1e8275bdfab4c6f9dad5b56ecb02b015555d7eebf3c404e9f075bcc960e54c.json @@ -0,0 +1,29 @@ +{ + "db_name": "PostgreSQL", + "query": "WITH random_id_point AS (\n SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point\n )\n SELECT id FROM mods\n WHERE visibility = 'listed' AND review_status = 'approved'\n AND EXISTS (\n SELECT 1 FROM versions v\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = lv.loader_id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.mod_id = mods.id AND pt.name = $2\n -- prevents decorrelation, so this stops at the first match instead\n -- of scanning all versions before the outer sort/limit applies\n OFFSET 0\n )\n ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)\n LIMIT $1", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + } + ], + "parameters": { + "Left": [ + "Int8", + "Text" + ] + }, + "nullable": [ + false + ] + }, + "hash": "6f1e8275bdfab4c6f9dad5b56ecb02b015555d7eebf3c404e9f075bcc960e54c" +} diff --git a/apps/labrinth/.sqlx/query-6f5b0c2681ac4a622533f037e80ed0bd06f7bc12907c16ef91bf2c095917fab8.json b/apps/labrinth/.sqlx/query-6f5b0c2681ac4a622533f037e80ed0bd06f7bc12907c16ef91bf2c095917fab8.json deleted file mode 100644 index 9e7f52815a0..00000000000 --- a/apps/labrinth/.sqlx/query-6f5b0c2681ac4a622533f037e80ed0bd06f7bc12907c16ef91bf2c095917fab8.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n\t\t\tUPDATE mods\n\t\t\tSET status = $1,\n\t\t\t approved_because = CASE\n\t\t\t WHEN approved IS NULL THEN $3::jsonb\n\t\t\t ELSE approved_because\n\t\t\t END,\n\t\t\t approved = COALESCE(approved, NOW())\n\t\t\tWHERE id = $2\n\t\t\t", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Int8", - "Jsonb" - ] - }, - "nullable": [] - }, - "hash": "6f5b0c2681ac4a622533f037e80ed0bd06f7bc12907c16ef91bf2c095917fab8" -} diff --git a/apps/labrinth/.sqlx/query-761d8c5fbc38122fc33efa8eaadc503c6f2e37c2420eafb457bc8ec94cebb95d.json b/apps/labrinth/.sqlx/query-761d8c5fbc38122fc33efa8eaadc503c6f2e37c2420eafb457bc8ec94cebb95d.json new file mode 100644 index 00000000000..7162b7b1e00 --- /dev/null +++ b/apps/labrinth/.sqlx/query-761d8c5fbc38122fc33efa8eaadc503c6f2e37c2420eafb457bc8ec94cebb95d.json @@ -0,0 +1,239 @@ +{ + "db_name": "PostgreSQL", + "query": "\n WITH moderation_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.description,\n m.queued,\n m.initial_queued,\n m.published,\n m.organization_id,\n m.team_id,\n m.components\n FROM mods m\n WHERE\n m.review_status = $1\n AND (\n $9::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n version_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n queue_projects AS (\n SELECT\n mp.id,\n mp.slug,\n mp.name,\n mp.summary,\n mp.description,\n mp.queued,\n mp.initial_queued,\n mp.published,\n search_organization.name AS organization_name,\n search_owner.username AS owner_name,\n CASE\n WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n FROM moderation_projects mp\n LEFT JOIN organizations search_organization\n ON search_organization.id = mp.organization_id\n AND $3::text IS NOT NULL\n LEFT JOIN LATERAL (\n SELECT\n u.username\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = mp.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) search_owner ON $3::text IS NOT NULL\n AND mp.organization_id IS NULL\n LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n ),\n filtered_projects AS (\n SELECT\n id,\n queued,\n initial_queued,\n published,\n project_types,\n external_dependencies_count\n FROM queue_projects\n WHERE\n (\n $3::text IS NULL\n OR name ILIKE '%' || $3 || '%'\n OR slug ILIKE '%' || $3 || '%'\n OR summary ILIKE '%' || $3 || '%'\n OR description ILIKE '%' || $3 || '%'\n OR owner_name ILIKE '%' || $3 || '%'\n OR organization_name ILIKE '%' || $3 || '%'\n OR EXISTS (\n SELECT 1\n FROM UNNEST(project_types) AS searched_project_type(project_type)\n WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n )\n )\n AND (\n $4::text IS NULL\n OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND\n project_types[1] = $4\n )\n )\n AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n ),\n total AS (\n SELECT COUNT(*) AS total_count FROM filtered_projects\n ),\n page_ids AS (\n SELECT\n id,\n queued,\n initial_queued,\n published,\n project_types,\n external_dependencies_count\n FROM filtered_projects\n ORDER BY\n CASE WHEN $8 = 'most_external_deps' THEN external_dependencies_count END DESC,\n CASE WHEN $8 = 'least_external_deps' THEN external_dependencies_count END ASC,\n CASE WHEN $8 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $8 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n OFFSET $7\n LIMIT $6\n ),\n page_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.icon_url,\n CASE m.review_status\n WHEN 'approved' THEN CASE m.visibility\n WHEN 'listed' THEN 'approved'\n ELSE m.visibility\n END\n WHEN 'in_review' THEN 'processing'\n ELSE m.review_status\n END AS status,\n CASE m.visibility\n WHEN 'listed' THEN 'approved'\n ELSE m.visibility\n END AS requested_status,\n m.queued,\n m.initial_queued,\n m.published,\n m.updated,\n m.organization_id,\n m.team_id,\n o.name AS organization_name,\n o.icon_url AS organization_icon_url,\n owner.user_id AS owner_id,\n owner.username AS owner_name,\n owner.avatar_url AS owner_icon_url,\n page_ids.project_types,\n page_ids.external_dependencies_count\n FROM page_ids\n INNER JOIN mods m ON m.id = page_ids.id\n LEFT JOIN organizations o ON o.id = m.organization_id\n LEFT JOIN LATERAL (\n SELECT\n tm.user_id,\n u.username,\n u.avatar_url\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = m.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) owner ON m.organization_id IS NULL\n )\n SELECT\n total.total_count AS \"total_count!\",\n page_projects.id AS \"id?\",\n page_projects.slug AS \"slug?\",\n page_projects.name AS \"name?\",\n page_projects.summary AS \"summary?\",\n page_projects.icon_url AS \"icon_url?\",\n page_projects.status AS \"status?\",\n page_projects.requested_status AS \"requested_status?\",\n page_projects.queued AS \"queued?\",\n page_projects.initial_queued AS \"initial_queued?\",\n page_projects.published AS \"published?\",\n page_projects.updated AS \"updated?\",\n page_projects.organization_id AS \"organization_id?\",\n page_projects.organization_name AS \"organization_name?\",\n page_projects.organization_icon_url AS \"organization_icon_url?\",\n page_projects.owner_id AS \"owner_id?\",\n page_projects.owner_name AS \"owner_name?\",\n page_projects.owner_icon_url AS \"owner_icon_url?\",\n page_projects.project_types AS \"project_types?: Vec\",\n page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n FROM total\n LEFT JOIN page_projects ON true\n ORDER BY\n CASE WHEN $8 = 'most_external_deps' THEN page_projects.external_dependencies_count END DESC,\n CASE WHEN $8 = 'least_external_deps' THEN page_projects.external_dependencies_count END ASC,\n CASE WHEN $8 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n CASE WHEN $8 = 'oldest_initial' THEN COALESCE(page_projects.initial_queued, page_projects.published) END ASC NULLS LAST,\n CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n page_projects.id ASC\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "total_count!", + "type_info": "Int8", + "origin": "Expression" + }, + { + "ordinal": 1, + "name": "id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + }, + { + "ordinal": 2, + "name": "slug?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + }, + { + "ordinal": 3, + "name": "name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "name" + } + } + }, + { + "ordinal": 4, + "name": "summary?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "summary" + } + } + }, + { + "ordinal": 5, + "name": "icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "icon_url" + } + } + }, + { + "ordinal": 6, + "name": "status?", + "type_info": "Text", + "origin": "Expression" + }, + { + "ordinal": 7, + "name": "requested_status?", + "type_info": "Text", + "origin": "Expression" + }, + { + "ordinal": 8, + "name": "queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "queued" + } + } + }, + { + "ordinal": 9, + "name": "initial_queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "initial_queued" + } + } + }, + { + "ordinal": 10, + "name": "published?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "published" + } + } + }, + { + "ordinal": 11, + "name": "updated?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "updated" + } + } + }, + { + "ordinal": 12, + "name": "organization_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "organization_id" + } + } + }, + { + "ordinal": 13, + "name": "organization_name?", + "type_info": "Text", + "origin": { + "Table": { + "table": "organizations", + "name": "name" + } + } + }, + { + "ordinal": 14, + "name": "organization_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "organizations", + "name": "icon_url" + } + } + }, + { + "ordinal": 15, + "name": "owner_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "team_members", + "name": "user_id" + } + } + }, + { + "ordinal": 16, + "name": "owner_name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "username" + } + } + }, + { + "ordinal": 17, + "name": "owner_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "avatar_url" + } + } + }, + { + "ordinal": 18, + "name": "project_types?: Vec", + "type_info": "TextArray", + "origin": "Expression" + }, + { + "ordinal": 19, + "name": "external_dependencies_count?", + "type_info": "Int8", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Text", + "TextArray", + "Text", + "Text", + "Bool", + "Int8", + "Int8", + "Text", + "Bool" + ] + }, + "nullable": [ + null, + false, + true, + false, + false, + true, + null, + null, + true, + true, + false, + false, + true, + false, + true, + false, + false, + true, + null, + null + ] + }, + "hash": "761d8c5fbc38122fc33efa8eaadc503c6f2e37c2420eafb457bc8ec94cebb95d" +} diff --git a/apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json b/apps/labrinth/.sqlx/query-77fa824103a98c19bd7f740b6dec7750d817c3933ce2290bf6327f36215ee389.json similarity index 92% rename from apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json rename to apps/labrinth/.sqlx/query-77fa824103a98c19bd7f740b6dec7750d817c3933ce2290bf6327f36215ee389.json index 4e485466f3b..427ba051aba 100644 --- a/apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json +++ b/apps/labrinth/.sqlx/query-77fa824103a98c19bd7f740b6dec7750d817c3933ce2290bf6327f36215ee389.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT DISTINCT v.mod_id dependent_project_id,\n d.mod_dependency_id dependency_project_id,\n d.dependency_type dependency_type,\n m.name dependency_name,\n m.slug dependency_slug,\n m.icon_url dependency_icon_url\n FROM versions v\n INNER JOIN dependencies d ON d.dependent_id = v.id\n INNER JOIN mods m ON m.id = d.mod_dependency_id\n WHERE v.mod_id = ANY($1)\n AND d.mod_dependency_id IS NOT NULL\n AND m.status = ANY($2)\n ", + "query": "\n SELECT DISTINCT v.mod_id dependent_project_id,\n d.mod_dependency_id dependency_project_id,\n d.dependency_type dependency_type,\n m.name dependency_name,\n m.slug dependency_slug,\n m.icon_url dependency_icon_url\n FROM versions v\n INNER JOIN dependencies d ON d.dependent_id = v.id\n INNER JOIN mods m ON m.id = d.mod_dependency_id\n WHERE v.mod_id = ANY($1)\n AND d.mod_dependency_id IS NOT NULL\n AND m.visibility = 'listed' AND m.review_status = 'approved'\n ", "describe": { "columns": [ { @@ -72,8 +72,7 @@ ], "parameters": { "Left": [ - "Int8Array", - "TextArray" + "Int8Array" ] }, "nullable": [ @@ -85,5 +84,5 @@ true ] }, - "hash": "3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43" + "hash": "77fa824103a98c19bd7f740b6dec7750d817c3933ce2290bf6327f36215ee389" } diff --git a/apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json b/apps/labrinth/.sqlx/query-79562cfc2df0ddca330a812eb741864cd6f6410a8d21714fffa256c5db534bf8.json similarity index 54% rename from apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json rename to apps/labrinth/.sqlx/query-79562cfc2df0ddca330a812eb741864cd6f6410a8d21714fffa256c5db534bf8.json index 01b1d755f6c..beb3a7b9965 100644 --- a/apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json +++ b/apps/labrinth/.sqlx/query-79562cfc2df0ddca330a812eb741864cd6f6410a8d21714fffa256c5db534bf8.json @@ -1,27 +1,27 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT status, slug\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "query": "SELECT review_status, visibility FROM mods WHERE id = $1", "describe": { "columns": [ { "ordinal": 0, - "name": "status", - "type_info": "Varchar", + "name": "review_status", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "status" + "name": "review_status" } } }, { "ordinal": 1, - "name": "slug", - "type_info": "Varchar", + "name": "visibility", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "slug" + "name": "visibility" } } } @@ -33,8 +33,8 @@ }, "nullable": [ false, - true + false ] }, - "hash": "04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0" + "hash": "79562cfc2df0ddca330a812eb741864cd6f6410a8d21714fffa256c5db534bf8" } diff --git a/apps/labrinth/.sqlx/query-7ca2a5aad238fc990244cff1333cc1fbd1f4a8b6f06d5681ee25ca4ff59e766c.json b/apps/labrinth/.sqlx/query-7ca2a5aad238fc990244cff1333cc1fbd1f4a8b6f06d5681ee25ca4ff59e766c.json deleted file mode 100644 index e6a7e812128..00000000000 --- a/apps/labrinth/.sqlx/query-7ca2a5aad238fc990244cff1333cc1fbd1f4a8b6f06d5681ee25ca4ff59e766c.json +++ /dev/null @@ -1,246 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n WITH filtered_projects AS (\n SELECT\n m.id,\n m.queued,\n m.initial_queued,\n m.published\n FROM mods m\n WHERE\n m.status = $1\n AND (\n $6::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n total AS (\n SELECT COUNT(*) AS total_count FROM filtered_projects\n ),\n page_ids AS (\n SELECT\n id,\n queued,\n initial_queued,\n published\n FROM filtered_projects\n ORDER BY\n CASE WHEN $5 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $5 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $5 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n OFFSET $4\n LIMIT $3\n ),\n page_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN page_ids page ON page.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n page_external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN page_ids page ON page.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n page_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.icon_url,\n m.status,\n m.requested_status,\n m.queued,\n m.initial_queued,\n m.published,\n m.updated,\n m.organization_id,\n o.name AS organization_name,\n o.icon_url AS organization_icon_url,\n owner.user_id AS owner_id,\n owner.username AS owner_name,\n owner.avatar_url AS owner_icon_url,\n CASE\n WHEN jsonb_typeof(m.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(ppt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(ppt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ped.external_dependencies_count, 0) AS external_dependencies_count\n FROM page_ids page\n INNER JOIN mods m ON m.id = page.id\n LEFT JOIN organizations o ON o.id = m.organization_id\n LEFT JOIN LATERAL (\n SELECT\n tm.user_id,\n u.username,\n u.avatar_url\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = m.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) owner ON m.organization_id IS NULL\n LEFT JOIN page_project_types ppt ON ppt.mod_id = m.id\n LEFT JOIN page_external_dependencies ped ON ped.mod_id = m.id\n )\n SELECT\n total.total_count AS \"total_count!\",\n page_projects.id AS \"id?\",\n page_projects.slug AS \"slug?\",\n page_projects.name AS \"name?\",\n page_projects.summary AS \"summary?\",\n page_projects.icon_url AS \"icon_url?\",\n page_projects.status AS \"status?\",\n page_projects.requested_status AS \"requested_status?\",\n page_projects.queued AS \"queued?\",\n page_projects.initial_queued AS \"initial_queued?\",\n page_projects.published AS \"published?\",\n page_projects.updated AS \"updated?\",\n page_projects.organization_id AS \"organization_id?\",\n page_projects.organization_name AS \"organization_name?\",\n page_projects.organization_icon_url AS \"organization_icon_url?\",\n page_projects.owner_id AS \"owner_id?\",\n page_projects.owner_name AS \"owner_name?\",\n page_projects.owner_icon_url AS \"owner_icon_url?\",\n page_projects.project_types AS \"project_types?: Vec\",\n page_projects.external_dependencies_count AS \"external_dependencies_count?\"\n FROM total\n LEFT JOIN page_projects ON true\n ORDER BY\n CASE WHEN $5 = 'newest' THEN COALESCE(page_projects.queued, page_projects.published) END DESC NULLS LAST,\n CASE WHEN $5 = 'oldest_initial' THEN COALESCE(page_projects.initial_queued, page_projects.published) END ASC NULLS LAST,\n CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST,\n page_projects.id ASC\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "total_count!", - "type_info": "Int8", - "origin": "Expression" - }, - { - "ordinal": 1, - "name": "id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - }, - { - "ordinal": 2, - "name": "slug?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "slug" - } - } - }, - { - "ordinal": 3, - "name": "name?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "name" - } - } - }, - { - "ordinal": 4, - "name": "summary?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "summary" - } - } - }, - { - "ordinal": 5, - "name": "icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "icon_url" - } - } - }, - { - "ordinal": 6, - "name": "status?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "status" - } - } - }, - { - "ordinal": 7, - "name": "requested_status?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "requested_status" - } - } - }, - { - "ordinal": 8, - "name": "queued?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "queued" - } - } - }, - { - "ordinal": 9, - "name": "initial_queued?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "initial_queued" - } - } - }, - { - "ordinal": 10, - "name": "published?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "published" - } - } - }, - { - "ordinal": 11, - "name": "updated?", - "type_info": "Timestamptz", - "origin": { - "Table": { - "table": "mods", - "name": "updated" - } - } - }, - { - "ordinal": 12, - "name": "organization_id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "organization_id" - } - } - }, - { - "ordinal": 13, - "name": "organization_name?", - "type_info": "Text", - "origin": { - "Table": { - "table": "organizations", - "name": "name" - } - } - }, - { - "ordinal": 14, - "name": "organization_icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "organizations", - "name": "icon_url" - } - } - }, - { - "ordinal": 15, - "name": "owner_id?", - "type_info": "Int8", - "origin": { - "Table": { - "table": "team_members", - "name": "user_id" - } - } - }, - { - "ordinal": 16, - "name": "owner_name?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "users", - "name": "username" - } - } - }, - { - "ordinal": 17, - "name": "owner_icon_url?", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "users", - "name": "avatar_url" - } - } - }, - { - "ordinal": 18, - "name": "project_types?: Vec", - "type_info": "TextArray", - "origin": "Expression" - }, - { - "ordinal": 19, - "name": "external_dependencies_count?", - "type_info": "Int8", - "origin": "Expression" - } - ], - "parameters": { - "Left": [ - "Text", - "TextArray", - "Int8", - "Int8", - "Text", - "Bool" - ] - }, - "nullable": [ - null, - false, - true, - false, - false, - true, - false, - true, - true, - true, - false, - false, - true, - false, - true, - false, - false, - true, - null, - null - ] - }, - "hash": "7ca2a5aad238fc990244cff1333cc1fbd1f4a8b6f06d5681ee25ca4ff59e766c" -} diff --git a/apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json b/apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json deleted file mode 100644 index 73142111d33..00000000000 --- a/apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET status = $1\n WHERE id = $2\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Int8" - ] - }, - "nullable": [] - }, - "hash": "82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2" -} diff --git a/apps/labrinth/.sqlx/query-83a7c3bfbd84117c7e77d23038836e18010f4948dbd67892a724710bc9451d99.json b/apps/labrinth/.sqlx/query-83a7c3bfbd84117c7e77d23038836e18010f4948dbd67892a724710bc9451d99.json new file mode 100644 index 00000000000..d983ee57900 --- /dev/null +++ b/apps/labrinth/.sqlx/query-83a7c3bfbd84117c7e77d23038836e18010f4948dbd67892a724710bc9451d99.json @@ -0,0 +1,40 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT done_by, delta FROM project_history WHERE project_id = $1 ORDER BY occurred_at, id", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "done_by", + "type_info": "Int8", + "origin": { + "Table": { + "table": "project_history", + "name": "done_by" + } + } + }, + { + "ordinal": 1, + "name": "delta", + "type_info": "Jsonb", + "origin": { + "Table": { + "table": "project_history", + "name": "delta" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + true, + false + ] + }, + "hash": "83a7c3bfbd84117c7e77d23038836e18010f4948dbd67892a724710bc9451d99" +} diff --git a/apps/labrinth/.sqlx/query-86f062b5801e9a7e62ab6760e13327713f6116c827a39d451db32804c10e464a.json b/apps/labrinth/.sqlx/query-86f062b5801e9a7e62ab6760e13327713f6116c827a39d451db32804c10e464a.json deleted file mode 100644 index 8bdefb0ed1d..00000000000 --- a/apps/labrinth/.sqlx/query-86f062b5801e9a7e62ab6760e13327713f6116c827a39d451db32804c10e464a.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET approved_because = CASE\n WHEN approved IS NULL THEN $2::jsonb\n ELSE approved_because\n END,\n approved = COALESCE(approved, NOW()),\n initial_queued = NULL\n WHERE id = $1\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8", - "Jsonb" - ] - }, - "nullable": [] - }, - "hash": "86f062b5801e9a7e62ab6760e13327713f6116c827a39d451db32804c10e464a" -} diff --git a/apps/labrinth/.sqlx/query-8ac542d252aa62d0541eb6b662e280c8d2a4b0f32d1e1376b4f27b877e1ce196.json b/apps/labrinth/.sqlx/query-8ac542d252aa62d0541eb6b662e280c8d2a4b0f32d1e1376b4f27b877e1ce196.json new file mode 100644 index 00000000000..6ab431ac55d --- /dev/null +++ b/apps/labrinth/.sqlx/query-8ac542d252aa62d0541eb6b662e280c8d2a4b0f32d1e1376b4f27b877e1ce196.json @@ -0,0 +1,34 @@ +{ + "db_name": "PostgreSQL", + "query": "\n WITH moderation_projects AS (\n SELECT\n m.id,\n m.slug,\n m.name,\n m.summary,\n m.description,\n m.queued,\n m.initial_queued,\n m.published,\n m.organization_id,\n m.team_id,\n m.components\n FROM mods m\n WHERE\n m.review_status = $1\n AND (\n $7::boolean = false\n OR NOT EXISTS (\n SELECT 1\n FROM delphi_tech_review_queue trq\n WHERE trq.project_id = m.id\n )\n )\n ),\n external_dependencies AS (\n SELECT\n v.mod_id,\n COUNT(*) AS external_dependencies_count\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN dependencies d ON d.dependent_id = v.id\n WHERE d.dependency_file_name IS NOT NULL\n GROUP BY v.mod_id\n ),\n version_project_types AS (\n SELECT\n v.mod_id,\n ARRAY_AGG(DISTINCT pt.name::text) FILTER (WHERE pt.name IS NOT NULL) AS project_types\n FROM versions v\n INNER JOIN moderation_projects mp ON mp.id = v.mod_id\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders l ON lv.loader_id = l.id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = l.id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.status = ANY($2)\n GROUP BY v.mod_id\n ),\n queue_projects AS (\n SELECT\n mp.id,\n mp.slug,\n mp.name,\n mp.summary,\n mp.description,\n mp.queued,\n mp.initial_queued,\n mp.published,\n search_organization.name AS organization_name,\n search_owner.username AS owner_name,\n CASE\n WHEN jsonb_typeof(mp.components -> 'minecraft_server') = 'object'\n THEN ARRAY_APPEND(\n ARRAY_REMOVE(\n COALESCE(vpt.project_types::text[], ARRAY[]::text[]),\n 'modpack'\n ),\n 'minecraft_java_server'\n )\n ELSE COALESCE(vpt.project_types::text[], ARRAY[]::text[])\n END AS project_types,\n COALESCE(ed.external_dependencies_count, 0) AS external_dependencies_count\n FROM moderation_projects mp\n LEFT JOIN organizations search_organization\n ON search_organization.id = mp.organization_id\n AND $3::text IS NOT NULL\n LEFT JOIN LATERAL (\n SELECT\n u.username\n FROM team_members tm\n INNER JOIN users u ON u.id = tm.user_id\n WHERE tm.team_id = mp.team_id\n AND tm.is_owner\n ORDER BY tm.ordering ASC\n LIMIT 1\n ) search_owner ON $3::text IS NOT NULL\n AND mp.organization_id IS NULL\n LEFT JOIN external_dependencies ed ON ed.mod_id = mp.id\n LEFT JOIN version_project_types vpt ON vpt.mod_id = mp.id\n )\n SELECT id\n FROM queue_projects\n WHERE\n (\n $3::text IS NULL\n OR name ILIKE '%' || $3 || '%'\n OR slug ILIKE '%' || $3 || '%'\n OR summary ILIKE '%' || $3 || '%'\n OR description ILIKE '%' || $3 || '%'\n OR owner_name ILIKE '%' || $3 || '%'\n OR organization_name ILIKE '%' || $3 || '%'\n OR EXISTS (\n SELECT 1\n FROM UNNEST(project_types) AS searched_project_type(project_type)\n WHERE searched_project_type.project_type ILIKE '%' || $3 || '%'\n )\n )\n AND (\n $4::text IS NULL\n OR ($4 = 'none' AND CARDINALITY(project_types) = 0)\n OR ($4 = 'minecraft_java_server' AND project_types @> ARRAY['minecraft_java_server']::text[])\n OR ($4 <> 'none' AND $4 <> 'minecraft_java_server' AND project_types[1] = $4)\n )\n AND ($5::boolean IS NULL OR (external_dependencies_count > 0) = $5)\n ORDER BY\n CASE WHEN $6 = 'most_external_deps' THEN external_dependencies_count END DESC,\n CASE WHEN $6 = 'least_external_deps' THEN external_dependencies_count END ASC,\n CASE WHEN $6 = 'newest' THEN COALESCE(queued, published) END DESC NULLS LAST,\n CASE WHEN $6 = 'oldest_initial' THEN COALESCE(initial_queued, published) END ASC NULLS LAST,\n CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST,\n id ASC\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + } + ], + "parameters": { + "Left": [ + "Text", + "TextArray", + "Text", + "Text", + "Bool", + "Text", + "Bool" + ] + }, + "nullable": [ + false + ] + }, + "hash": "8ac542d252aa62d0541eb6b662e280c8d2a4b0f32d1e1376b4f27b877e1ce196" +} diff --git a/apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json b/apps/labrinth/.sqlx/query-8c869290db4109f914ce38d67110c76746d2cbbda6aa1c3dd381ad9fb2c39e9a.json similarity index 51% rename from apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json rename to apps/labrinth/.sqlx/query-8c869290db4109f914ce38d67110c76746d2cbbda6aa1c3dd381ad9fb2c39e9a.json index d8d75835269..231fbdf979a 100644 --- a/apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json +++ b/apps/labrinth/.sqlx/query-8c869290db4109f914ce38d67110c76746d2cbbda6aa1c3dd381ad9fb2c39e9a.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n m.id AS \"project_id: DBProjectId\",\n MIN(t.id) AS \"thread_id!: DBThreadId\"\n FROM mods m\n INNER JOIN delphi_tech_review_queue trq ON trq.project_id = m.id\n INNER JOIN threads t ON t.mod_id = m.id\n LEFT JOIN versions v ON v.mod_id = m.id\n LEFT JOIN files f ON f.version_id = v.id\n LEFT JOIN delphi_reports dr\n ON dr.file_id = f.id\n AND NOT EXISTS (\n SELECT 1\n FROM delphi_reports newer_dr\n WHERE\n newer_dr.file_id = dr.file_id\n AND newer_dr.delphi_version > dr.delphi_version\n )\n LEFT JOIN delphi_report_issues dri ON dri.report_id = dr.id\n LEFT JOIN delphi_issue_details_with_statuses didws\n ON didws.issue_id = dri.id\n AND didws.severity != 'hidden'\n LEFT JOIN threads_messages tm_last\n ON tm_last.thread_id = t.id\n AND tm_last.id = (\n SELECT id FROM threads_messages\n WHERE thread_id = t.id\n ORDER BY created DESC\n LIMIT 1\n )\n LEFT JOIN users u_last\n ON u_last.id = tm_last.author_id\n WHERE\n (\n cardinality($4::text[]) = 0\n OR (\n 'minecraft_java_server' = ANY($4::text[])\n AND (\n m.components ? 'minecraft_server'\n OR m.components ? 'minecraft_java_server'\n )\n )\n OR EXISTS (\n SELECT 1\n FROM versions type_v\n INNER JOIN loaders_versions type_lv\n ON type_lv.version_id = type_v.id\n INNER JOIN loaders_project_types type_lpt\n ON type_lpt.joining_loader_id = type_lv.loader_id\n INNER JOIN project_types type_pt\n ON type_pt.id = type_lpt.joining_project_type_id\n WHERE\n type_v.mod_id = m.id\n AND type_pt.name = ANY($4::text[])\n AND (\n type_pt.name != 'modpack'\n OR NOT (\n m.components ? 'minecraft_server'\n OR m.components ? 'minecraft_java_server'\n )\n )\n )\n )\n AND m.status NOT IN ('draft', 'rejected', 'withheld')\n AND (cardinality($6::text[]) = 0 OR m.status = ANY($6::text[]))\n AND (\n cardinality($7::text[]) = 0\n OR EXISTS (\n SELECT 1\n FROM versions issue_version\n INNER JOIN files issue_file\n ON issue_file.version_id = issue_version.id\n INNER JOIN delphi_reports issue_report\n ON issue_report.file_id = issue_file.id\n AND NOT EXISTS (\n SELECT 1\n FROM delphi_reports newer_issue_report\n WHERE\n newer_issue_report.file_id = issue_report.file_id\n AND newer_issue_report.delphi_version > issue_report.delphi_version\n )\n INNER JOIN delphi_report_issues issue\n ON issue.report_id = issue_report.id\n INNER JOIN delphi_issue_details_with_statuses detail\n ON detail.issue_id = issue.id\n WHERE\n issue_version.mod_id = m.id\n AND issue.issue_type = ANY($7::text[])\n AND detail.severity != 'hidden'\n )\n )\n AND (\n $5::text IS NULL\n OR ($5::text = 'unreplied' AND (tm_last.id IS NULL OR u_last.role IS NULL OR u_last.role NOT IN ('moderator', 'admin')))\n OR ($5::text = 'replied' AND tm_last.id IS NOT NULL AND u_last.role IS NOT NULL AND u_last.role IN ('moderator', 'admin'))\n )\n GROUP BY m.id\n ORDER BY\n CASE WHEN $3 = 'created_asc' THEN MIN(dr.created) ELSE TO_TIMESTAMP(0) END ASC,\n CASE WHEN $3 = 'created_desc' THEN MIN(dr.created) ELSE TO_TIMESTAMP(0) END DESC,\n CASE WHEN $3 = 'severity_asc' THEN COALESCE(MAX(didws.severity), 'low'::delphi_severity) ELSE 'low'::delphi_severity END ASC,\n CASE WHEN $3 = 'severity_desc' THEN COALESCE(MAX(didws.severity), 'low'::delphi_severity) ELSE 'low'::delphi_severity END DESC,\n -- tie-breaker: oldest reports\n MIN(dr.created) ASC\n LIMIT $1 OFFSET $2\n ", + "query": "\n SELECT\n m.id AS \"project_id: DBProjectId\",\n MIN(t.id) AS \"thread_id!: DBThreadId\"\n FROM mods m\n INNER JOIN delphi_tech_review_queue trq ON trq.project_id = m.id\n INNER JOIN threads t ON t.mod_id = m.id\n LEFT JOIN versions v ON v.mod_id = m.id\n LEFT JOIN files f ON f.version_id = v.id\n LEFT JOIN delphi_reports dr\n ON dr.file_id = f.id\n AND NOT EXISTS (\n SELECT 1\n FROM delphi_reports newer_dr\n WHERE\n newer_dr.file_id = dr.file_id\n AND newer_dr.delphi_version > dr.delphi_version\n )\n LEFT JOIN delphi_report_issues dri ON dri.report_id = dr.id\n LEFT JOIN delphi_issue_details_with_statuses didws\n ON didws.issue_id = dri.id\n AND didws.severity != 'hidden'\n LEFT JOIN threads_messages tm_last\n ON tm_last.thread_id = t.id\n AND tm_last.id = (\n SELECT id FROM threads_messages\n WHERE thread_id = t.id\n ORDER BY created DESC\n LIMIT 1\n )\n LEFT JOIN users u_last\n ON u_last.id = tm_last.author_id\n WHERE\n (\n cardinality($4::text[]) = 0\n OR (\n 'minecraft_java_server' = ANY($4::text[])\n AND (\n m.components ? 'minecraft_server'\n OR m.components ? 'minecraft_java_server'\n )\n )\n OR EXISTS (\n SELECT 1\n FROM versions type_v\n INNER JOIN loaders_versions type_lv\n ON type_lv.version_id = type_v.id\n INNER JOIN loaders_project_types type_lpt\n ON type_lpt.joining_loader_id = type_lv.loader_id\n INNER JOIN project_types type_pt\n ON type_pt.id = type_lpt.joining_project_type_id\n WHERE\n type_v.mod_id = m.id\n AND type_pt.name = ANY($4::text[])\n AND (\n type_pt.name != 'modpack'\n OR NOT (\n m.components ? 'minecraft_server'\n OR m.components ? 'minecraft_java_server'\n )\n )\n )\n )\n AND m.review_status NOT IN ('draft', 'rejected', 'withheld')\n AND (\n cardinality($6::text[]) = 0\n OR CASE m.review_status\n WHEN 'draft' THEN 'draft'\n WHEN 'in_review' THEN 'processing'\n WHEN 'rejected' THEN 'rejected'\n WHEN 'withheld' THEN 'withheld'\n WHEN 'approved' THEN CASE m.visibility\n WHEN 'listed' THEN 'approved'\n WHEN 'unlisted' THEN 'unlisted'\n WHEN 'private' THEN 'private'\n END\n END = ANY($6::text[])\n )\n AND (\n cardinality($7::text[]) = 0\n OR EXISTS (\n SELECT 1\n FROM versions issue_version\n INNER JOIN files issue_file\n ON issue_file.version_id = issue_version.id\n INNER JOIN delphi_reports issue_report\n ON issue_report.file_id = issue_file.id\n AND NOT EXISTS (\n SELECT 1\n FROM delphi_reports newer_issue_report\n WHERE\n newer_issue_report.file_id = issue_report.file_id\n AND newer_issue_report.delphi_version > issue_report.delphi_version\n )\n INNER JOIN delphi_report_issues issue\n ON issue.report_id = issue_report.id\n INNER JOIN delphi_issue_details_with_statuses detail\n ON detail.issue_id = issue.id\n WHERE\n issue_version.mod_id = m.id\n AND issue.issue_type = ANY($7::text[])\n AND detail.severity != 'hidden'\n )\n )\n AND (\n $5::text IS NULL\n OR ($5::text = 'unreplied' AND (tm_last.id IS NULL OR u_last.role IS NULL OR u_last.role NOT IN ('moderator', 'admin')))\n OR ($5::text = 'replied' AND tm_last.id IS NOT NULL AND u_last.role IS NOT NULL AND u_last.role IN ('moderator', 'admin'))\n )\n GROUP BY m.id\n ORDER BY\n CASE WHEN $3 = 'created_asc' THEN MIN(dr.created) ELSE TO_TIMESTAMP(0) END ASC,\n CASE WHEN $3 = 'created_desc' THEN MIN(dr.created) ELSE TO_TIMESTAMP(0) END DESC,\n CASE WHEN $3 = 'severity_asc' THEN COALESCE(MAX(didws.severity), 'low'::delphi_severity) ELSE 'low'::delphi_severity END ASC,\n CASE WHEN $3 = 'severity_desc' THEN COALESCE(MAX(didws.severity), 'low'::delphi_severity) ELSE 'low'::delphi_severity END DESC,\n -- tie-breaker: oldest reports\n MIN(dr.created) ASC\n LIMIT $1 OFFSET $2\n ", "describe": { "columns": [ { @@ -37,5 +37,5 @@ null ] }, - "hash": "b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d" + "hash": "8c869290db4109f914ce38d67110c76746d2cbbda6aa1c3dd381ad9fb2c39e9a" } diff --git a/apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json b/apps/labrinth/.sqlx/query-8d17c3836383c5c92d3f3b1a3e1771995e246519947023f8e111067bc07e85e2.json similarity index 86% rename from apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json rename to apps/labrinth/.sqlx/query-8d17c3836383c5c92d3f3b1a3e1771995e246519947023f8e111067bc07e85e2.json index 6d4dbbee971..52ebcce2c2d 100644 --- a/apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json +++ b/apps/labrinth/.sqlx/query-8d17c3836383c5c92d3f3b1a3e1771995e246519947023f8e111067bc07e85e2.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT COUNT(*) AS \"count!\"\n\t\tFROM delphi_rule_effects effect\n\t\tINNER JOIN delphi_rule_revisions published\n\t\t\tON published.revision = effect.revision\n\t\tWHERE\n\t\t\teffect.rule_id = $1\n\t\t\tAND (\n\t\t\t\tNOT $2\n\t\t\t\tOR EXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM delphi_report_issue_details detail\n\t\t\t\t\tINNER JOIN delphi_report_issues issue\n\t\t\t\t\t\tON issue.id = detail.issue_id\n\t\t\t\t\tINNER JOIN delphi_reports report\n\t\t\t\t\t\tON report.id = issue.report_id\n\t\t\t\t\tINNER JOIN files file ON file.id = report.file_id\n\t\t\t\t\tINNER JOIN versions version ON version.id = file.version_id\n\t\t\t\t\tINNER JOIN mods project ON project.id = version.mod_id\n\t\t\t\t\tWHERE\n\t\t\t\t\t\tdetail.id = effect.detail_id\n\t\t\t\t\t\tAND project.status = 'processing'\n\t\t\t\t)\n\t\t\t)\n\t\t", + "query": "\n\t\tSELECT COUNT(*) AS \"count!\"\n\t\tFROM delphi_rule_effects effect\n\t\tINNER JOIN delphi_rule_revisions published\n\t\t\tON published.revision = effect.revision\n\t\tWHERE\n\t\t\teffect.rule_id = $1\n\t\t\tAND (\n\t\t\t\tNOT $2\n\t\t\t\tOR EXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM delphi_report_issue_details detail\n\t\t\t\t\tINNER JOIN delphi_report_issues issue\n\t\t\t\t\t\tON issue.id = detail.issue_id\n\t\t\t\t\tINNER JOIN delphi_reports report\n\t\t\t\t\t\tON report.id = issue.report_id\n\t\t\t\t\tINNER JOIN files file ON file.id = report.file_id\n\t\t\t\t\tINNER JOIN versions version ON version.id = file.version_id\n\t\t\t\t\tINNER JOIN mods project ON project.id = version.mod_id\n\t\t\t\t\tWHERE\n\t\t\t\t\t\tdetail.id = effect.detail_id\n\t\t\t\t\t\tAND project.review_status = 'in_review'\n\t\t\t\t)\n\t\t\t)\n\t\t", "describe": { "columns": [ { @@ -20,5 +20,5 @@ null ] }, - "hash": "20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2" + "hash": "8d17c3836383c5c92d3f3b1a3e1771995e246519947023f8e111067bc07e85e2" } diff --git a/apps/labrinth/.sqlx/query-8d5e22ef37cc8172cb95d3b8fa84538257b660dc47eae66719edf05cb7b57725.json b/apps/labrinth/.sqlx/query-8d5e22ef37cc8172cb95d3b8fa84538257b660dc47eae66719edf05cb7b57725.json new file mode 100644 index 00000000000..459e005550e --- /dev/null +++ b/apps/labrinth/.sqlx/query-8d5e22ef37cc8172cb95d3b8fa84538257b660dc47eae66719edf05cb7b57725.json @@ -0,0 +1,40 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n visibility AS \"visibility: ProjectVisibility\",\n review_status AS \"review_status: ProjectReviewStatus\"\n FROM mods\n WHERE id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility: ProjectVisibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 1, + "name": "review_status: ProjectReviewStatus", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_status" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false + ] + }, + "hash": "8d5e22ef37cc8172cb95d3b8fa84538257b660dc47eae66719edf05cb7b57725" +} diff --git a/apps/labrinth/.sqlx/query-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json b/apps/labrinth/.sqlx/query-93b219275baddc35cdccd0aadb2e25a9e8913f6bd1d495511261f40156cbd292.json similarity index 65% rename from apps/labrinth/.sqlx/query-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json rename to apps/labrinth/.sqlx/query-93b219275baddc35cdccd0aadb2e25a9e8913f6bd1d495511261f40156cbd292.json index fa5ba84781d..cfae8f56c12 100644 --- a/apps/labrinth/.sqlx/query-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json +++ b/apps/labrinth/.sqlx/query-93b219275baddc35cdccd0aadb2e25a9e8913f6bd1d495511261f40156cbd292.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT COUNT(id)\n FROM mods\n WHERE status = ANY($1)\n ", + "query": "\n SELECT COUNT(id)\n FROM mods\n WHERE visibility = 'listed' AND review_status = 'approved'\n ", "describe": { "columns": [ { @@ -11,13 +11,11 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ null ] }, - "hash": "6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d" + "hash": "93b219275baddc35cdccd0aadb2e25a9e8913f6bd1d495511261f40156cbd292" } diff --git a/apps/labrinth/.sqlx/query-a06e1d9f6f95e4c4c2b98310ebddcc9d963cc033582bf2e945e8bf3a301b4247.json b/apps/labrinth/.sqlx/query-a06e1d9f6f95e4c4c2b98310ebddcc9d963cc033582bf2e945e8bf3a301b4247.json deleted file mode 100644 index f44d89e18c4..00000000000 --- a/apps/labrinth/.sqlx/query-a06e1d9f6f95e4c4c2b98310ebddcc9d963cc033582bf2e945e8bf3a301b4247.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "SELECT pg_advisory_xact_lock($1)", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "pg_advisory_xact_lock", - "type_info": "Void", - "origin": "Expression" - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - null - ] - }, - "hash": "a06e1d9f6f95e4c4c2b98310ebddcc9d963cc033582bf2e945e8bf3a301b4247" -} diff --git a/apps/labrinth/.sqlx/query-a0e896f1b339936e7477e9bf5a265db82a0bd0a743414520410bcc75fb82a1e3.json b/apps/labrinth/.sqlx/query-a0e896f1b339936e7477e9bf5a265db82a0bd0a743414520410bcc75fb82a1e3.json deleted file mode 100644 index bca0ec81afb..00000000000 --- a/apps/labrinth/.sqlx/query-a0e896f1b339936e7477e9bf5a265db82a0bd0a743414520410bcc75fb82a1e3.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET\n moderation_message = NULL,\n moderation_message_body = NULL,\n queued = NOW(),\n initial_queued = COALESCE(initial_queued, NOW())\n WHERE (id = $1)\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [] - }, - "hash": "a0e896f1b339936e7477e9bf5a265db82a0bd0a743414520410bcc75fb82a1e3" -} diff --git a/apps/labrinth/.sqlx/query-9e5170dddcd089edd4a5c89ec8929f0bdf6f6c2c56d944e7af3b2b13d9d95f3d.json b/apps/labrinth/.sqlx/query-a4d65ad052922493353a8d83c559d2f5eb9746d357dfc86b65c81023c370830e.json similarity index 57% rename from apps/labrinth/.sqlx/query-9e5170dddcd089edd4a5c89ec8929f0bdf6f6c2c56d944e7af3b2b13d9d95f3d.json rename to apps/labrinth/.sqlx/query-a4d65ad052922493353a8d83c559d2f5eb9746d357dfc86b65c81023c370830e.json index e1acc953c90..513abc0eab1 100644 --- a/apps/labrinth/.sqlx/query-9e5170dddcd089edd4a5c89ec8929f0bdf6f6c2c56d944e7af3b2b13d9d95f3d.json +++ b/apps/labrinth/.sqlx/query-a4d65ad052922493353a8d83c559d2f5eb9746d357dfc86b65c81023c370830e.json @@ -1,11 +1,11 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT tm.user_id id\n FROM team_members tm\n WHERE tm.team_id = $1 AND tm.accepted\n ", + "query": "\n SELECT user_id FROM team_members\n WHERE team_id = $1 AND accepted\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "id", + "name": "user_id", "type_info": "Int8", "origin": { "Table": { @@ -24,5 +24,5 @@ false ] }, - "hash": "9e5170dddcd089edd4a5c89ec8929f0bdf6f6c2c56d944e7af3b2b13d9d95f3d" + "hash": "a4d65ad052922493353a8d83c559d2f5eb9746d357dfc86b65c81023c370830e" } diff --git a/apps/labrinth/.sqlx/query-a96f1c4d7f8711559b006d78b9773cc1416a3b159f3802b0f95cf64053dd4f95.json b/apps/labrinth/.sqlx/query-a96f1c4d7f8711559b006d78b9773cc1416a3b159f3802b0f95cf64053dd4f95.json new file mode 100644 index 00000000000..eb959f32d83 --- /dev/null +++ b/apps/labrinth/.sqlx/query-a96f1c4d7f8711559b006d78b9773cc1416a3b159f3802b0f95cf64053dd4f95.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT visibility AS \"visibility: ProjectVisibility\"\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility: ProjectVisibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false + ] + }, + "hash": "a96f1c4d7f8711559b006d78b9773cc1416a3b159f3802b0f95cf64053dd4f95" +} diff --git a/apps/labrinth/.sqlx/query-ada03dddc9be77bfda6817ba99312efab28ba577cb45cdae6c0e167bf9b3b0af.json b/apps/labrinth/.sqlx/query-ada03dddc9be77bfda6817ba99312efab28ba577cb45cdae6c0e167bf9b3b0af.json new file mode 100644 index 00000000000..1c58516f429 --- /dev/null +++ b/apps/labrinth/.sqlx/query-ada03dddc9be77bfda6817ba99312efab28ba577cb45cdae6c0e167bf9b3b0af.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET approved_because = CASE WHEN approved IS NULL THEN $2::jsonb\n ELSE approved_because END,\n approved = COALESCE(approved, NOW()), initial_queued = NULL\n WHERE id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "ada03dddc9be77bfda6817ba99312efab28ba577cb45cdae6c0e167bf9b3b0af" +} diff --git a/apps/labrinth/.sqlx/query-adc8801aee253a2a0a63e5dd86b12fbd090fc06980f3d648b31f6346d3d63c12.json b/apps/labrinth/.sqlx/query-adc8801aee253a2a0a63e5dd86b12fbd090fc06980f3d648b31f6346d3d63c12.json new file mode 100644 index 00000000000..38a5fff9382 --- /dev/null +++ b/apps/labrinth/.sqlx/query-adc8801aee253a2a0a63e5dd86b12fbd090fc06980f3d648b31f6346d3d63c12.json @@ -0,0 +1,52 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT visibility AS \"visibility: ProjectVisibility\",\n review_status AS \"review_status: ProjectReviewStatus\", slug\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility: ProjectVisibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 1, + "name": "review_status: ProjectReviewStatus", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_status" + } + } + }, + { + "ordinal": 2, + "name": "slug", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + true + ] + }, + "hash": "adc8801aee253a2a0a63e5dd86b12fbd090fc06980f3d648b31f6346d3d63c12" +} diff --git a/apps/labrinth/.sqlx/query-b0d5b1e50b9d46949760be7d04bc99343681b42f3acfa03af74f3445ccf2dbe7.json b/apps/labrinth/.sqlx/query-b0d5b1e50b9d46949760be7d04bc99343681b42f3acfa03af74f3445ccf2dbe7.json new file mode 100644 index 00000000000..7787206f560 --- /dev/null +++ b/apps/labrinth/.sqlx/query-b0d5b1e50b9d46949760be7d04bc99343681b42f3acfa03af74f3445ccf2dbe7.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET moderation_message = NULL, moderation_message_body = NULL,\n queued = NOW(), initial_queued = COALESCE(initial_queued, NOW())\n WHERE id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "b0d5b1e50b9d46949760be7d04bc99343681b42f3acfa03af74f3445ccf2dbe7" +} diff --git a/apps/labrinth/.sqlx/query-b2c71f0b227d11cf9d26f8c3eaf9a9f7293a8a57be522db81dcacf594ea913a4.json b/apps/labrinth/.sqlx/query-b2c71f0b227d11cf9d26f8c3eaf9a9f7293a8a57be522db81dcacf594ea913a4.json deleted file mode 100644 index 4c6e420ff60..00000000000 --- a/apps/labrinth/.sqlx/query-b2c71f0b227d11cf9d26f8c3eaf9a9f7293a8a57be522db81dcacf594ea913a4.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n WITH old AS (\n SELECT id, status\n FROM mods\n WHERE id = $2\n ),\n updated AS (\n UPDATE mods\n SET status = $1\n FROM threads t\n WHERE\n mods.id = $2\n AND t.mod_id = mods.id\n RETURNING mods.id, t.id AS thread_id\n )\n SELECT\n updated.thread_id AS \"thread_id: DBThreadId\",\n old.status AS \"old_status!\"\n FROM updated\n INNER JOIN old ON old.id = updated.id\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "thread_id: DBThreadId", - "type_info": "Int8", - "origin": { - "Table": { - "table": "threads", - "name": "id" - } - } - }, - { - "ordinal": 1, - "name": "old_status!", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "status" - } - } - } - ], - "parameters": { - "Left": [ - "Varchar", - "Int8" - ] - }, - "nullable": [ - false, - false - ] - }, - "hash": "b2c71f0b227d11cf9d26f8c3eaf9a9f7293a8a57be522db81dcacf594ea913a4" -} diff --git a/apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json b/apps/labrinth/.sqlx/query-bd4a53abfc605278ea68fe0b746c0d49d8c5a2614c57f9dd7d2c89d64eb1500f.json similarity index 72% rename from apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json rename to apps/labrinth/.sqlx/query-bd4a53abfc605278ea68fe0b746c0d49d8c5a2614c57f9dd7d2c89d64eb1500f.json index d6a34e1c94b..8cda1f80d91 100644 --- a/apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json +++ b/apps/labrinth/.sqlx/query-bd4a53abfc605278ea68fe0b746c0d49d8c5a2614c57f9dd7d2c89d64eb1500f.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT TRUE FROM mods WHERE organization_id = $1 AND status IN ('approved', 'archived') LIMIT 1", + "query": "SELECT TRUE FROM mods WHERE organization_id = $1 AND visibility = 'listed' AND review_status = 'approved' LIMIT 1", "describe": { "columns": [ { @@ -19,5 +19,5 @@ null ] }, - "hash": "829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a" + "hash": "bd4a53abfc605278ea68fe0b746c0d49d8c5a2614c57f9dd7d2c89d64eb1500f" } diff --git a/apps/labrinth/.sqlx/query-c25c5f6f578250c5e052ee2e5dbb458aef6ab3154aac191e2f145b863693be77.json b/apps/labrinth/.sqlx/query-c25c5f6f578250c5e052ee2e5dbb458aef6ab3154aac191e2f145b863693be77.json new file mode 100644 index 00000000000..480f9fe40bf --- /dev/null +++ b/apps/labrinth/.sqlx/query-c25c5f6f578250c5e052ee2e5dbb458aef6ab3154aac191e2f145b863693be77.json @@ -0,0 +1,40 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT visibility, review_status FROM mods WHERE id = $1\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 1, + "name": "review_status", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_status" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false + ] + }, + "hash": "c25c5f6f578250c5e052ee2e5dbb458aef6ab3154aac191e2f145b863693be77" +} diff --git a/apps/labrinth/.sqlx/query-c33d32e876b003a82dcf0036ef483924a801d01b426e93050600ae678e2e46bd.json b/apps/labrinth/.sqlx/query-c33d32e876b003a82dcf0036ef483924a801d01b426e93050600ae678e2e46bd.json deleted file mode 100644 index d813a19859e..00000000000 --- a/apps/labrinth/.sqlx/query-c33d32e876b003a82dcf0036ef483924a801d01b426e93050600ae678e2e46bd.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET status = $1\n WHERE (id = $2)\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Int8" - ] - }, - "nullable": [] - }, - "hash": "c33d32e876b003a82dcf0036ef483924a801d01b426e93050600ae678e2e46bd" -} diff --git a/apps/labrinth/.sqlx/query-c97315540d36355668a1fdd33175b946cd026c718bf4c7d16b23953f6ec5b840.json b/apps/labrinth/.sqlx/query-c97315540d36355668a1fdd33175b946cd026c718bf4c7d16b23953f6ec5b840.json deleted file mode 100644 index c87d27669e7..00000000000 --- a/apps/labrinth/.sqlx/query-c97315540d36355668a1fdd33175b946cd026c718bf4c7d16b23953f6ec5b840.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "WITH random_id_point AS (\n SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point\n )\n SELECT id FROM mods\n WHERE status = ANY($1)\n AND EXISTS (\n SELECT 1 FROM versions v\n INNER JOIN loaders_versions lv ON v.id = lv.version_id\n INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = lv.loader_id\n INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id\n WHERE v.mod_id = mods.id AND pt.name = $3\n -- prevents decorrelation, so this stops at the first match instead\n -- of scanning all versions before the outer sort/limit applies\n OFFSET 0\n )\n ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point)\n LIMIT $2", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - } - ], - "parameters": { - "Left": [ - "TextArray", - "Int8", - "Text" - ] - }, - "nullable": [ - false - ] - }, - "hash": "c97315540d36355668a1fdd33175b946cd026c718bf4c7d16b23953f6ec5b840" -} diff --git a/apps/labrinth/.sqlx/query-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json b/apps/labrinth/.sqlx/query-ccc2527d13327546a5330a783f03270ddc859dde8c5c1dde75a281747b4c8378.json similarity index 71% rename from apps/labrinth/.sqlx/query-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json rename to apps/labrinth/.sqlx/query-ccc2527d13327546a5330a783f03270ddc859dde8c5c1dde75a281747b4c8378.json index f8095f9d8bf..f7e54c2c047 100644 --- a/apps/labrinth/.sqlx/query-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json +++ b/apps/labrinth/.sqlx/query-ccc2527d13327546a5330a783f03270ddc859dde8c5c1dde75a281747b4c8378.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id FROM mods WHERE status = 'processing'", + "query": "SELECT id FROM mods WHERE review_status = 'in_review'", "describe": { "columns": [ { @@ -22,5 +22,5 @@ false ] }, - "hash": "7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87" + "hash": "ccc2527d13327546a5330a783f03270ddc859dde8c5c1dde75a281747b4c8378" } diff --git a/apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json b/apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json deleted file mode 100644 index 5a26ce08b21..00000000000 --- a/apps/labrinth/.sqlx/query-cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET webhook_sent = TRUE\n WHERE id = $1\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [] - }, - "hash": "cec98010827455127da68a2bc5cd3c1ee3bfd357a6a8604febad3ed214a9b77b" -} diff --git a/apps/labrinth/.sqlx/query-cf0ce4ce54edc7533332f0bfab27d977a9613f8aa22669c0f8fe7bab2d5d6192.json b/apps/labrinth/.sqlx/query-cf0ce4ce54edc7533332f0bfab27d977a9613f8aa22669c0f8fe7bab2d5d6192.json deleted file mode 100644 index 0b5f5d4ffbb..00000000000 --- a/apps/labrinth/.sqlx/query-cf0ce4ce54edc7533332f0bfab27d977a9613f8aa22669c0f8fe7bab2d5d6192.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n INSERT INTO mods (\n id, team_id, name, summary, description,\n published, downloads, icon_url, raw_icon_url, status, requested_status,\n license_url, license,\n slug, color, monetization_status, organization_id,\n side_types_migration_review_status,\n components\n )\n VALUES (\n $1, $2, $3, $4, $5, $6,\n $7, $8, $9, $10, $11,\n $12, $13,\n LOWER($14), $15, $16, $17,\n $18,\n $19\n )\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Int8", - "Int8", - "Varchar", - "Varchar", - "Varchar", - "Timestamptz", - "Int4", - "Varchar", - "Text", - "Varchar", - "Varchar", - "Varchar", - "Varchar", - "Text", - "Int4", - "Varchar", - "Int8", - "Varchar", - "Jsonb" - ] - }, - "nullable": [] - }, - "hash": "cf0ce4ce54edc7533332f0bfab27d977a9613f8aa22669c0f8fe7bab2d5d6192" -} diff --git a/apps/labrinth/.sqlx/query-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json b/apps/labrinth/.sqlx/query-cf95d4ade8b15a3563670e37eeed81e23a69f98d137d84e53b9c47a3325a231d.json similarity index 85% rename from apps/labrinth/.sqlx/query-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json rename to apps/labrinth/.sqlx/query-cf95d4ade8b15a3563670e37eeed81e23a69f98d137d84e53b9c47a3325a231d.json index 4879204ce18..85d3e63eb14 100644 --- a/apps/labrinth/.sqlx/query-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json +++ b/apps/labrinth/.sqlx/query-cf95d4ade8b15a3563670e37eeed81e23a69f98d137d84e53b9c47a3325a231d.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT latest.id AS \"id!\"\n FROM mods m\n CROSS JOIN LATERAL (\n SELECT\n $7::BOOL\n OR EXISTS (\n SELECT 1 FROM team_members tm\n WHERE tm.team_id = m.team_id AND tm.user_id = $8::BIGINT\n )\n OR EXISTS (\n SELECT 1 FROM organizations o\n INNER JOIN team_members tm ON tm.team_id = o.team_id\n WHERE o.id = m.organization_id AND tm.user_id = $8::BIGINT\n ) AS full_access\n ) access\n CROSS JOIN LATERAL (\n SELECT v.id\n FROM versions v\n WHERE v.mod_id = m.id\n AND (CARDINALITY($4::VARCHAR[]) = 0 OR v.version_type = ANY($4))\n AND EXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM JSONB_ARRAY_ELEMENTS_TEXT(v.components->'minecraft_mod'->'game_versions') AS gv(value)\n\t\t\t\t\tWHERE CARDINALITY($2::VARCHAR[]) = 0 OR gv.value = ANY($2)\n )\n AND EXISTS (\n SELECT 1 FROM loaders_versions lv\n INNER JOIN loaders l ON l.id = lv.loader_id\n WHERE lv.version_id = v.id\n AND (CARDINALITY($3::VARCHAR[]) = 0 OR l.loader = ANY($3))\n )\n AND (\n access.full_access\n OR (\n v.status = ANY($5::VARCHAR[])\n AND NOT EXISTS (\n SELECT 1\n FROM project_attribution_groups pag\n INNER JOIN project_attribution_files paf ON paf.group_id = pag.id\n INNER JOIN override_file_sources ofs ON ofs.sha1 = paf.sha1\n INNER JOIN files f ON f.id = ofs.file_id\n INNER JOIN attribution_enforced_versions aev ON aev.id = f.version_id\n WHERE pag.project_id = v.mod_id\n AND f.version_id = v.id\n AND (\n pag.attribution IS NULL\n OR pag.attribution->>'kind' = 'no_permission'\n OR COALESCE(pag.attribution->'moderation_status'->>'kind', 'approved') != 'approved'\n )\n )\n )\n )\n ORDER BY v.date_published DESC, v.id DESC\n LIMIT 1\n ) latest\n WHERE m.id = ANY($1)\n AND (access.full_access OR m.status = ANY($6::VARCHAR[]))\n ", + "query": "\n SELECT latest.id AS \"id!\"\n FROM mods m\n CROSS JOIN LATERAL (\n SELECT\n $6::BOOL\n OR EXISTS (\n SELECT 1 FROM team_members tm\n WHERE tm.team_id = m.team_id AND tm.user_id = $7::BIGINT\n )\n OR EXISTS (\n SELECT 1 FROM organizations o\n INNER JOIN team_members tm ON tm.team_id = o.team_id\n WHERE o.id = m.organization_id AND tm.user_id = $7::BIGINT\n ) AS full_access\n ) access\n CROSS JOIN LATERAL (\n SELECT v.id\n FROM versions v\n WHERE v.mod_id = m.id\n AND (CARDINALITY($4::VARCHAR[]) = 0 OR v.version_type = ANY($4))\n AND EXISTS (\n\t\t\t\t\tSELECT 1\n\t\t\t\t\tFROM JSONB_ARRAY_ELEMENTS_TEXT(v.components->'minecraft_mod'->'game_versions') AS gv(value)\n\t\t\t\t\tWHERE CARDINALITY($2::VARCHAR[]) = 0 OR gv.value = ANY($2)\n )\n AND EXISTS (\n SELECT 1 FROM loaders_versions lv\n INNER JOIN loaders l ON l.id = lv.loader_id\n WHERE lv.version_id = v.id\n AND (CARDINALITY($3::VARCHAR[]) = 0 OR l.loader = ANY($3))\n )\n AND (\n access.full_access\n OR (\n v.status = ANY($5::VARCHAR[])\n AND NOT EXISTS (\n SELECT 1\n FROM project_attribution_groups pag\n INNER JOIN project_attribution_files paf ON paf.group_id = pag.id\n INNER JOIN override_file_sources ofs ON ofs.sha1 = paf.sha1\n INNER JOIN files f ON f.id = ofs.file_id\n INNER JOIN attribution_enforced_versions aev ON aev.id = f.version_id\n WHERE pag.project_id = v.mod_id\n AND f.version_id = v.id\n AND (\n pag.attribution IS NULL\n OR pag.attribution->>'kind' = 'no_permission'\n OR COALESCE(pag.attribution->'moderation_status'->>'kind', 'approved') != 'approved'\n )\n )\n )\n )\n ORDER BY v.date_published DESC, v.id DESC\n LIMIT 1\n ) latest\n WHERE m.id = ANY($1)\n AND (\n access.full_access\n OR m.review_status = 'withheld'\n OR (m.review_status = 'approved' AND m.visibility IN ('listed', 'unlisted'))\n )\n ", "describe": { "columns": [ { @@ -22,7 +22,6 @@ "VarcharArray", "VarcharArray", "VarcharArray", - "VarcharArray", "Bool", "Int8" ] @@ -31,5 +30,5 @@ false ] }, - "hash": "7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92" + "hash": "cf95d4ade8b15a3563670e37eeed81e23a69f98d137d84e53b9c47a3325a231d" } diff --git a/apps/labrinth/.sqlx/query-d0176ad91d4ae686b5168d52039801fd3e97dd2e240b6f57219a63deaf7bd9c0.json b/apps/labrinth/.sqlx/query-d0176ad91d4ae686b5168d52039801fd3e97dd2e240b6f57219a63deaf7bd9c0.json new file mode 100644 index 00000000000..c78d7b9f50d --- /dev/null +++ b/apps/labrinth/.sqlx/query-d0176ad91d4ae686b5168d52039801fd3e97dd2e240b6f57219a63deaf7bd9c0.json @@ -0,0 +1,32 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO mods (\n id, team_id, name, summary, description,\n published, downloads, icon_url, raw_icon_url, visibility, review_status,\n license_url, license,\n slug, color, monetization_status, organization_id,\n side_types_migration_review_status,\n components\n )\n VALUES (\n $1, $2, $3, $4, $5, $6,\n $7, $8, $9, $10, $11,\n $12, $13,\n LOWER($14), $15, $16, $17,\n $18,\n $19\n )\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Int8", + "Varchar", + "Varchar", + "Varchar", + "Timestamptz", + "Int4", + "Varchar", + "Text", + "Text", + "Text", + "Varchar", + "Varchar", + "Text", + "Int4", + "Varchar", + "Int8", + "Varchar", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "d0176ad91d4ae686b5168d52039801fd3e97dd2e240b6f57219a63deaf7bd9c0" +} diff --git a/apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json b/apps/labrinth/.sqlx/query-d2601a215a7eb937eda67f5f5943c863aa6ae67b4d76540ae562b99fb3e7b850.json similarity index 71% rename from apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json rename to apps/labrinth/.sqlx/query-d2601a215a7eb937eda67f5f5943c863aa6ae67b4d76540ae562b99fb3e7b850.json index d4e4e2f18e1..b3c288789e8 100644 --- a/apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json +++ b/apps/labrinth/.sqlx/query-d2601a215a7eb937eda67f5f5943c863aa6ae67b4d76540ae562b99fb3e7b850.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT COUNT(DISTINCT u.id)\n FROM users u\n INNER JOIN team_members tm on u.id = tm.user_id AND tm.accepted = TRUE\n INNER JOIN mods m on tm.team_id = m.team_id AND m.status = ANY($1)\n ", + "query": "\n SELECT COUNT(DISTINCT u.id)\n FROM users u\n INNER JOIN team_members tm on u.id = tm.user_id AND tm.accepted = TRUE\n INNER JOIN mods m on tm.team_id = m.team_id AND m.visibility = 'listed' AND m.review_status = 'approved'\n ", "describe": { "columns": [ { @@ -11,13 +11,11 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ null ] }, - "hash": "aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f" + "hash": "d2601a215a7eb937eda67f5f5943c863aa6ae67b4d76540ae562b99fb3e7b850" } diff --git a/apps/labrinth/.sqlx/query-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json b/apps/labrinth/.sqlx/query-d5194fca53f7b9e71eeca3afdb763f16a90f4454704049fc61d0232f8e66f7aa.json similarity index 94% rename from apps/labrinth/.sqlx/query-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json rename to apps/labrinth/.sqlx/query-d5194fca53f7b9e71eeca3afdb763f16a90f4454704049fc61d0232f8e66f7aa.json index 9fe38e4f20d..154d9b0edd3 100644 --- a/apps/labrinth/.sqlx/query-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json +++ b/apps/labrinth/.sqlx/query-d5194fca53f7b9e71eeca3afdb763f16a90f4454704049fc61d0232f8e66f7aa.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n\t\tSELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n\t\tm.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color,\n\t\tm.components AS \"components: sqlx::types::Json\"\n\t\tFROM mods m\n\t\tWHERE m.status = ANY($1) AND m.id = ANY($2)\n\t\tGROUP BY m.id\n\t\tORDER BY m.id ASC;\n\t\t", + "query": "\n\t\tSELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows,\n\t\tm.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color,\n\t\tm.components AS \"components: sqlx::types::Json\"\n\t\tFROM mods m\n\t\tWHERE m.visibility = 'listed' AND m.review_status = 'approved' AND m.id = ANY($1)\n\t\tGROUP BY m.id\n\t\tORDER BY m.id ASC;\n\t\t", "describe": { "columns": [ { @@ -149,7 +149,6 @@ ], "parameters": { "Left": [ - "TextArray", "Int8Array" ] }, @@ -169,5 +168,5 @@ false ] }, - "hash": "881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78" + "hash": "d5194fca53f7b9e71eeca3afdb763f16a90f4454704049fc61d0232f8e66f7aa" } diff --git a/apps/labrinth/.sqlx/query-d772e167886412de93a77f00b4bd5391cb5cccc9cc3f665c511fff95993034b2.json b/apps/labrinth/.sqlx/query-d772e167886412de93a77f00b4bd5391cb5cccc9cc3f665c511fff95993034b2.json new file mode 100644 index 00000000000..d87ab1378cb --- /dev/null +++ b/apps/labrinth/.sqlx/query-d772e167886412de93a77f00b4bd5391cb5cccc9cc3f665c511fff95993034b2.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET review_status = $2\n WHERE id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Text" + ] + }, + "nullable": [] + }, + "hash": "d772e167886412de93a77f00b4bd5391cb5cccc9cc3f665c511fff95993034b2" +} diff --git a/apps/labrinth/.sqlx/query-e09e0b8f8889bd32f6f2e9d462a1ba6693c70bd0b80b8c8d6f235075dc4a41f9.json b/apps/labrinth/.sqlx/query-e09e0b8f8889bd32f6f2e9d462a1ba6693c70bd0b80b8c8d6f235075dc4a41f9.json new file mode 100644 index 00000000000..824422316df --- /dev/null +++ b/apps/labrinth/.sqlx/query-e09e0b8f8889bd32f6f2e9d462a1ba6693c70bd0b80b8c8d6f235075dc4a41f9.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE mods SET moderation_message = 'Changes required',\n moderation_message_body = 'Resolve the outstanding issue',\n queued = NOW() - INTERVAL '2 days',\n initial_queued = NOW() - INTERVAL '3 days'\n WHERE id = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "e09e0b8f8889bd32f6f2e9d462a1ba6693c70bd0b80b8c8d6f235075dc4a41f9" +} diff --git a/apps/labrinth/.sqlx/query-e107eb02e19c7c376391a968cad9c40b84afd73472cf2f9369b4d5e324485d39.json b/apps/labrinth/.sqlx/query-e107eb02e19c7c376391a968cad9c40b84afd73472cf2f9369b4d5e324485d39.json new file mode 100644 index 00000000000..07e058b196c --- /dev/null +++ b/apps/labrinth/.sqlx/query-e107eb02e19c7c376391a968cad9c40b84afd73472cf2f9369b4d5e324485d39.json @@ -0,0 +1,28 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT review_status AS \"review_status: ProjectReviewStatus\"\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "review_status: ProjectReviewStatus", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_status" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false + ] + }, + "hash": "e107eb02e19c7c376391a968cad9c40b84afd73472cf2f9369b4d5e324485d39" +} diff --git a/apps/labrinth/.sqlx/query-e336369268ac9b136ef0a2233c6c7f54b99ff7467b952013c2550462e2be338b.json b/apps/labrinth/.sqlx/query-e336369268ac9b136ef0a2233c6c7f54b99ff7467b952013c2550462e2be338b.json new file mode 100644 index 00000000000..56189690382 --- /dev/null +++ b/apps/labrinth/.sqlx/query-e336369268ac9b136ef0a2233c6c7f54b99ff7467b952013c2550462e2be338b.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET visibility = $2\n WHERE id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Text" + ] + }, + "nullable": [] + }, + "hash": "e336369268ac9b136ef0a2233c6c7f54b99ff7467b952013c2550462e2be338b" +} diff --git a/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json b/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json deleted file mode 100644 index e42fc661eac..00000000000 --- a/apps/labrinth/.sqlx/query-e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET requested_status = $1\n WHERE (id = $2)\n ", - "describe": { - "columns": [], - "parameters": { - "Left": [ - "Varchar", - "Int8" - ] - }, - "nullable": [] - }, - "hash": "e42e63db3ae4d1d745508b80651494da8738873b98aa608792af19e60b9fb998" -} diff --git a/apps/labrinth/.sqlx/query-e9a188cd8e8eea187e49421bfdfff500f85bfc59ee146e8deb3b146f0351dfda.json b/apps/labrinth/.sqlx/query-e9a188cd8e8eea187e49421bfdfff500f85bfc59ee146e8deb3b146f0351dfda.json new file mode 100644 index 00000000000..9581d4a0d9b --- /dev/null +++ b/apps/labrinth/.sqlx/query-e9a188cd8e8eea187e49421bfdfff500f85bfc59ee146e8deb3b146f0351dfda.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET approved_because = CASE\n WHEN approved IS NULL THEN $2::jsonb\n ELSE approved_because\n END,\n approved = COALESCE(approved, NOW()),\n initial_queued = NULL\n WHERE id = $1\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "e9a188cd8e8eea187e49421bfdfff500f85bfc59ee146e8deb3b146f0351dfda" +} diff --git a/apps/labrinth/.sqlx/query-efc35b5141b6c3727f140ed26f07a1d16b93986ae1f09ddf71c3d3f42b4e3163.json b/apps/labrinth/.sqlx/query-efc35b5141b6c3727f140ed26f07a1d16b93986ae1f09ddf71c3d3f42b4e3163.json new file mode 100644 index 00000000000..39f1ddbe9b4 --- /dev/null +++ b/apps/labrinth/.sqlx/query-efc35b5141b6c3727f140ed26f07a1d16b93986ae1f09ddf71c3d3f42b4e3163.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT jsonb_build_object('done_by', done_by, 'delta', delta) AS \"entry!\"\n FROM project_history WHERE project_id = $1 ORDER BY id\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "entry!", + "type_info": "Jsonb", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + null + ] + }, + "hash": "efc35b5141b6c3727f140ed26f07a1d16b93986ae1f09ddf71c3d3f42b4e3163" +} diff --git a/apps/labrinth/.sqlx/query-f074a026757bd6da50e3b863ef580fadb06d22d67d87ba84f50813c7f4ae16ff.json b/apps/labrinth/.sqlx/query-f074a026757bd6da50e3b863ef580fadb06d22d67d87ba84f50813c7f4ae16ff.json new file mode 100644 index 00000000000..d0eaa50ed9d --- /dev/null +++ b/apps/labrinth/.sqlx/query-f074a026757bd6da50e3b863ef580fadb06d22d67d87ba84f50813c7f4ae16ff.json @@ -0,0 +1,23 @@ +{ + "db_name": "PostgreSQL", + "query": "SELECT to_jsonb(snapshot) AS \"metadata!\" FROM (\n SELECT queued, initial_queued, moderation_message,\n moderation_message_body, approved, approved_because\n FROM mods WHERE id = $1\n ) snapshot", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "metadata!", + "type_info": "Jsonb", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + null + ] + }, + "hash": "f074a026757bd6da50e3b863ef580fadb06d22d67d87ba84f50813c7f4ae16ff" +} diff --git a/apps/labrinth/.sqlx/query-fc3014835732279a9babc06b8db60e2f6bb9d9bc5ca5bd7f0153bdc3220f2d03.json b/apps/labrinth/.sqlx/query-fc3014835732279a9babc06b8db60e2f6bb9d9bc5ca5bd7f0153bdc3220f2d03.json new file mode 100644 index 00000000000..625d0937f14 --- /dev/null +++ b/apps/labrinth/.sqlx/query-fc3014835732279a9babc06b8db60e2f6bb9d9bc5ca5bd7f0153bdc3220f2d03.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE mods SET initial_queued = NOW() - INTERVAL '3 days' WHERE id = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "fc3014835732279a9babc06b8db60e2f6bb9d9bc5ca5bd7f0153bdc3220f2d03" +} diff --git a/apps/labrinth/AGENTS.md b/apps/labrinth/AGENTS.md index bc49e1cc938..a877977359e 100644 --- a/apps/labrinth/AGENTS.md +++ b/apps/labrinth/AGENTS.md @@ -34,6 +34,7 @@ - Running `cd apps/labrinth && cargo run -p labrinth -- --run-background-task index-search` (prefer this if backend is running locally) - Hitting the force reindex admin endpoint - To seed the database locally: `psql postgresql://labrinth:labrinth@localhost/labrinth -f apps/labrinth/fixtures/labrinth-seed-data-202508052143.sql` +- For advisory locks, use `database::advisory_lock::AdvisoryLock` and its `acquire` or `try_acquire` methods instead of raw PostgreSQL advisory-lock queries. Add a variant with a stable, namespaced key for new lock domains, and use the same variant in every code path that must synchronize on that resource. - When writing `sqlx` queries, prefer `r#` raw strings over escaping quotes - When interacting with the Postgres database, prefer using a `ro_pool: ReadOnlyPgPool` when performing read-only operations - After writing a SQL query, run `EXPLAIN ANALYZE` to see how long the query would take to run. Report to the user the estimated performance impact of the query. diff --git a/apps/labrinth/migrations/20261117120000_project_visibility_review_status.sql b/apps/labrinth/migrations/20261117120000_project_visibility_review_status.sql new file mode 100644 index 00000000000..7122fc80099 --- /dev/null +++ b/apps/labrinth/migrations/20261117120000_project_visibility_review_status.sql @@ -0,0 +1,71 @@ +DO $$ +BEGIN + IF EXISTS ( + SELECT 1 FROM mods + WHERE status NOT IN ( + 'approved', 'archived', 'unlisted', 'private', 'draft', + 'processing', 'rejected', 'withheld', 'scheduled' + ) + ) THEN + RAISE EXCEPTION 'cannot migrate projects with unknown statuses'; + END IF; + + IF EXISTS ( + SELECT 1 FROM mods + WHERE status = 'scheduled' + ) THEN + RAISE EXCEPTION 'scheduled projects must be resolved before migrating project statuses'; + END IF; +END; +$$; + +ALTER TABLE mods + ADD COLUMN visibility TEXT, + ADD COLUMN review_status TEXT; + +UPDATE mods +SET visibility = CASE + WHEN status IN ('approved', 'archived') THEN 'listed' + WHEN status IN ('unlisted', 'private') THEN status + WHEN requested_status IN ('unlisted', 'private') THEN requested_status + ELSE 'listed' + END, + review_status = CASE + WHEN status IN ('approved', 'archived', 'unlisted', 'private') THEN 'approved' + WHEN status = 'processing' THEN 'in_review' + ELSE status + END; + +CREATE TABLE project_history ( + id BIGSERIAL PRIMARY KEY, + project_id BIGINT NOT NULL, + done_by BIGINT, + occurred_at TIMESTAMPTZ NOT NULL, + delta JSONB NOT NULL +); + +CREATE INDEX project_history_project_id_id ON project_history (project_id, id); + + +ALTER TABLE mods + ALTER COLUMN visibility SET NOT NULL, + ALTER COLUMN review_status SET NOT NULL, + DROP COLUMN status, + DROP COLUMN requested_status; + +CREATE INDEX mods_review_status ON mods (review_status); + +-- (comment copied from 20261117120000_project_visibility_review_status.sql) +-- +-- The spatial query for retrieving random searchable projects is greatly sped +-- up by this index on a fixture of 1M mods, bringing down the total cost of +-- the query plan and runtime to be comparable to primary key lookups. See the +-- `labrinth::routes::v3::projects::random_projects_get` function and the +-- previous 20250608183828_random-project-index.sql migration for more details. +-- +-- That previous migration created a non-spatial index for the status column which +-- does not get used in the new spatial query, but may still be useful for other +-- queries that filter mods by status. + +CREATE INDEX mods_searchable_ids_gist ON mods USING gist (POINT(id, 0)) + WHERE visibility = 'listed' AND review_status = 'approved'; diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs index c2c095f5afb..e7d69c9f0be 100644 --- a/apps/labrinth/src/auth/checks.rs +++ b/apps/labrinth/src/auth/checks.rs @@ -483,7 +483,7 @@ pub async fn is_visible_organization( // This is meant to match the same projects as the `Project::is_searchable` method, but we're not using // it here because that'd entail pulling in all projects for the organization let has_searchable_projects = sqlx::query_scalar!( - "SELECT TRUE FROM mods WHERE organization_id = $1 AND status IN ('approved', 'archived') LIMIT 1", + "SELECT TRUE FROM mods WHERE organization_id = $1 AND visibility = 'listed' AND review_status = 'approved' LIMIT 1", organization.id as database::models::ids::DBOrganizationId ) .fetch_optional(pool) diff --git a/apps/labrinth/src/background_task.rs b/apps/labrinth/src/background_task.rs index 5852e360fef..0a0a54ece98 100644 --- a/apps/labrinth/src/background_task.rs +++ b/apps/labrinth/src/background_task.rs @@ -161,19 +161,7 @@ pub async fn index_search( } pub async fn release_scheduled(pool: PgPool) -> eyre::Result<()> { - info!("Releasing scheduled versions/projects!"); - - sqlx::query!( - " - UPDATE mods - SET status = requested_status - WHERE status = $1 AND approved < CURRENT_DATE AND requested_status IS NOT NULL - ", - crate::models::projects::ProjectStatus::Scheduled.as_str(), - ) - .execute(&pool) - .await - .wrap_err("failed syncing scheduled releases for projects")?; + info!("Releasing scheduled versions!"); sqlx::query!( " @@ -187,7 +175,7 @@ pub async fn release_scheduled(pool: PgPool) -> eyre::Result<()> { .await .wrap_err("failed syncing scheduled releases for versions")?; - info!("Finished releasing scheduled versions/projects"); + info!("Finished releasing scheduled versions"); Ok(()) } diff --git a/apps/labrinth/src/database/advisory_lock.rs b/apps/labrinth/src/database/advisory_lock.rs index e20ba26ee3b..c33b60c98c6 100644 --- a/apps/labrinth/src/database/advisory_lock.rs +++ b/apps/labrinth/src/database/advisory_lock.rs @@ -2,7 +2,10 @@ use std::fmt::{self, Display, Formatter}; use uuid::Uuid; -use crate::database::{PgTransaction, models::DBFileId}; +use crate::database::{ + PgTransaction, + models::{DBFileId, DBProjectId}, +}; /// A transaction-scoped PostgreSQL advisory lock used by Labrinth. /// @@ -15,6 +18,7 @@ pub enum AdvisoryLock { DelphiScan(Uuid), DiscordRoleEmailCampaign, PayPalAccount(String), + ProjectState(DBProjectId), } impl AdvisoryLock { @@ -65,6 +69,9 @@ impl Display for AdvisoryLock { Self::PayPalAccount(payer_id) => { write!(formatter, "labrinth:paypal-account:{payer_id}") } + Self::ProjectState(project_id) => { + write!(formatter, "labrinth:project-state:{}", project_id.0) + } } } } diff --git a/apps/labrinth/src/database/models/moderation_lock_item.rs b/apps/labrinth/src/database/models/moderation_lock_item.rs index a3b4aea98d8..413fca89e70 100644 --- a/apps/labrinth/src/database/models/moderation_lock_item.rs +++ b/apps/labrinth/src/database/models/moderation_lock_item.rs @@ -119,10 +119,13 @@ impl DBModerationLock { } /// Get lock status for a project, including moderator username - pub async fn get_with_user( + pub async fn get_with_user<'a, E>( project_id: DBProjectId, - pool: &PgPool, - ) -> Result, sqlx::Error> { + executor: E, + ) -> Result, sqlx::Error> + where + E: crate::database::Executor<'a, Database = sqlx::Postgres>, + { let row = sqlx::query!( r#" SELECT @@ -137,7 +140,7 @@ impl DBModerationLock { "#, project_id as DBProjectId ) - .fetch_optional(pool) + .fetch_optional(executor) .await?; Ok(row.map(|r| { diff --git a/apps/labrinth/src/database/models/project_flag_item.rs b/apps/labrinth/src/database/models/project_flag_item.rs index 87ebc61df6a..6e8ceb5909c 100644 --- a/apps/labrinth/src/database/models/project_flag_item.rs +++ b/apps/labrinth/src/database/models/project_flag_item.rs @@ -666,7 +666,7 @@ impl DBProjectFlagRun { pub async fn queued_project_ids(pool: &PgPool) -> Result> { let ids = sqlx::query_scalar!( - r#"SELECT id FROM mods WHERE status = 'processing'"#, + r#"SELECT id FROM mods WHERE review_status = 'in_review'"#, ) .fetch_all(pool) .await diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs index 8c97e3d744f..29a7e3b8894 100644 --- a/apps/labrinth/src/database/models/project_item.rs +++ b/apps/labrinth/src/database/models/project_item.rs @@ -7,7 +7,8 @@ use crate::models::exp::minecraft::{Environment, MrpackLoader}; use crate::models::ids::ProjectId; use crate::models::link_platform::LinkPlatform; use crate::models::projects::{ - MonetizationStatus, ProjectStatus, SideTypesMigrationReviewStatus, + MonetizationStatus, ProjectDelta, ProjectReviewStatus, ProjectStatus, + ProjectVisibility, ReviewStatusProvenance, SideTypesMigrationReviewStatus, }; use ariadne::ids::base62_impl::parse_base62; use chrono::{DateTime, Utc}; @@ -230,6 +231,7 @@ pub struct ProjectBuilder { impl ProjectBuilder { pub async fn insert( self, + created_by: DBUserId, transaction: &mut PgTransaction<'_>, redis: &RedisPool, file_host: &dyn FileHost, @@ -270,7 +272,7 @@ impl ProjectBuilder { components: self.components, }; project_struct - .insert(&mut *transaction) + .insert(created_by, &mut *transaction) .await .wrap_err("inserting project")?; @@ -361,15 +363,140 @@ pub struct DBProject { } impl DBProject { + /// Updates visibility and records a typed delta in the caller's transaction. + /// Returns whether anything changed. Callers handle authorization and invalidate + /// the project cache after committing the transaction. + pub async fn update_visibility( + id: DBProjectId, + visibility: ProjectVisibility, + done_by: Option, + transaction: &mut PgTransaction<'_>, + ) -> Result { + let previous = sqlx::query!( + r#" + SELECT visibility AS "visibility: ProjectVisibility" + FROM mods + WHERE id = $1 + FOR UPDATE + "#, + id as DBProjectId, + ) + .fetch_one(&mut *transaction) + .await + .wrap_err("locking project visibility")?; + + if previous.visibility == visibility { + return Ok(false); + } + let delta = ProjectDelta::Visibility { + from: previous.visibility, + to: visibility, + }; + + sqlx::query!( + r#" + UPDATE mods + SET visibility = $2 + WHERE id = $1 + "#, + id as DBProjectId, + visibility.as_str(), + ) + .execute(&mut *transaction) + .await + .wrap_err("updating project visibility")?; + + Self::record_delta(id, done_by, delta, transaction).await?; + Ok(true) + } + + /// Updates review status and records its provenance in the caller's transaction. + /// Returns whether anything changed. Callers handle authorization and invalidate + /// the project cache after committing the transaction. + pub async fn update_review_status( + id: DBProjectId, + review_status: ProjectReviewStatus, + done_by: Option, + provenance: &ReviewStatusProvenance, + transaction: &mut PgTransaction<'_>, + ) -> Result { + let previous = sqlx::query!( + r#" + SELECT review_status AS "review_status: ProjectReviewStatus" + FROM mods + WHERE id = $1 + FOR UPDATE + "#, + id as DBProjectId, + ) + .fetch_one(&mut *transaction) + .await + .wrap_err("locking project review status")?; + + if previous.review_status == review_status { + return Ok(false); + } + let delta = ProjectDelta::ReviewStatus { + from: previous.review_status, + to: review_status, + because: provenance.clone(), + }; + + sqlx::query!( + r#" + UPDATE mods + SET review_status = $2 + WHERE id = $1 + "#, + id as DBProjectId, + review_status.as_str(), + ) + .execute(&mut *transaction) + .await + .wrap_err("updating project review status")?; + + Self::record_delta(id, done_by, delta, transaction).await?; + Ok(true) + } + + pub(crate) async fn record_delta( + id: DBProjectId, + done_by: Option, + delta: ProjectDelta, + transaction: &mut PgTransaction<'_>, + ) -> Result<()> { + sqlx::query!( + r#" + INSERT INTO project_history (project_id, done_by, occurred_at, delta) + VALUES ($1, $2, clock_timestamp(), $3) + "#, + id as DBProjectId, + done_by.map(|id| id.0), + sqlx::types::Json(delta) as _, + ) + .execute(&mut *transaction) + .await + .wrap_err("recording project history")?; + + Ok(()) + } + pub async fn insert( &self, + created_by: DBUserId, transaction: &mut PgTransaction<'_>, ) -> Result<()> { + let visibility = + self.status.requested_visibility(self.requested_status); + let review_status = self.status.review_status().ok_or_else(|| { + eyre::eyre!("unsupported legacy project status `{}`", self.status) + })?; + sqlx::query!( - " + r#" INSERT INTO mods ( id, team_id, name, summary, description, - published, downloads, icon_url, raw_icon_url, status, requested_status, + published, downloads, icon_url, raw_icon_url, visibility, review_status, license_url, license, slug, color, monetization_status, organization_id, side_types_migration_review_status, @@ -383,7 +510,7 @@ impl DBProject { $18, $19 ) - ", + "#, self.id as DBProjectId, self.team_id as DBTeamId, &self.name, @@ -393,8 +520,8 @@ impl DBProject { self.downloads, self.icon_url.as_ref(), self.raw_icon_url.as_ref(), - self.status.as_str(), - self.requested_status.map(|x| x.as_str()), + visibility.as_str(), + review_status.as_str(), self.license_url.as_ref(), &self.license, self.slug.as_ref(), @@ -408,11 +535,23 @@ impl DBProject { .await .wrap_err("inserting project")?; + Self::record_delta( + self.id, + Some(created_by), + ProjectDelta::Created { + visibility, + review_status, + }, + transaction, + ) + .await?; + Ok(()) } pub async fn remove( id: DBProjectId, + done_by: DBUserId, transaction: &mut PgTransaction<'_>, redis: &RedisPool, ) -> Result> { @@ -564,6 +703,14 @@ impl DBProject { .await .wrap_err("deleting team")?; + Self::record_delta( + id, + Some(done_by), + ProjectDelta::Deleted, + transaction, + ) + .await?; + Ok(Some(())) } else { Ok(None) @@ -827,7 +974,9 @@ impl DBProject { r#" SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows, m.icon_url icon_url, m.raw_icon_url raw_icon_url, m.description description, m.published published, - m.approved approved, m.queued, m.status status, m.requested_status requested_status, + m.approved approved, m.queued, + m.visibility AS "visibility: ProjectVisibility", + m.review_status AS "review_status: ProjectReviewStatus", m.license_url license_url, m.team_id team_id, m.organization_id organization_id, m.license license, m.slug slug, m.moderation_message moderation_message, m.moderation_message_body moderation_message_body, m.webhook_sent, m.color, @@ -909,13 +1058,14 @@ impl DBProject { published: m.published, updated: versions.iter().map(|x| x.1).next_back().unwrap_or(m.published), license_url: m.license_url.clone(), - status: ProjectStatus::from_string( - &m.status, + status: ProjectStatus::from_visibility_review_status( + m.visibility, + m.review_status, ), - requested_status: m - .requested_status - .as_deref() - .map(ProjectStatus::from_string), + requested_status: Some(ProjectStatus::from_visibility_review_status( + m.visibility, + ProjectReviewStatus::Approved, + )), license: m.license.clone(), slug: m.slug.clone(), description: m.description.clone(), diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs index e274b51882d..92a4eb13b6e 100644 --- a/apps/labrinth/src/database/models/user_item.rs +++ b/apps/labrinth/src/database/models/user_item.rs @@ -9,7 +9,9 @@ use crate::database::models::user_subscription_item::DBUserSubscription; use crate::database::{PgTransaction, models}; use crate::models::billing::ChargeStatus; use crate::models::pats::Scopes; -use crate::models::projects::ProjectStatus; +use crate::models::projects::{ + ProjectReviewStatus, ProjectStatus, ReviewStatusProvenance, +}; use crate::models::threads::MessageBody; use crate::models::users::Badges; use ariadne::ids::base62_impl::{parse_base62, to_base62}; @@ -738,7 +740,7 @@ impl DBUser { r#" SELECT m.id AS "id!", - m.status AS "status!", + m.review_status AS "review_status!: ProjectReviewStatus", m.slug, t.id AS "thread_id!" FROM mods m @@ -777,9 +779,7 @@ impl DBUser { "failed to insert project transfer thread message", )?; - if ProjectStatus::from_string(&project.status) - == ProjectStatus::Processing - { + if project.review_status == ProjectReviewStatus::InReview { ThreadMessageBuilder { author_id: Some(deleted_user), body: MessageBody::Text { @@ -814,16 +814,17 @@ impl DBUser { "failed to insert automatic rejection status change", )?; - sqlx::query!( - r#" - UPDATE mods - SET status = $1 - WHERE id = $2 - "#, - ProjectStatus::Rejected.as_str(), - project.id, + models::DBProject::update_review_status( + DBProjectId(project.id), + ProjectReviewStatus::Rejected, + None, + &ReviewStatusProvenance::System { + reason: format!( + "project owner `{username}` (`{user_id_str}`) was deleted" + ), + }, + transaction, ) - .execute(&mut *transaction) .await .wrap_err( "failed to reject processing project owned by deleted user", diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs index 2c1e0e6b79f..73e16ad7d5b 100644 --- a/apps/labrinth/src/models/v3/projects.rs +++ b/apps/labrinth/src/models/v3/projects.rs @@ -43,6 +43,104 @@ pub enum AutoApprovalCause { GlobalVerdictsUpdated { user_id: UserId }, } +#[derive( + Debug, + Clone, + Copy, + PartialEq, + Eq, + Serialize, + Deserialize, + sqlx::Type, + utoipa::ToSchema, +)] +#[serde(rename_all = "snake_case")] +#[sqlx(type_name = "text", rename_all = "snake_case")] +pub enum ProjectVisibility { + Listed, + Unlisted, + Private, +} + +impl ProjectVisibility { + pub fn as_str(self) -> &'static str { + match self { + Self::Listed => "listed", + Self::Unlisted => "unlisted", + Self::Private => "private", + } + } +} + +#[derive( + Debug, + Clone, + Copy, + PartialEq, + Eq, + Serialize, + Deserialize, + sqlx::Type, + utoipa::ToSchema, +)] +#[serde(rename_all = "snake_case")] +#[sqlx(type_name = "text", rename_all = "snake_case")] +pub enum ProjectReviewStatus { + Draft, + InReview, + Approved, + Rejected, + Withheld, +} + +impl ProjectReviewStatus { + pub fn as_str(self) -> &'static str { + match self { + Self::Draft => "draft", + Self::InReview => "in_review", + Self::Approved => "approved", + Self::Rejected => "rejected", + Self::Withheld => "withheld", + } + } +} + +/// Why a project status transition occurred, including evidence for automatic approval. +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "kind", rename_all = "snake_case")] +pub enum ReviewStatusProvenance { + ByUser { + reason: Option, + }, + System { + reason: String, + }, + AutoApproval { + trigger: AutoApprovalCause, + resolved_issue_ids: Vec, + }, +} + +/// A typed change recorded in a project's history. +#[derive(Debug, Clone, Serialize, Deserialize)] +#[serde(tag = "kind", rename_all = "snake_case")] +pub enum ProjectDelta { + Deleted, + Created { + visibility: ProjectVisibility, + review_status: ProjectReviewStatus, + }, + Visibility { + from: ProjectVisibility, + to: ProjectVisibility, + }, + ReviewStatus { + from: ProjectReviewStatus, + to: ProjectReviewStatus, + because: ReviewStatusProvenance, + }, +} + /// A project returned from the API #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] pub struct Project { @@ -560,6 +658,39 @@ impl std::fmt::Display for ProjectStatus { } impl ProjectStatus { + /// Maps legacy publication states to visibility; non-publication states have no visibility. + pub fn visibility(self) -> Option { + crate::util::legacy_project_status::decode(self) + .ok() + .and_then(|meaning| meaning.visibility) + } + + /// Resolves legacy status and requested status using the storage migration's precedence. + pub fn requested_visibility( + self, + requested_status: Option, + ) -> ProjectVisibility { + self.visibility() + .or_else(|| requested_status.and_then(Self::visibility)) + .unwrap_or(ProjectVisibility::Listed) + } + + /// Scheduled and unknown legacy states cannot be represented in the new review workflow. + pub fn review_status(self) -> Option { + crate::util::legacy_project_status::decode(self) + .ok() + .map(|meaning| meaning.review_status) + } + + /// Projects new storage states onto the legacy API status. + pub fn from_visibility_review_status( + visibility: ProjectVisibility, + review_status: ProjectReviewStatus, + ) -> Self { + crate::util::legacy_project_status::encode(visibility, review_status) + .status + } + pub fn from_string(string: &str) -> ProjectStatus { match string { "processing" => ProjectStatus::Processing, diff --git a/apps/labrinth/src/queue/server_ping.rs b/apps/labrinth/src/queue/server_ping.rs index 3e59b537cef..30a70eff3bc 100644 --- a/apps/labrinth/src/queue/server_ping.rs +++ b/apps/labrinth/src/queue/server_ping.rs @@ -3,7 +3,6 @@ use crate::database::models::DBProjectId; use crate::env::ENV; use crate::models::exp; use crate::models::ids::ProjectId; -use crate::models::projects::ProjectStatus; use crate::search::incremental::IncrementalSearchQueue; use crate::{database::PgPool, util::error::Context}; use async_minecraft_ping::ServerDescription; @@ -217,13 +216,9 @@ impl ServerPingQueue { SELECT id, components AS "components: Json" FROM mods WHERE - status = ANY($1) + review_status = 'approved' AND components ? 'minecraft_java_server' "#, - &ProjectStatus::iterator() - .filter(|s| s.is_approved()) - .map(|s| s.to_string()) - .collect::>() ) .fetch_all(&self.db) .await diff --git a/apps/labrinth/src/routes/internal/moderation/mod.rs b/apps/labrinth/src/routes/internal/moderation/mod.rs index 2c365a33eb6..0cf717f191f 100644 --- a/apps/labrinth/src/routes/internal/moderation/mod.rs +++ b/apps/labrinth/src/routes/internal/moderation/mod.rs @@ -311,7 +311,7 @@ pub async fn get_projects_internal( m.components FROM mods m WHERE - m.status = $1 + m.review_status = $1 AND ( $9::boolean = false OR NOT EXISTS ( @@ -449,8 +449,18 @@ pub async fn get_projects_internal( m.name, m.summary, m.icon_url, - m.status, - m.requested_status, + CASE m.review_status + WHEN 'approved' THEN CASE m.visibility + WHEN 'listed' THEN 'approved' + ELSE m.visibility + END + WHEN 'in_review' THEN 'processing' + ELSE m.review_status + END AS status, + CASE m.visibility + WHEN 'listed' THEN 'approved' + ELSE m.visibility + END AS requested_status, m.queued, m.initial_queued, m.published, @@ -511,7 +521,7 @@ pub async fn get_projects_internal( CASE WHEN $8 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST, page_projects.id ASC "#, - ProjectStatus::Processing.as_str(), + "in_review", &listed_version_statuses, query, project_type, @@ -568,7 +578,7 @@ pub async fn get_projects_internal( m.published FROM mods m WHERE - m.status = $1 + m.review_status = $1 AND ( $6::boolean = false OR NOT EXISTS ( @@ -626,8 +636,18 @@ pub async fn get_projects_internal( m.name, m.summary, m.icon_url, - m.status, - m.requested_status, + CASE m.review_status + WHEN 'approved' THEN CASE m.visibility + WHEN 'listed' THEN 'approved' + ELSE m.visibility + END + WHEN 'in_review' THEN 'processing' + ELSE m.review_status + END AS status, + CASE m.visibility + WHEN 'listed' THEN 'approved' + ELSE m.visibility + END AS requested_status, m.queued, m.initial_queued, m.published, @@ -697,7 +717,7 @@ pub async fn get_projects_internal( CASE WHEN $5 = 'oldest' THEN COALESCE(page_projects.queued, page_projects.published) END ASC NULLS LAST, page_projects.id ASC "#, - ProjectStatus::Processing.as_str(), + "in_review", &listed_version_statuses, count, offset, @@ -805,7 +825,7 @@ pub async fn get_project_ids( m.components FROM mods m WHERE - m.status = $1 + m.review_status = $1 AND ( $7::boolean = false OR NOT EXISTS ( @@ -912,7 +932,7 @@ pub async fn get_project_ids( CASE WHEN $6 IN ('oldest', 'most_external_deps', 'least_external_deps') THEN COALESCE(queued, published) END ASC NULLS LAST, id ASC "#, - ProjectStatus::Processing.as_str(), + "in_review", &listed_version_statuses, query, project_type, @@ -934,7 +954,7 @@ pub async fn get_project_ids( SELECT id FROM mods WHERE - status = $1 + review_status = $1 AND ( $3::boolean = false OR NOT EXISTS ( @@ -949,7 +969,7 @@ pub async fn get_project_ids( CASE WHEN $2 = 'oldest' THEN COALESCE(queued, published) END ASC NULLS LAST, id ASC "#, - ProjectStatus::Processing.as_str(), + "in_review", sort, exclude_technical_review, ) @@ -1593,7 +1613,7 @@ pub async fn get_lock_status( let db_project_id = project.inner.id; let db_user_id = database::models::DBUserId::from(user.id); - let lock = DBModerationLock::get_with_user(db_project_id, &pool) + let lock = DBModerationLock::get_with_user(db_project_id, &**pool) .await .wrap_internal_err("fetching moderation lock from database")?; Ok(web::Json(lock_status_response(lock, db_user_id))) diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs index f6a0a86447a..145fdd67719 100644 --- a/apps/labrinth/src/routes/internal/moderation/tech_review.rs +++ b/apps/labrinth/src/routes/internal/moderation/tech_review.rs @@ -32,7 +32,10 @@ use crate::{ models::{ ids::{FileId, ProjectId, ThreadId, ThreadMessageId, VersionId}, pats::Scopes, - projects::{Project, ProjectStatus}, + projects::{ + Project, ProjectReviewStatus, ProjectStatus, ProjectVisibility, + ReviewStatusProvenance, + }, threads::{MessageBody, Thread}, }, queue::session::AuthQueue, @@ -849,8 +852,21 @@ pub async fn search_projects( ) ) ) - AND m.status NOT IN ('draft', 'rejected', 'withheld') - AND (cardinality($6::text[]) = 0 OR m.status = ANY($6::text[])) + AND m.review_status NOT IN ('draft', 'rejected', 'withheld') + AND ( + cardinality($6::text[]) = 0 + OR CASE m.review_status + WHEN 'draft' THEN 'draft' + WHEN 'in_review' THEN 'processing' + WHEN 'rejected' THEN 'rejected' + WHEN 'withheld' THEN 'withheld' + WHEN 'approved' THEN CASE m.visibility + WHEN 'listed' THEN 'approved' + WHEN 'unlisted' THEN 'unlisted' + WHEN 'private' THEN 'private' + END + END = ANY($6::text[]) + ) AND ( cardinality($7::text[]) = 0 OR EXISTS ( @@ -1101,6 +1117,8 @@ pub struct SubmitReport { pub verdict: DelphiVerdict, /// Moderator message to send to the thread when rejecting the project. pub message: Option, + /// Explanation recorded in project history when rejecting the project. + pub reason: Option, } /// Submit a technical review verdict. @@ -1251,40 +1269,41 @@ pub async fn submit_report( .wrap_internal_err("failed to add tech review message")?; if verdict == DelphiVerdict::Unsafe { - let record = sqlx::query!( + let previous = sqlx::query!( r#" - WITH old AS ( - SELECT id, status - FROM mods - WHERE id = $2 - ), - updated AS ( - UPDATE mods - SET status = $1 - FROM threads t - WHERE - mods.id = $2 - AND t.mod_id = mods.id - RETURNING mods.id, t.id AS thread_id - ) SELECT - updated.thread_id AS "thread_id: DBThreadId", - old.status AS "old_status!" - FROM updated - INNER JOIN old ON old.id = updated.id + visibility AS "visibility: ProjectVisibility", + review_status AS "review_status: ProjectReviewStatus" + FROM mods + WHERE id = $1 "#, - ProjectStatus::Rejected.as_str(), project_id as _, ) .fetch_one(&mut txn) .await + .wrap_internal_err("fetching project status before rejection")?; + let old_status = ProjectStatus::from_visibility_review_status( + previous.visibility, + previous.review_status, + ); + + DBProject::update_review_status( + project_id, + ProjectReviewStatus::Rejected, + Some(user.user.id.into()), + &ReviewStatusProvenance::ByUser { + reason: submit_report.reason, + }, + &mut txn, + ) + .await .wrap_internal_err("failed to mark project as rejected")?; ThreadMessageBuilder { author_id: Some(user.user.id.into()), body: MessageBody::StatusChange { new_status: ProjectStatus::Rejected, - old_status: ProjectStatus::from_string(&record.old_status), + old_status, }, thread_id: record.thread_id, hide_identity: user.scopes.contains(Scopes::MODERATION_WRITE), diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review/rules.rs b/apps/labrinth/src/routes/internal/moderation/tech_review/rules.rs index 07cbcf5c9a6..50d751e98b4 100644 --- a/apps/labrinth/src/routes/internal/moderation/tech_review/rules.rs +++ b/apps/labrinth/src/routes/internal/moderation/tech_review/rules.rs @@ -474,7 +474,7 @@ pub async fn get_rule_affected_details( INNER JOIN mods project ON project.id = version.mod_id WHERE detail.id = effect.detail_id - AND project.status = 'processing' + AND project.review_status = 'in_review' ) ) "#, @@ -514,7 +514,7 @@ pub async fn get_rule_affected_details( LEFT JOIN mods project ON project.id = version.mod_id WHERE effect.rule_id = $1 - AND (NOT $2 OR project.status = 'processing') + AND (NOT $2 OR project.review_status = 'in_review') ORDER BY effect.detail_id DESC LIMIT $3 OFFSET $4 "#, diff --git a/apps/labrinth/src/routes/v2/openapi.rs b/apps/labrinth/src/routes/v2/openapi.rs index 31af5794b4e..8c55bc80b56 100644 --- a/apps/labrinth/src/routes/v2/openapi.rs +++ b/apps/labrinth/src/routes/v2/openapi.rs @@ -32,6 +32,7 @@ use utoipa::openapi::{RefOr, Response}; projects::project_get, projects::project_get_check, projects::project_edit, + crate::routes::v3::projects::review_state::project_review_state, projects::project_icon_edit, projects::delete_project_icon, projects::add_gallery_item, diff --git a/apps/labrinth/src/routes/v2/projects.rs b/apps/labrinth/src/routes/v2/projects.rs index e91fcc468da..becd280f4d9 100644 --- a/apps/labrinth/src/routes/v2/projects.rs +++ b/apps/labrinth/src/routes/v2/projects.rs @@ -37,6 +37,7 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) { .service(project_get_check) .service(project_delete) .service(project_edit) + .service(v3::projects::review_state::project_review_state) .service(project_icon_edit) .service(delete_project_icon) .service(add_gallery_item) @@ -575,6 +576,7 @@ pub struct EditProject { regex(path = *crate::util::validate::RE_URL_SAFE) )] pub slug: Option, + pub visibility: Option, pub status: Option, #[serde( default, @@ -582,6 +584,7 @@ pub struct EditProject { with = "::serde_with::rust::double_option" )] pub requested_status: Option>, + #[serde( default, skip_serializing_if = "Option::is_none", @@ -599,6 +602,55 @@ pub struct EditProject { pub monetization_status: Option, } +fn legacy_patch_state( + status: Option, + requested_status: Option>, + current_review: crate::models::projects::ProjectReviewStatus, +) -> Result< + ( + Option, + Option, + ), + ApiError, +> { + use crate::models::projects::{ProjectReviewStatus, ProjectVisibility}; + use crate::util::legacy_project_status::{ + decode, decode_requested_visibility, + }; + + let meaning = status + .map(decode) + .transpose() + .wrap_request_err("decoding legacy project status")?; + let requested_visibility = requested_status + .map(|requested| { + requested.map(decode_requested_visibility).transpose().map( + |visibility| visibility.unwrap_or(ProjectVisibility::Listed), + ) + }) + .transpose() + .wrap_request_err("decoding legacy requested status")?; + let effective_review = meaning + .filter(|meaning| !meaning.archived) + .map_or(current_review, |meaning| meaning.review_status); + let visibility = meaning + .filter(|meaning| !meaning.archived) + .and_then(|meaning| meaning.visibility) + .or_else(|| { + (effective_review != ProjectReviewStatus::Approved) + .then_some(requested_visibility) + .flatten() + }); + let review_status = meaning + .filter(|meaning| !meaning.archived) + .map(|meaning| meaning.review_status) + .filter(|review| { + !(*review == ProjectReviewStatus::Approved + && current_review == ProjectReviewStatus::Approved) + }); + Ok((visibility, review_status)) +} + /// Update a project. #[utoipa::path( context_path = "/project", @@ -647,10 +699,35 @@ pub async fn project_edit( return Ok(response); } + let user = crate::auth::get_user_from_headers( + &req, + &**pool, + &redis, + &session_queue, + Scopes::PROJECT_WRITE, + ) + .await + .wrap_auth_err("authenticating API request")?; + let v2_new_project = new_project.into_inner(); let client_side = v2_new_project.client_side; let server_side = v2_new_project.server_side; - let new_slug = v2_new_project.slug.clone(); + let project = project_item::DBProject::get(&info.0, &**pool, &redis) + .await + .wrap_internal_err("fetching project before legacy edits")? + .wrap_not_found_err("resource not found")?; + let project_id = + crate::models::ids::ProjectId::from(project.inner.id).to_string(); + let (visibility, review_status) = legacy_patch_state( + v2_new_project.status, + v2_new_project.requested_status, + project.inner.status.review_status().ok_or_else(|| { + ApiError::Request(eyre::eyre!("unsupported current project status")) + })?, + )?; + let archive_status = v2_new_project + .status + .map(|status| status == ProjectStatus::Archived); // TODO: Some kind of handling here to ensure project type is fine. // We expect the version uploaded to be of loader type modpack, but there might not be a way to check here for that. @@ -741,8 +818,8 @@ pub async fn project_edit( link_urls: (!new_links.is_empty()).then_some(new_links), license_id: v2_new_project.license_id, slug: v2_new_project.slug, - status: v2_new_project.status, - requested_status: v2_new_project.requested_status, + visibility: visibility.or(v2_new_project.visibility), + moderation_message: v2_new_project.moderation_message, moderation_message_body: v2_new_project.moderation_message_body, monetization_status: v2_new_project.monetization_status, @@ -755,17 +832,15 @@ pub async fn project_edit( }; // This returns 204 or failure so we don't need to do anything with it - let project_id = info.clone().0; let mut response = v3::projects::project_edit_internal( minecraft_meta.clone(), req.clone(), - info, + web::Path::from((project_id.clone(),)), pool.clone(), web::Json(new_project), redis.clone(), session_queue.clone(), search_state.clone(), - true, ) .await .or_else(v2_reroute::flatten_404_error)?; @@ -775,13 +850,10 @@ pub async fn project_edit( if response.status().is_success() && (client_side.is_some() || server_side.is_some()) { - let project_item = project_item::DBProject::get( - &new_slug.unwrap_or(project_id), - &**pool, - &redis, - ) - .await - .wrap_internal_err("fetching project from database")?; + let project_item = + project_item::DBProject::get(&project_id, &**pool, &redis) + .await + .wrap_internal_err("fetching project from database")?; let version_ids = project_item.map(|x| x.versions).unwrap_or_default(); let versions = version_item::DBVersion::get_many(&version_ids, &**pool, &redis) @@ -826,8 +898,139 @@ pub async fn project_edit( ) .await .wrap_api_err("editing project")?; + if !response.status().is_success() { + return Ok(response); + } + } + } + if !response.status().is_success() { + return Ok(response); + } + if let Some(archived) = archive_status { + let (member, organization_member) = + db_models::DBTeamMember::get_for_project_permissions( + &project.inner, + user.user.id.into(), + &**pool, + ) + .await + .wrap_internal_err("fetching project permissions")?; + if !crate::models::teams::ProjectPermissions::get_permissions_by_scopes( + user.scopes, + &member, + &organization_member, + ) + .is_some_and(|permissions| { + permissions.contains( + crate::models::teams::ProjectPermissions::EDIT_DETAILS, + ) + }) { + return Err(ApiError::Auth(eyre::eyre!( + "you do not have permission to edit this project's disclosures" + ))); + } + let locks = + db_models::DBProjectDisclosure::get_lock_statuses_for_project( + project.inner.id, + &["archived".to_owned()], + &**pool, + ) + .await + .wrap_internal_err("fetching archival disclosure lock")?; + let lock_status = locks.get("archived").copied().unwrap_or_default(); + let already_archived = + db_models::DBProjectDisclosure::projects_with_type( + ProjectDisclosureType::Archived, + &[project.inner.id], + &**pool, + ) + .await + .wrap_internal_err("fetching archival disclosure existence")? + .contains(&project.inner.id); + let moderator = user.scopes.contains(Scopes::MODERATION_WRITE); + if archived + && !already_archived + && !moderator + && !lock_status.allows_edit() + { + return Err(ApiError::Auth(eyre::eyre!( + "you cannot modify the locked archival disclosure" + ))); + } + if (archived && !already_archived) + || (!archived && (moderator || lock_status.allows_removal())) + { + let mut transaction = pool.begin().await.wrap_internal_err( + "starting archival disclosure transaction", + )?; + let set_by_moderator = moderator + && (member.is_none() && organization_member.is_none() + || if archived { + !lock_status.allows_edit() + } else { + !lock_status.allows_removal() + }); + if archived { + db_models::DBProjectDisclosure { + project_id: project.inner.id, + disclosure: crate::models::disclosures::ProjectDisclosure::Archived { note: None }, + updated_at: chrono::Utc::now(), + updated_by: user.user.id.into(), + set_by_moderator, + deleted_at: None, + lock_status, + }.upsert(&mut transaction).await.wrap_internal_err("setting archival disclosure")?; + } else { + db_models::DBProjectDisclosure::remove( + project.inner.id, + ProjectDisclosureType::Archived, + user.user.id.into(), + set_by_moderator, + &mut transaction, + ) + .await + .wrap_internal_err("removing archival disclosure")?; + } + let edited_project = + project_item::DBProject::get(&project_id, &**pool, &redis) + .await + .wrap_internal_err("fetching project after legacy edits")? + .wrap_not_found_err("resource not found")?; + v3::projects::mutation::finalize_project_edit( + project.inner.id, + edited_project.inner.status, + edited_project.inner.slug, + false, + false, + transaction, + &pool, + &redis, + Some(&user), + ) + .await?; + search_state + .queue + .push_project_change(project.inner.id.into()) + .await; } } + if let Some(review_status) = review_status { + return v3::projects::review_state::project_review_state_internal( + minecraft_meta, + req, + web::Path::from((project_id,)), + pool, + web::Json(v3::projects::review_state::ReviewStateUpdate { + review_status, + reason: None, + }), + redis, + session_queue, + search_state, + ) + .await + .or_else(v2_reroute::flatten_404_error); + } Ok(response) } @@ -1566,3 +1769,121 @@ pub async fn project_unfollow( .await .or_else(v2_reroute::flatten_404_error) } + +#[cfg(test)] +mod tests { + use super::EditProject; + use serde_json::json; + + #[test] + fn legacy_status_mapping_boundaries() { + use crate::models::projects::{ + ProjectReviewStatus as R, ProjectStatus as S, + ProjectVisibility as V, + }; + let map = super::legacy_patch_state; + for (status, visibility) in [ + (S::Approved, V::Listed), + (S::Unlisted, V::Unlisted), + (S::Private, V::Private), + ] { + assert_eq!( + map(Some(status), None, R::Draft).unwrap(), + (Some(visibility), Some(R::Approved)) + ); + assert_eq!( + map(Some(status), Some(Some(S::Private)), R::Approved).unwrap(), + (Some(visibility), None) + ); + } + for (status, review) in [ + (S::Processing, R::InReview), + (S::Draft, R::Draft), + (S::Rejected, R::Rejected), + (S::Withheld, R::Withheld), + ] { + assert_eq!( + map(Some(status), None, R::Draft).unwrap(), + (None, Some(review)) + ); + } + assert_eq!( + map(Some(S::Archived), None, R::Draft).unwrap(), + (None, None) + ); + for status in [S::Scheduled, S::Unknown] { + assert!(map(Some(status), None, R::Draft).is_err()); + } + assert_eq!( + map(None, Some(None), R::Draft).unwrap(), + (Some(V::Listed), None) + ); + assert_eq!( + map(None, Some(Some(S::Private)), R::Draft).unwrap(), + (Some(V::Private), None) + ); + for (status, review) in [ + (S::Processing, R::InReview), + (S::Rejected, R::Rejected), + (S::Withheld, R::Withheld), + ] { + assert_eq!( + map(Some(status), Some(Some(S::Private)), R::Approved).unwrap(), + (Some(V::Private), Some(review)) + ); + } + assert_eq!( + map(Some(S::Archived), Some(Some(S::Private)), R::Approved) + .unwrap(), + (None, None) + ); + for requested in [None, Some(S::Private), Some(S::Approved)] { + assert_eq!( + map(None, Some(requested), R::Approved).unwrap(), + (None, None) + ); + } + assert!(map(None, Some(Some(S::Scheduled)), R::Draft).is_err()); + let absent: EditProject = serde_json::from_value(json!({})).unwrap(); + assert_eq!(absent.requested_status, None); + } + + #[actix_rt::test] + async fn test_edit_project_schema_excludes_review_status() { + fn has_property(schema: &serde_json::Value, name: &str) -> bool { + schema["properties"].get(name).is_some() + || schema["allOf"].as_array().is_some_and(|schemas| { + schemas.iter().any(|schema| has_property(schema, name)) + }) + } + + let schema = serde_json::to_value( + ::schema(), + ) + .unwrap(); + assert!(has_property(&schema, "visibility")); + assert!(has_property(&schema, "status")); + assert!(has_property(&schema, "requested_status")); + assert!( + !has_property(&schema, "review_status"), + "project PATCH schema must not declare `review_status`: {schema}", + ); + } + + #[actix_rt::test] + async fn test_v2_edit_project_restores_status_fields() { + let patch = json!({ + "visibility": "private", + "status": "processing", + "requested_status": null, + "review_status": "not-a-status", + }); + let edit: EditProject = serde_json::from_value(patch).unwrap(); + let serialized = serde_json::to_value(&edit).unwrap(); + + assert_eq!(serialized["visibility"], "private"); + assert_eq!(serialized["status"], "processing"); + assert_eq!(edit.requested_status, Some(None)); + assert!(serialized.get("review_status").is_none()); + } +} diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs index 951dc854d48..653c2410caf 100644 --- a/apps/labrinth/src/routes/v3/mod.rs +++ b/apps/labrinth/src/routes/v3/mod.rs @@ -99,6 +99,7 @@ pub fn config(cfg: &mut web::ServiceConfig) { projects::validate::validate, projects::project_delete, projects::project_edit, + projects::review_state::project_review_state, projects::project_icon_edit, projects::delete_project_icon, projects::add_gallery_item, diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs index e880286f595..4835c65d899 100644 --- a/apps/labrinth/src/routes/v3/project_creation.rs +++ b/apps/labrinth/src/routes/v3/project_creation.rs @@ -1031,7 +1031,13 @@ async fn project_create_inner( let now = Utc::now(); let id = project_builder_actual - .insert(&mut *transaction, redis, file_host, delphi_scan_files) + .insert( + current_user.user.id.into(), + &mut *transaction, + redis, + file_host, + delphi_scan_files, + ) .await?; DBUser::clear_project_cache(&[current_user.user.id.into()], redis) .await?; diff --git a/apps/labrinth/src/routes/v3/project_creation/new.rs b/apps/labrinth/src/routes/v3/project_creation/new.rs index 9bedeed806f..00e46854c81 100644 --- a/apps/labrinth/src/routes/v3/project_creation/new.rs +++ b/apps/labrinth/src/routes/v3/project_creation/new.rs @@ -349,7 +349,13 @@ pub async fn create( let mut delphi_scan_files = Vec::new(); project_builder - .insert(&mut txn, &redis, &**file_host, &mut delphi_scan_files) + .insert( + user.user.id.into(), + &mut txn, + &redis, + &**file_host, + &mut delphi_scan_files, + ) .await .wrap_internal_err("failed to insert project")?; diff --git a/apps/labrinth/src/routes/v3/projects/mod.rs b/apps/labrinth/src/routes/v3/projects/mod.rs index 4790782c19b..9fab0c57454 100644 --- a/apps/labrinth/src/routes/v3/projects/mod.rs +++ b/apps/labrinth/src/routes/v3/projects/mod.rs @@ -6,29 +6,25 @@ use std::collections::HashMap; use crate::auth::checks::{filter_visible_versions, is_visible_project}; 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, ProjectQueryResult, -}; + +use crate::database::models::project_item::{DBGalleryItem, DBModCategory}; use crate::database::models::thread_item::ThreadMessageBuilder; use crate::database::models::{ - DBModerationLock, DBProjectId, DBTeamMember, ids as db_ids, image_item, + DBProjectId, DBTeamMember, ids as db_ids, image_item, }; use crate::database::{self, models as db_models}; use crate::database::{PgPool, PgTransaction, ReadOnlyPgPool}; -use crate::env::ENV; + use crate::file_hosting::{FileHost, FileHostPublicity}; -use crate::models::disclosures::{ - DisclosureLockStatus, ProjectDisclosure, ProjectDisclosureType, -}; + use crate::models::ids::{ProjectId, VersionId}; use crate::models::images::ImageContext; use crate::models::link_platform::LinkPlatform; -use crate::models::notifications::NotificationBody; + use crate::models::pats::Scopes; use crate::models::projects::{ - ApprovalReason, AutoApprovalCause, MonetizationStatus, Project, - ProjectStatus, SideTypesMigrationReviewStatus, + MonetizationStatus, Project, ProjectDelta, ProjectReviewStatus, + ProjectStatus, ProjectVisibility, SideTypesMigrationReviewStatus, }; use crate::models::teams::{DEFAULT_ROLE, ProjectPermissions}; use crate::models::threads::MessageBody; @@ -57,6 +53,7 @@ use validator::Validate; use xredis::RedisPool; pub mod mutation; +pub mod review_state; pub mod validate; pub fn config(cfg: &mut actix_web::web::ServiceConfig) { @@ -74,6 +71,7 @@ pub fn project_config(cfg: &mut actix_web::web::ServiceConfig) { .service(project_get_check) .service(project_delete) .service(project_edit) + .service(review_state::project_review_state) .service(project_icon_edit) .service(delete_project_icon) .service(add_gallery_item) @@ -155,11 +153,6 @@ pub async fn random_projects_get( .map_err(|err| eyre::eyre!(err)) .wrap_request_err("validating request")?; - let statuses = crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect::>(); - let mut project_ids = if let Some(project_type) = ¶ms.project_type { let fetch_limit = params.count * RANDOM_PROJECT_TYPE_OVERSAMPLE_FACTOR; @@ -171,20 +164,19 @@ pub async fn random_projects_get( SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point ) SELECT id FROM mods - WHERE status = ANY($1) + WHERE visibility = 'listed' AND review_status = 'approved' AND EXISTS ( SELECT 1 FROM versions v INNER JOIN loaders_versions lv ON v.id = lv.version_id INNER JOIN loaders_project_types lpt ON lpt.joining_loader_id = lv.loader_id INNER JOIN project_types pt ON pt.id = lpt.joining_project_type_id - WHERE v.mod_id = mods.id AND pt.name = $3 + WHERE v.mod_id = mods.id AND pt.name = $2 -- prevents decorrelation, so this stops at the first match instead -- of scanning all versions before the outer sort/limit applies OFFSET 0 ) ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point) - LIMIT $2", - &statuses, + LIMIT $1", fetch_limit as i32, project_type, ) @@ -202,10 +194,9 @@ pub async fn random_projects_get( SELECT POINT(RANDOM() * ((SELECT MAX(id) FROM mods) - (SELECT MIN(id) FROM mods) + 1) + (SELECT MIN(id) FROM mods), 0) AS point ) SELECT id FROM mods - WHERE status = ANY($1) + WHERE visibility = 'listed' AND review_status = 'approved' ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point) - LIMIT $2", - &statuses, + LIMIT $1", params.count as i32, ) .fetch(&***ro_pool) @@ -404,13 +395,8 @@ pub struct EditProject { regex(path = *crate::util::validate::RE_URL_SAFE) )] pub slug: Option, - pub status: Option, - #[serde( - default, - skip_serializing_if = "Option::is_none", - with = "::serde_with::rust::double_option" - )] - pub requested_status: Option>, + pub visibility: Option, + #[serde( default, skip_serializing_if = "Option::is_none", @@ -492,7 +478,6 @@ pub async fn project_edit( redis, session_queue, search_state, - false, ) .await } @@ -506,7 +491,6 @@ pub async fn project_edit_internal( redis: web::Data, session_queue: web::Data, search_state: web::Data, - sync_archival_disclosure: bool, ) -> Result { let user = get_user_from_headers( &req, @@ -554,23 +538,14 @@ pub async fn project_edit_internal( ))); }; - let submit_for_review = new_project.status - == Some(ProjectStatus::Processing) - && !user.scopes.contains(Scopes::MODERATION_WRITE); - - if submit_for_review && !perms.contains(ProjectPermissions::EDIT_DETAILS) { - return Err(ApiError::Auth(eyre!( - "you do not have permission to submit this project for review" - ))); - } - let mut transaction = pool .begin() .await .wrap_internal_err("starting database transaction")?; let locked_project = sqlx::query!( r#" - SELECT status, slug + SELECT visibility AS "visibility: ProjectVisibility", + review_status AS "review_status: ProjectReviewStatus", slug FROM mods WHERE id = $1 FOR UPDATE @@ -580,18 +555,12 @@ pub async fn project_edit_internal( .fetch_one(&mut transaction) .await .wrap_internal_err("locking project for editing")?; - project_item.inner.status = - ProjectStatus::from_string(&locked_project.status); + project_item.inner.status = ProjectStatus::from_visibility_review_status( + locked_project.visibility, + locked_project.review_status, + ); project_item.inner.slug = locked_project.slug; - if submit_for_review && project_item.inner.status.is_approved() { - return Err(ApiError::Auth(eyre!( - "you do not have permission to submit this project for review" - ))); - } - - let validate_for_review = submit_for_review; - if let Some(name) = &new_project.name { if !perms.contains(ProjectPermissions::EDIT_DETAILS) { return Err(ApiError::Auth(eyre::eyre!( @@ -634,311 +603,20 @@ pub async fn project_edit_internal( .wrap_internal_err("querying database for `project_edit_internal`")?; } - if let Some(status) = &new_project.status - && !submit_for_review - { + if let Some(visibility) = new_project.visibility { if !perms.contains(ProjectPermissions::EDIT_DETAILS) { - return Err(ApiError::Auth(eyre::eyre!( - "You do not have the permissions to edit the status of this project!", - ))); - } - - let archival_disclosure = - db_models::DBProjectDisclosure::get_many_for_project( - project_item.inner.id, - false, - &mut transaction, - ) - .await - .wrap_internal_err("failed to fetch project disclosures")? - .into_iter() - .find(|disclosure| { - matches!( - disclosure.disclosure, - ProjectDisclosure::Archived { .. } - ) - }); - let has_archived_disclosure = archival_disclosure.is_some(); - - if status == &ProjectStatus::Archived { - if !has_archived_disclosure { - db_models::DBProjectDisclosure { - project_id: project_item.inner.id, - disclosure: ProjectDisclosure::Archived { note: None }, - updated_at: Utc::now(), - updated_by: user.user.id.into(), - set_by_moderator: user - .scopes - .contains(Scopes::MODERATION_WRITE), - deleted_at: None, - lock_status: DisclosureLockStatus::Unlocked, - } - .upsert(&mut transaction) - .await - .wrap_internal_err("failed to upsert archival disclosure")?; - } - } else { - if !(user.scopes.contains(Scopes::MODERATION_WRITE) - || !project_item.inner.status.is_approved() - && status == &ProjectStatus::Processing - || project_item.inner.status.is_approved() - && status.can_be_requested()) - { - return Err(ApiError::Auth(eyre::eyre!( - "You don't have permission to set this status!", - ))); - } - - // If a moderator (non-admin) is completing a review while another moderator holds an - // active checklist lock, block them from changing the project status. - if user.scopes.contains(Scopes::MODERATION_WRITE) - && !user.scopes.contains(Scopes::ADMIN_WRITE) - && project_item.inner.status == ProjectStatus::Processing - && status != &ProjectStatus::Processing - && let Some(lock) = DBModerationLock::get_with_user( - project_item.inner.id, - &pool, - ) - .await - .wrap_internal_err("fetching moderation lock from database")? - && lock.moderator_id != db_ids::DBUserId::from(user.user.id) - && !lock.expired - { - return Err(ApiError::Auth(eyre::eyre!(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 { - sqlx::query!( - " - UPDATE mods - SET - moderation_message = NULL, - moderation_message_body = NULL, - queued = NOW(), - initial_queued = COALESCE(initial_queued, NOW()) - WHERE (id = $1) - ", - id as db_ids::DBProjectId, - ) - .execute(&mut transaction) - .await - .wrap_internal_err( - "querying database for `project_edit_internal`", - )?; - } - - if status.is_approved() && !project_item.inner.status.is_approved() - { - let reason = - serde_json::to_value(ApprovalReason::ByUser(user.user.id)) - .wrap_internal_err( - "serializing project approval reason", - )?; - sqlx::query!( - " - UPDATE mods - SET approved_because = CASE - WHEN approved IS NULL THEN $2::jsonb - ELSE approved_because - END, - approved = COALESCE(approved, NOW()), - initial_queued = NULL - WHERE id = $1 - ", - id as db_ids::DBProjectId, - reason, - ) - .execute(&mut transaction) - .await - .wrap_internal_err( - "querying database for `project_edit_internal`", - )?; - } - - if status.is_searchable() - && !project_item.inner.webhook_sent - && !ENV.PUBLIC_DISCORD_WEBHOOK.is_empty() - && project_item.inner.components.minecraft_server.is_none() - { - crate::util::webhook::send_discord_webhook( - &minecraft_meta, - project_item.inner.id.into(), - &pool, - &redis, - &ENV.PUBLIC_DISCORD_WEBHOOK, - None, - ) - .await - .ok(); - - sqlx::query!( - " - UPDATE mods - SET webhook_sent = TRUE - WHERE id = $1 - ", - id as db_ids::DBProjectId, - ) - .execute(&mut transaction) - .await - .wrap_internal_err( - "querying database for `project_edit_internal`", - )?; - } - - if user.scopes.contains(Scopes::MODERATION_WRITE) - && !ENV.MODERATION_SLACK_WEBHOOK.is_empty() - { - crate::util::webhook::send_slack_project_webhook( - &minecraft_meta, - project_item.inner.id.into(), - &pool, - &redis, - &ENV.MODERATION_SLACK_WEBHOOK, - Some( - format!( - "*<{}/user/{}|{}>* changed project status from *{}* to *{}*", - ENV.SITE_URL, - user.user.username, - user.user.username, - &project_item.inner.status.as_friendly_str(), - status.as_friendly_str(), - ) - .to_string(), - ), - ) - .await - .ok(); - } - - if team_member.as_ref().is_none_or(|x| !x.accepted) { - let notified_members = sqlx::query!( - " - SELECT tm.user_id id - FROM team_members tm - WHERE tm.team_id = $1 AND tm.accepted - ", - project_item.inner.team_id as db_ids::DBTeamId - ) - .fetch(&mut transaction) - .map_ok(|c| db_models::DBUserId(c.id)) - .try_collect::>() - .await - .wrap_internal_err("fetching notified members from database")?; - - NotificationBuilder { - body: NotificationBody::StatusChange { - project_id: project_item.inner.id.into(), - old_status: project_item.inner.status, - new_status: *status, - }, - } - .insert_many(notified_members.clone(), &mut transaction, &redis) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - - NotificationBuilder { - body: if status.is_approved() { - NotificationBody::ProjectStatusApproved { - project_id: project_item.inner.id.into(), - } - } else { - NotificationBody::ProjectStatusNeutral { - project_id: project_item.inner.id.into(), - old_status: project_item.inner.status, - new_status: *status, - } - }, - } - .insert_many(notified_members, &mut transaction, &redis) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - } - - ThreadMessageBuilder { - author_id: Some(user.user.id.into()), - body: MessageBody::StatusChange { - new_status: *status, - old_status: project_item.inner.status, - }, - thread_id: project_item.thread_id, - hide_identity: user.scopes.contains(Scopes::MODERATION_WRITE), - } - .insert(&mut transaction) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - - sqlx::query!( - " - UPDATE mods - SET status = $1 - WHERE (id = $2) - ", - status.as_str(), - id as db_ids::DBProjectId, - ) - .execute(&mut transaction) - .await - .wrap_internal_err( - "querying database for `project_edit_internal`", - )?; - - if sync_archival_disclosure - && archival_disclosure.is_some_and(|disclosure| { - user.scopes.contains(Scopes::MODERATION_WRITE) - || disclosure.lock_status.allows_removal() - }) - { - db_models::DBProjectDisclosure::remove( - project_item.inner.id, - ProjectDisclosureType::Archived, - user.user.id.into(), - user.scopes.contains(Scopes::MODERATION_WRITE), - &mut transaction, - ) - .await - .wrap_internal_err("failed to remove archival disclosure")?; - } - } - } - - if let Some(requested_status) = &new_project.requested_status { - if !perms.contains(ProjectPermissions::EDIT_DETAILS) { - return Err(ApiError::Auth(eyre::eyre!( - "You do not have the permissions to edit the requested status of this project!", + return Err(ApiError::Auth(eyre!( + "you do not have permission to edit the visibility of this project" ))); } - - if !requested_status - .map(|x| x.can_be_requested()) - .unwrap_or(true) - { - return Err(ApiError::Request(eyre::eyre!(String::from( - "Specified status cannot be requested!", - )))); - } - - sqlx::query!( - " - UPDATE mods - SET requested_status = $1 - WHERE (id = $2) - ", - requested_status.map(|x| x.as_str()), - id as db_ids::DBProjectId, + db_models::DBProject::update_visibility( + id, + visibility, + Some(user.user.id.into()), + &mut transaction, ) - .execute(&mut transaction) .await - .wrap_internal_err("querying database for `project_edit_internal`")?; + .wrap_internal_err("updating project visibility")?; } if perms.contains(ProjectPermissions::EDIT_DETAILS) { @@ -1395,14 +1073,14 @@ pub async fn project_edit_internal( let mut reindex_versions = new_project.categories.is_some() || new_project.additional_categories.is_some(); + let updated_status = ProjectStatus::from_visibility_review_status( + new_project.visibility.unwrap_or(locked_project.visibility), + locked_project.review_status, + ); let became_searchable = !project_item.inner.status.is_searchable() - && new_project - .status - .is_some_and(|status| status.is_searchable()); + && updated_status.is_searchable(); let became_unsearchable = project_item.inner.status.is_searchable() - && new_project - .status - .is_some_and(|status| !status.is_searchable()); + && !updated_status.is_searchable(); reindex_versions |= update( &mut transaction, @@ -1454,18 +1132,6 @@ pub async fn project_edit_internal( .await .wrap_internal_err("failed to update components")?; - let reloaded_project = if validate_for_review { - validate::ensure_project_is_valid_for_review( - id, - &pool, - &mut transaction, - &redis, - ) - .await? - } else { - project_item.clone() - }; - // check new description and body for links to associated images // if they no longer exist in the description or body, delete them let checkable_strings: Vec<&str> = @@ -1487,24 +1153,12 @@ pub async fn project_edit_internal( .await .wrap_api_err("deleting unused images")?; - if submit_for_review { - reindex_versions |= submit_project_for_review( - &reloaded_project, - &user, - team_member.as_ref().is_none_or(|member| !member.accepted), - sync_archival_disclosure, - &mut transaction, - &pool, - &redis, - ) - .await?; - } - mutation::finalize_project_edit( id, project_item.inner.status, project_item.inner.slug.clone(), - submit_for_review, + false, + false, transaction, &pool, &redis, @@ -1559,160 +1213,6 @@ pub async fn project_edit_internal( Ok(HttpResponse::NoContent().body("")) } -async fn submit_project_for_review( - project: &ProjectQueryResult, - user: &crate::auth::UserWithScopes, - notify_team_members: bool, - sync_archival_disclosure: bool, - transaction: &mut PgTransaction<'_>, - pool: &PgPool, - redis: &RedisPool, -) -> Result { - let archival_disclosure = - db_models::DBProjectDisclosure::get_many_for_project( - project.inner.id, - false, - &mut *transaction, - ) - .await - .wrap_internal_err("failed to fetch project disclosures")? - .into_iter() - .find(|disclosure| { - matches!(disclosure.disclosure, ProjectDisclosure::Archived { .. }) - }); - - if sync_archival_disclosure - && archival_disclosure - .is_some_and(|disclosure| disclosure.lock_status.allows_removal()) - { - db_models::DBProjectDisclosure::remove( - project.inner.id, - ProjectDisclosureType::Archived, - user.user.id.into(), - false, - &mut *transaction, - ) - .await - .wrap_internal_err("failed to remove archival disclosure")?; - } - - let mut state = mutation::sync_project_state( - project.inner.id, - transaction, - pool, - redis, - ) - .await?; - - sqlx::query!( - " - UPDATE mods - SET - moderation_message = NULL, - moderation_message_body = NULL, - queued = NOW(), - initial_queued = COALESCE(initial_queued, NOW()) - WHERE (id = $1) - ", - project.inner.id as db_ids::DBProjectId, - ) - .execute(&mut *transaction) - .await - .wrap_internal_err("querying database for `project_edit_internal`")?; - - if state.status().is_approved() - || !user.scopes.contains(Scopes::MODERATION_WRITE) - && matches!( - state.status(), - ProjectStatus::Rejected | ProjectStatus::Withheld - ) - && state - .try_auto_approve( - AutoApprovalCause::Resubmission { - user_id: user.user.id, - }, - transaction, - redis, - ) - .await? - { - return Ok(true); - } - - let new_status = ProjectStatus::Processing; - if notify_team_members { - let notified_members = sqlx::query!( - " - SELECT tm.user_id id - FROM team_members tm - WHERE tm.team_id = $1 AND tm.accepted - ", - project.inner.team_id as db_ids::DBTeamId - ) - .fetch(&mut *transaction) - .map_ok(|row| db_models::DBUserId(row.id)) - .try_collect::>() - .await - .wrap_internal_err("fetching notified members from database")?; - - NotificationBuilder { - body: NotificationBody::StatusChange { - project_id: project.inner.id.into(), - old_status: project.inner.status, - new_status, - }, - } - .insert_many(notified_members.clone(), &mut *transaction, redis) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - - NotificationBuilder { - body: NotificationBody::ProjectStatusNeutral { - project_id: project.inner.id.into(), - old_status: project.inner.status, - new_status, - }, - } - .insert_many(notified_members, &mut *transaction, redis) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - } - - ThreadMessageBuilder { - author_id: Some(user.user.id.into()), - body: MessageBody::StatusChange { - new_status, - old_status: project.inner.status, - }, - thread_id: project.thread_id, - hide_identity: false, - } - .insert(&mut *transaction) - .await - .wrap_internal_err( - "inserting database records for `project_edit_internal`", - )?; - - sqlx::query!( - " - UPDATE mods - SET status = $1 - WHERE (id = $2) - ", - new_status.as_str(), - project.inner.id as db_ids::DBProjectId, - ) - .execute(&mut *transaction) - .await - .wrap_internal_err("querying database for `project_edit_internal`")?; - - Ok(false) -} - pub async fn edit_project_categories( categories: &Vec, perms: &ProjectPermissions, @@ -3545,7 +3045,8 @@ pub async fn project_delete_internal( .wrap_internal_err("failed to start transaction")?; let locked_project = sqlx::query!( r#" - SELECT status, slug + SELECT visibility AS "visibility: ProjectVisibility", + review_status AS "review_status: ProjectReviewStatus", slug FROM mods WHERE id = $1 FOR UPDATE @@ -3555,7 +3056,10 @@ pub async fn project_delete_internal( .fetch_one(&mut transaction) .await .wrap_internal_err("locking project for deletion")?; - let original_status = ProjectStatus::from_string(&locked_project.status); + let original_status = ProjectStatus::from_visibility_review_status( + locked_project.visibility, + locked_project.review_status, + ); let original_slug = locked_project.slug; if original_status.is_approved() { @@ -3709,11 +3213,21 @@ pub async fn project_delete_internal( .await .wrap_internal_err("failed to delete project followers")?; + db_models::DBProject::record_delta( + project.inner.id, + Some(user.user.id.into()), + ProjectDelta::Deleted, + &mut transaction, + ) + .await + .wrap_internal_err("recording project deletion")?; + mutation::finalize_project_edit( project.inner.id, original_status, original_slug, false, + true, transaction, &pool, &redis, @@ -3765,6 +3279,7 @@ pub async fn project_delete_internal( let result = db_models::DBProject::remove( project.inner.id, + user.user.id.into(), &mut transaction, &redis, ) diff --git a/apps/labrinth/src/routes/v3/projects/mutation.rs b/apps/labrinth/src/routes/v3/projects/mutation.rs index 566fd7c1a33..aac27be7332 100644 --- a/apps/labrinth/src/routes/v3/projects/mutation.rs +++ b/apps/labrinth/src/routes/v3/projects/mutation.rs @@ -2,6 +2,7 @@ use eyre::eyre; use xredis::RedisPool; use crate::auth::UserWithScopes; +use crate::database::advisory_lock::AdvisoryLock; use crate::database::models::notification_item::NotificationBuilder; use crate::database::models::project_item::ProjectQueryResult; use crate::database::models::thread_item::ThreadMessageBuilder; @@ -15,7 +16,8 @@ use crate::models::notifications::NotificationBody; use crate::models::pats::Scopes; use crate::models::projects::{ ApprovalProvenance, ApprovalReason, AutoApprovalCause, Project, - ProjectStatus, Version, + ProjectReviewStatus, ProjectStatus, ProjectVisibility, + ReviewStatusProvenance, Version, }; use crate::models::thread_issues::{ ThreadIssueContext, ThreadIssueTarget, ThreadIssueTeamMember, @@ -90,9 +92,25 @@ impl SyncedProjectState { transaction: &mut PgTransaction<'_>, redis: &RedisPool, ) -> Result { - let Some(new_status) = self.auto_approval_status() else { + if self.auto_approval_status().is_none() { return Ok(false); - }; + } + let visibility = sqlx::query_scalar!( + r#" + SELECT visibility AS "visibility: ProjectVisibility" + FROM mods + WHERE id = $1 + FOR UPDATE + "#, + self.data.inner.id as DBProjectId, + ) + .fetch_one(&mut *transaction) + .await + .wrap_internal_err("fetching project visibility for auto-approval")?; + let new_status = ProjectStatus::from_visibility_review_status( + visibility, + ProjectReviewStatus::Approved, + ); let old_status = self.project.status; let provenance = ApprovalProvenance { trigger: cause, @@ -109,18 +127,30 @@ impl SyncedProjectState { "serializing project auto-approval reason", )?; + db_models::DBProject::update_review_status( + self.data.inner.id, + ProjectReviewStatus::Approved, + None, + &ReviewStatusProvenance::AutoApproval { + trigger: provenance.trigger.clone(), + resolved_issue_ids: provenance.resolved_issue_ids.clone(), + }, + transaction, + ) + .await + .wrap_internal_err("auto-approving project review status")?; + sqlx::query!( r#" - UPDATE mods - SET status = $1, - approved_because = CASE - WHEN approved IS NULL THEN $3::jsonb - ELSE approved_because - END, - approved = COALESCE(approved, NOW()) - WHERE id = $2 - "#, - new_status.as_str(), + UPDATE mods + SET approved_because = CASE + WHEN approved IS NULL THEN $2::jsonb + ELSE approved_because + END, + approved = COALESCE(approved, NOW()), + initial_queued = NULL + WHERE id = $1 + "#, self.data.inner.id as DBProjectId, reason, ) @@ -241,8 +271,8 @@ async fn sync_technical_review( ) -> Result<(Vec, Vec), ApiError> { delphi::tech_review_queue::lock_projects(project_ids, transaction).await?; for project_id in project_ids { - sqlx::query!("SELECT pg_advisory_xact_lock($1)", project_id.0) - .fetch_one(&mut *transaction) + AdvisoryLock::ProjectState(*project_id) + .acquire(transaction) .await .wrap_internal_err("locking project state synchronization")?; } @@ -278,8 +308,8 @@ pub(crate) async fn load_project_state( ) -> Result { delphi::tech_review_queue::lock_projects(&[project_id], transaction) .await?; - sqlx::query!("SELECT pg_advisory_xact_lock($1)", project_id.0) - .fetch_one(&mut *transaction) + AdvisoryLock::ProjectState(project_id) + .acquire(transaction) .await .wrap_internal_err("locking project state synchronization")?; @@ -559,13 +589,26 @@ pub(crate) async fn finalize_project_edit( original_status: ProjectStatus, original_slug: Option, submit_for_review: bool, + allow_auto_approval: bool, mut transaction: PgTransaction<'_>, pool: &PgPool, redis: &RedisPool, project_editor: Option<&UserWithScopes>, ) -> Result<(), ApiError> { - let state = - sync_project_state(project_id, &mut transaction, pool, redis).await?; + let state = if allow_auto_approval { + sync_project_state(project_id, &mut transaction, pool, redis).await? + } else { + let (_, queued_projects) = + sync_technical_review(&[project_id], &mut transaction).await?; + load_project_state_with_membership( + project_id, + queued_projects.contains(&project_id), + &mut transaction, + pool, + redis, + ) + .await? + }; let entered_review = state.project.status == ProjectStatus::Processing && original_status != ProjectStatus::Processing; diff --git a/apps/labrinth/src/routes/v3/projects/review_state.rs b/apps/labrinth/src/routes/v3/projects/review_state.rs new file mode 100644 index 00000000000..212c7e2fc92 --- /dev/null +++ b/apps/labrinth/src/routes/v3/projects/review_state.rs @@ -0,0 +1,401 @@ +use actix_web::{HttpRequest, HttpResponse, post, web}; +use eyre::eyre; +use serde::Deserialize; +use validator::Validate; +use xredis::RedisPool; + +use super::{mutation, validate}; +use crate::auth::get_user_from_headers; +use crate::database::advisory_lock::AdvisoryLock; +use crate::database::models::moderation_lock_item::DBModerationLock; +use crate::database::models::notification_item::NotificationBuilder; +use crate::database::models::thread_item::ThreadMessageBuilder; +use crate::database::{PgPool, models as db_models}; +use crate::env::ENV; +use crate::models::notifications::NotificationBody; +use crate::models::pats::Scopes; +use crate::models::projects::{ + ApprovalReason, AutoApprovalCause, ProjectReviewStatus, ProjectStatus, + ProjectVisibility, ReviewStatusProvenance, +}; +use crate::models::teams::ProjectPermissions; +use crate::models::threads::MessageBody; +use crate::queue::session::AuthQueue; +use crate::routes::ApiError; +use crate::routes::internal::delphi; +use crate::search::SearchState; +use crate::util::MinecraftMeta; +use crate::util::error::Context as _; + +#[derive(Deserialize, Validate, utoipa::ToSchema)] +pub struct ReviewStateUpdate { + pub review_status: ProjectReviewStatus, + pub reason: Option, +} + +#[allow(clippy::too_many_arguments)] +#[utoipa::path( + context_path = "/project", + tag = "projects", + request_body = ReviewStateUpdate, + responses((status = NO_CONTENT)) +)] +#[post("/{id}/review-state")] +pub async fn project_review_state( + minecraft_meta: web::Data, + req: HttpRequest, + info: web::Path<(String,)>, + pool: web::Data, + web::Json(update): web::Json, + redis: web::Data, + session_queue: web::Data, + search_state: web::Data, +) -> Result { + if let Some(response) = crate::routes::redirect_ref( + &req, + "id", + pool.as_ref(), + redis.as_ref(), + session_queue.as_ref(), + Scopes::PROJECT_WRITE, + ) + .await? + { + return Ok(response); + } + + project_review_state_internal( + minecraft_meta, + req, + info, + pool, + web::Json(update), + redis, + session_queue, + search_state, + ) + .await +} + +#[allow(clippy::too_many_arguments)] +pub(crate) async fn project_review_state_internal( + minecraft_meta: web::Data, + req: HttpRequest, + info: web::Path<(String,)>, + pool: web::Data, + web::Json(update): web::Json, + redis: web::Data, + session_queue: web::Data, + search_state: web::Data, +) -> Result { + let user = get_user_from_headers( + &req, + &**pool, + &redis, + &session_queue, + Scopes::PROJECT_WRITE, + ) + .await + .wrap_auth_err("authenticating API request")?; + update + .validate() + .map_err(|err| eyre!(err)) + .wrap_request_err("validating review state update")?; + let project = + db_models::DBProject::get(&info.into_inner().0, &**pool, &redis) + .await + .wrap_internal_err("fetching project")? + .ok_or_else(|| ApiError::NotFound(eyre!("resource not found")))?; + let id = project.inner.id; + let (team_member, organization_team_member) = + db_models::DBTeamMember::get_for_project_permissions( + &project.inner, + user.user.id.into(), + &**pool, + ) + .await + .wrap_internal_err("fetching project permissions")?; + let permissions = ProjectPermissions::get_permissions_by_scopes( + user.scopes, + &team_member, + &organization_team_member, + ) + .ok_or_else(|| { + ApiError::Auth(eyre!("you do not have permission to edit this project")) + })?; + if !permissions.contains(ProjectPermissions::EDIT_DETAILS) { + return Err(ApiError::Auth(eyre!( + "you do not have permission to edit the review state of this project" + ))); + } + + let mut transaction = pool + .begin() + .await + .wrap_internal_err("starting review state transaction")?; + delphi::tech_review_queue::lock_projects(&[id], &mut transaction).await?; + AdvisoryLock::ProjectState(id) + .acquire(&mut transaction) + .await + .wrap_internal_err("locking project review state")?; + let locked = sqlx::query!( + r#" + SELECT visibility AS "visibility: ProjectVisibility", + review_status AS "review_status: ProjectReviewStatus", slug, + webhook_sent + FROM mods + WHERE id = $1 + FOR UPDATE + "#, + id as db_models::DBProjectId, + ) + .fetch_one(&mut transaction) + .await + .wrap_internal_err("fetching locked project review state")?; + let moderator = user.scopes.contains(Scopes::MODERATION_WRITE); + if !moderator + && (locked.review_status == ProjectReviewStatus::Approved + || update.review_status != ProjectReviewStatus::InReview) + { + return Err(ApiError::Auth(eyre!( + "you do not have permission to set this review state" + ))); + } + if locked.review_status == update.review_status { + return Ok(HttpResponse::NoContent().finish()); + } + if moderator + && !user.scopes.contains(Scopes::ADMIN_WRITE) + && locked.review_status == ProjectReviewStatus::InReview + && let Some(lock) = + DBModerationLock::get_with_user(id, &mut transaction) + .await + .wrap_internal_err("fetching moderation lock")? + && lock.moderator_id != db_models::DBUserId::from(user.user.id) + && !lock.expired + { + return Err(ApiError::Auth(eyre!( + "this project is currently being moderated by @{}; wait for them to finish or for the lock to expire", + lock.moderator_username + ))); + } + + let original_status = ProjectStatus::from_visibility_review_status( + locked.visibility, + locked.review_status, + ); + let submit_for_review = + update.review_status == ProjectReviewStatus::InReview; + let mut auto_approved = false; + if submit_for_review { + if !moderator { + validate::ensure_project_is_valid_for_review( + id, + &pool, + &mut transaction, + &redis, + ) + .await?; + } + let mut state = + mutation::sync_project_state(id, &mut transaction, &pool, &redis) + .await?; + sqlx::query!( + r#" + UPDATE mods + SET moderation_message = NULL, moderation_message_body = NULL, + queued = NOW(), initial_queued = COALESCE(initial_queued, NOW()) + WHERE id = $1 + "#, + id as db_models::DBProjectId, + ) + .execute(&mut transaction) + .await + .wrap_internal_err("updating project submission timestamps")?; + if !moderator + && matches!( + locked.review_status, + ProjectReviewStatus::Rejected | ProjectReviewStatus::Withheld + ) + { + auto_approved = state + .try_auto_approve( + AutoApprovalCause::Resubmission { + user_id: user.user.id, + }, + &mut transaction, + &redis, + ) + .await?; + } + } + + let new_review_status = if auto_approved { + ProjectReviewStatus::Approved + } else { + update.review_status + }; + let new_status = ProjectStatus::from_visibility_review_status( + locked.visibility, + new_review_status, + ); + if !auto_approved { + db_models::DBProject::update_review_status( + id, + new_review_status, + Some(user.user.id.into()), + &ReviewStatusProvenance::ByUser { + reason: update.reason, + }, + &mut transaction, + ) + .await + .wrap_internal_err("updating project review status")?; + if new_review_status == ProjectReviewStatus::Approved { + let reason = + serde_json::to_value(ApprovalReason::ByUser(user.user.id)) + .wrap_internal_err("serializing project approval reason")?; + sqlx::query!( + r#" + UPDATE mods + SET approved_because = CASE WHEN approved IS NULL THEN $2::jsonb + ELSE approved_because END, + approved = COALESCE(approved, NOW()), initial_queued = NULL + WHERE id = $1 + "#, + id as db_models::DBProjectId, + reason, + ) + .execute(&mut transaction) + .await + .wrap_internal_err("updating project approval timestamps")?; + } + if team_member.as_ref().is_none_or(|member| !member.accepted) { + let recipients = sqlx::query!( + r#" + SELECT user_id FROM team_members + WHERE team_id = $1 AND accepted + "#, + project.inner.team_id as db_models::DBTeamId, + ) + .fetch_all(&mut transaction) + .await + .wrap_internal_err("fetching review notification recipients")? + .into_iter() + .map(|row| db_models::DBUserId(row.user_id)) + .collect::>(); + for body in [ + NotificationBody::StatusChange { + project_id: id.into(), + old_status: original_status, + new_status, + }, + if new_review_status == ProjectReviewStatus::Approved { + NotificationBody::ProjectStatusApproved { + project_id: id.into(), + } + } else { + NotificationBody::ProjectStatusNeutral { + project_id: id.into(), + old_status: original_status, + new_status, + } + }, + ] { + NotificationBuilder { body } + .insert_many(recipients.clone(), &mut transaction, &redis) + .await + .wrap_internal_err( + "notifying project team of review state change", + )?; + } + } + ThreadMessageBuilder { + author_id: Some(user.user.id.into()), + body: MessageBody::StatusChange { + old_status: original_status, + new_status, + }, + thread_id: project.thread_id, + hide_identity: moderator, + } + .insert(&mut transaction) + .await + .wrap_internal_err("recording project review state change")?; + } + + mutation::finalize_project_edit( + id, + original_status, + locked.slug.clone(), + submit_for_review, + false, + transaction, + &pool, + &redis, + Some(&user), + ) + .await?; + if original_status.is_searchable() && !new_status.is_searchable() { + search_state.queue.push_project_removal(id.into()).await; + } else if !original_status.is_searchable() && new_status.is_searchable() { + search_state + .queue + .push_project_with_all_versions_change(id.into()) + .await; + } else { + search_state.queue.push_project_change(id.into()).await; + } + + if new_status.is_searchable() + && !locked.webhook_sent + && !ENV.PUBLIC_DISCORD_WEBHOOK.is_empty() + && project.inner.components.minecraft_server.is_none() + { + crate::util::webhook::send_discord_webhook( + &minecraft_meta, + id.into(), + &pool, + &redis, + &ENV.PUBLIC_DISCORD_WEBHOOK, + None, + ) + .await + .ok(); + sqlx::query!( + "UPDATE mods SET webhook_sent = TRUE WHERE id = $1", + id as db_models::DBProjectId, + ) + .execute(&**pool) + .await + .wrap_internal_err("marking project announcement webhook sent")?; + db_models::DBProject::clear_cache( + id, + project.inner.slug.clone(), + None, + &redis, + ) + .await + .wrap_internal_err("clearing project webhook cache")?; + } + if moderator && !ENV.MODERATION_SLACK_WEBHOOK.is_empty() { + crate::util::webhook::send_slack_project_webhook( + &minecraft_meta, + id.into(), + &pool, + &redis, + &ENV.MODERATION_SLACK_WEBHOOK, + Some(format!( + "*<{}/user/{}|{}>* changed project status from *{}* to *{}*", + ENV.SITE_URL, + user.user.username, + user.user.username, + original_status.as_friendly_str(), + new_status.as_friendly_str(), + )), + ) + .await + .ok(); + } + Ok(HttpResponse::NoContent().finish()) +} diff --git a/apps/labrinth/src/routes/v3/statistics.rs b/apps/labrinth/src/routes/v3/statistics.rs index d98c3071315..dae436a997b 100644 --- a/apps/labrinth/src/routes/v3/statistics.rs +++ b/apps/labrinth/src/routes/v3/statistics.rs @@ -30,12 +30,8 @@ pub async fn get_stats( " SELECT COUNT(id) FROM mods - WHERE status = ANY($1) + WHERE visibility = 'listed' AND review_status = 'approved' ", - &*crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect::>(), ) .fetch_one(&***ro_pool) .await @@ -45,13 +41,9 @@ pub async fn get_stats( " SELECT COUNT(v.id) FROM versions v - INNER JOIN mods m on v.mod_id = m.id AND m.status = ANY($1) - WHERE v.status = ANY($2) + INNER JOIN mods m on v.mod_id = m.id AND m.visibility = 'listed' AND m.review_status = 'approved' + WHERE v.status = ANY($1) ", - &*crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect::>(), &*crate::models::projects::VersionStatus::iterator() .filter(|x| x.is_listed()) .map(|x| x.to_string()) @@ -66,12 +58,8 @@ pub async fn get_stats( SELECT COUNT(DISTINCT u.id) FROM users u INNER JOIN team_members tm on u.id = tm.user_id AND tm.accepted = TRUE - INNER JOIN mods m on tm.team_id = m.team_id AND m.status = ANY($1) + INNER JOIN mods m on tm.team_id = m.team_id AND m.visibility = 'listed' AND m.review_status = 'approved' ", - &*crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect::>(), ) .fetch_one(&***ro_pool) .await @@ -80,13 +68,9 @@ pub async fn get_stats( let files = sqlx::query!( " SELECT COUNT(f.id) FROM files f - INNER JOIN versions v on f.version_id = v.id AND v.status = ANY($2) - INNER JOIN mods m on v.mod_id = m.id AND m.status = ANY($1) + INNER JOIN versions v on f.version_id = v.id AND v.status = ANY($1) + INNER JOIN mods m on v.mod_id = m.id AND m.visibility = 'listed' AND m.review_status = 'approved' ", - &*crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect::>(), &*crate::models::projects::VersionStatus::iterator() .filter(|x| x.is_listed()) .map(|x| x.to_string()) diff --git a/apps/labrinth/src/routes/v3/threads.rs b/apps/labrinth/src/routes/v3/threads.rs index bc28220cfe0..b31c5408baf 100644 --- a/apps/labrinth/src/routes/v3/threads.rs +++ b/apps/labrinth/src/routes/v3/threads.rs @@ -1,6 +1,7 @@ use crate::auth::{UserWithScopes, get_user_from_headers}; use crate::database; use crate::database::PgPool; +use crate::database::advisory_lock::AdvisoryLock; use crate::database::models::image_item; use crate::database::models::notification_item::NotificationBuilder; use crate::database::models::thread_issue_item::ThreadIssueBuilder; @@ -566,8 +567,8 @@ async fn prepare_thread_issue_mutation( ) .await?; - sqlx::query!("SELECT pg_advisory_xact_lock($1)", project_id.0) - .fetch_one(&mut *transaction) + AdvisoryLock::ProjectState(project_id) + .acquire(transaction) .await .wrap_internal_err("locking project thread issues")?; diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs index e2b5f87dcd1..d6436231891 100644 --- a/apps/labrinth/src/routes/v3/version_file.rs +++ b/apps/labrinth/src/routes/v3/version_file.rs @@ -7,7 +7,7 @@ use crate::database::PgPool; use crate::database::ReadOnlyPgPool; use crate::models::ids::VersionId; use crate::models::pats::Scopes; -use crate::models::projects::{ProjectStatus, VersionStatus, VersionType}; +use crate::models::projects::{VersionStatus, VersionType}; use crate::models::teams::ProjectPermissions; use crate::queue::session::AuthQueue; @@ -599,15 +599,15 @@ async fn update_files_internal( FROM mods m CROSS JOIN LATERAL ( SELECT - $7::BOOL + $6::BOOL OR EXISTS ( SELECT 1 FROM team_members tm - WHERE tm.team_id = m.team_id AND tm.user_id = $8::BIGINT + WHERE tm.team_id = m.team_id AND tm.user_id = $7::BIGINT ) OR EXISTS ( SELECT 1 FROM organizations o INNER JOIN team_members tm ON tm.team_id = o.team_id - WHERE o.id = m.organization_id AND tm.user_id = $8::BIGINT + WHERE o.id = m.organization_id AND tm.user_id = $7::BIGINT ) AS full_access ) access CROSS JOIN LATERAL ( @@ -651,7 +651,11 @@ async fn update_files_internal( LIMIT 1 ) latest WHERE m.id = ANY($1) - AND (access.full_access OR m.status = ANY($6::VARCHAR[])) + AND ( + access.full_access + OR m.review_status = 'withheld' + OR (m.review_status = 'approved' AND m.visibility IN ('listed', 'unlisted')) + ) "#, &files.iter().map(|x| x.project_id.0).collect::>(), &update_data.game_versions.clone().unwrap_or_default(), @@ -667,10 +671,6 @@ async fn update_files_internal( .filter(|x| !x.is_hidden()) .map(|x| x.to_string()) .collect::>(), - &ProjectStatus::iterator() - .filter(|x| !x.is_hidden()) - .map(|x| x.to_string()) - .collect::>(), user_option .as_ref() .is_some_and(|x| x.scopes.contains(Scopes::MODERATION_READ)), diff --git a/apps/labrinth/src/search/indexing.rs b/apps/labrinth/src/search/indexing.rs index 6153820842c..b8e1b0e12fd 100644 --- a/apps/labrinth/src/search/indexing.rs +++ b/apps/labrinth/src/search/indexing.rs @@ -49,13 +49,6 @@ pub(crate) fn normalize_for_search(s: &str) -> String { SPECIAL_CHARS_RE.replace_all(s, "").to_kebab_case() } -fn searchable_statuses() -> Vec { - crate::models::projects::ProjectStatus::iterator() - .filter(|x| x.is_searchable()) - .map(|x| x.to_string()) - .collect() -} - struct ProjectOwner { username: String, user_id: DBUserId, @@ -71,20 +64,17 @@ pub async fn index_local( ) -> eyre::Result<(SearchDocumentBatch, i64)> { info!("Indexing local projects!"); - let searchable_statuses = searchable_statuses(); - let db_projects = sqlx::query!( r#" SELECT m.id id, m.name name, m.summary summary, m.downloads downloads, m.follows follows, m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color, m.components AS "components: sqlx::types::Json" FROM mods m - WHERE m.status = ANY($1) AND m.id > $3 + WHERE m.visibility = 'listed' AND m.review_status = 'approved' AND m.id > $2 GROUP BY m.id ORDER BY m.id ASC - LIMIT $2; + LIMIT $1; "#, - &searchable_statuses, limit, cursor, ) @@ -164,7 +154,6 @@ async fn build_search_document_batch( project_ids: &[ProjectId], version_ids: Option<&HashSet>, ) -> eyre::Result { - let searchable_statuses = searchable_statuses(); let project_ids = project_ids .iter() .map(|project_id| DBProjectId::from(*project_id).0) @@ -176,11 +165,10 @@ async fn build_search_document_batch( m.icon_url icon_url, m.updated updated, m.approved approved, m.published, m.license license, m.slug slug, m.color, m.components AS "components: sqlx::types::Json" FROM mods m - WHERE m.status = ANY($1) AND m.id = ANY($2) + WHERE m.visibility = 'listed' AND m.review_status = 'approved' AND m.id = ANY($1) GROUP BY m.id ORDER BY m.id ASC; "#, - &searchable_statuses, &project_ids, ) .fetch(pool) @@ -211,7 +199,6 @@ async fn build_search_documents( db_projects: Vec, version_ids: Option<&HashSet>, ) -> eyre::Result { - let searchable_statuses = searchable_statuses(); let project_ids = db_projects.iter().map(|x| x.id.0).collect::>(); let project_components = db_projects .iter() @@ -238,10 +225,9 @@ async fn build_search_documents( INNER JOIN mods m ON m.id = d.mod_dependency_id WHERE v.mod_id = ANY($1) AND d.mod_dependency_id IS NOT NULL - AND m.status = ANY($2) + AND m.visibility = 'listed' AND m.review_status = 'approved' ", &project_ids, - &searchable_statuses, ) .fetch(pool) .try_fold( diff --git a/apps/labrinth/src/test/api_v2/project.rs b/apps/labrinth/src/test/api_v2/project.rs index 665d5b109f4..1ddfa9f9523 100644 --- a/apps/labrinth/src/test/api_v2/project.rs +++ b/apps/labrinth/src/test/api_v2/project.rs @@ -22,8 +22,6 @@ use async_trait::async_trait; use bytes::Bytes; use serde_json::json; -use crate::test::database::ADMIN_USER_PAT; - use super::{ ApiV2, request_data::{self, get_public_project_creation_data}, @@ -95,18 +93,14 @@ impl ApiProject for ApiV2 { let resp = self.create_project(creation_data, pat).await; assert_status!(&resp, StatusCode::OK); - // Approve as admin so fixture setup is not affected by moderation-lock contention. - let req = TestRequest::patch() - .uri(&format!("/v2/project/{slug}")) - .append_pat(ADMIN_USER_PAT) - .set_json(json!( - { - "status": "approved" - } - )) - .to_request(); - let resp = self.call(req).await; - assert_status!(&resp, StatusCode::NO_CONTENT); + crate::test::db::initialize_project_state( + &resp, + &slug, + crate::models::v3::projects::ProjectReviewStatus::Approved, + Some(crate::models::v3::projects::ProjectVisibility::Listed), + ) + .await + .expect("failed to initialize public project fixture"); let project = self.get_project_deserialized_common(&slug, pat).await; diff --git a/apps/labrinth/src/test/api_v3/project.rs b/apps/labrinth/src/test/api_v3/project.rs index 26695b204c7..c0cd298c020 100644 --- a/apps/labrinth/src/test/api_v3/project.rs +++ b/apps/labrinth/src/test/api_v3/project.rs @@ -22,7 +22,6 @@ use crate::test::{ models::{CommonItemType, CommonProject, CommonVersion}, request_data::{ImageData, ProjectCreationRequestData}, }, - database::ADMIN_USER_PAT, dummy_data::TestFile, }; @@ -48,18 +47,14 @@ impl ApiProject for ApiV3 { let resp = self.create_project(creation_data, pat).await; assert_status!(&resp, StatusCode::OK); - // Approve as admin so fixture setup is not affected by moderation-lock contention. - let req = TestRequest::patch() - .uri(&format!("/v3/project/{slug}")) - .append_pat(ADMIN_USER_PAT) - .set_json(json!( - { - "status": "approved" - } - )) - .to_request(); - let resp = self.call(req).await; - assert_status!(&resp, StatusCode::NO_CONTENT); + crate::test::db::initialize_project_state( + &resp, + &slug, + crate::models::v3::projects::ProjectReviewStatus::Approved, + Some(crate::models::v3::projects::ProjectVisibility::Listed), + ) + .await + .expect("failed to initialize public project fixture"); let project = self.get_project(&slug, pat).await; let project = test::read_body_json(project).await; diff --git a/apps/labrinth/src/test/db.rs b/apps/labrinth/src/test/db.rs index 428722cb090..b58ea92030f 100644 --- a/apps/labrinth/src/test/db.rs +++ b/apps/labrinth/src/test/db.rs @@ -53,6 +53,65 @@ pub async fn mark_email_verified(db: &PgPool, user_id: DBUserId) -> Result<()> { Ok(()) } +/// Initialize fixture project state without exercising the public PATCH endpoint. +/// +/// # Errors +/// +/// Errors if the project cannot be loaded, updated, or invalidated in cache. +pub async fn initialize_project_state( + response: &actix_web::dev::ServiceResponse, + id_or_slug: &str, + review_status: crate::models::v3::projects::ProjectReviewStatus, + visibility: Option, +) -> Result<()> { + use crate::database::models::project_item::DBProject; + use crate::models::v3::projects::ReviewStatusProvenance; + use actix_web::web::Data; + + let pool = response + .request() + .app_data::>() + .ok_or_else(|| eyre::eyre!("missing test database pool"))?; + let redis = response + .request() + .app_data::>() + .ok_or_else(|| eyre::eyre!("missing test Redis pool"))?; + let project = + Box::pin(DBProject::get(id_or_slug, pool.get_ref(), redis.get_ref())) + .await? + .ok_or_else(|| eyre::eyre!("fixture project does not exist"))?; + let mut transaction = pool.begin().await?; + DBProject::update_review_status( + project.inner.id, + review_status, + None, + &ReviewStatusProvenance::System { + reason: "initialize test fixture".to_string(), + }, + &mut transaction, + ) + .await?; + if let Some(visibility) = visibility { + DBProject::update_visibility( + project.inner.id, + visibility, + None, + &mut transaction, + ) + .await?; + } + transaction.commit().await?; + DBProject::clear_cache( + project.inner.id, + project.inner.slug, + None, + redis.get_ref(), + ) + .await?; + + Ok(()) +} + /// Dummy [`DBUserId`]s. /// /// [`DBUserId`]: crate::database::models::DBUserId diff --git a/apps/labrinth/src/test/dummy_data.rs b/apps/labrinth/src/test/dummy_data.rs index 573fa5fd8bc..80dbee58141 100644 --- a/apps/labrinth/src/test/dummy_data.rs +++ b/apps/labrinth/src/test/dummy_data.rs @@ -7,11 +7,7 @@ use crate::models::{ projects::{Project, Version}, }; use crate::test::asserts::assert_status; -use crate::test::{ - api_common::Api, - api_v3, - database::{ADMIN_USER_PAT, USER_USER_PAT}, -}; +use crate::test::{api_common::Api, api_v3, database::USER_USER_PAT}; use actix_http::StatusCode; use actix_web::test::{self, TestRequest}; use serde_json::json; @@ -451,10 +447,14 @@ pub async fn add_project_beta(api: &ApiV3) -> (Project, Version) { let resp = api.create_project(creation_data, USER_USER_PAT).await; assert_status!(&resp, StatusCode::OK); - let resp = api - .edit_project("beta", json!({ "status": "processing" }), ADMIN_USER_PAT) - .await; - assert_status!(&resp, StatusCode::NO_CONTENT); + crate::test::db::initialize_project_state( + &resp, + "beta", + crate::models::v3::projects::ProjectReviewStatus::InReview, + None, + ) + .await + .expect("failed to initialize beta review status"); get_project_beta(api).await } diff --git a/apps/labrinth/src/test/search.rs b/apps/labrinth/src/test/search.rs index 0f9d0a30264..d218ab588d7 100644 --- a/apps/labrinth/src/test/search.rs +++ b/apps/labrinth/src/test/search.rs @@ -6,7 +6,7 @@ use serde_json::json; use crate::test::asserts::assert_status; use crate::test::{ api_common::{Api, ApiProject, ApiVersion}, - database::{FRIEND_USER_PAT, MOD_USER_PAT, USER_USER_PAT}, + database::{FRIEND_USER_PAT, USER_USER_PAT}, dummy_data::{DUMMY_CATEGORIES, TestFile}, }; @@ -42,17 +42,6 @@ pub async fn setup_search_projects( api.add_public_project(&slug, Some(jar), modify_json, pat); let (project, _) = req.await; - // Approve, so that the project is searchable - let resp = api - .edit_project( - &project.id.to_string(), - json!({ - "status": "approved" - }), - MOD_USER_PAT, - ) - .await; - assert_status!(&resp, StatusCode::NO_CONTENT); (project.id.0, id) } }; diff --git a/apps/labrinth/src/util/legacy_project_status.rs b/apps/labrinth/src/util/legacy_project_status.rs new file mode 100644 index 00000000000..383624bed1c --- /dev/null +++ b/apps/labrinth/src/util/legacy_project_status.rs @@ -0,0 +1,296 @@ +use crate::models::v3::projects::{ + ProjectReviewStatus, ProjectStatus, ProjectVisibility, +}; + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct LegacyProjectStatusFields { + pub status: ProjectStatus, + pub requested_status: Option, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub struct LegacyStatusMeaning { + pub visibility: Option, + pub review_status: ProjectReviewStatus, + pub archived: bool, +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq, thiserror::Error)] +pub enum LegacyProjectStatusError { + #[error( + "cannot decode legacy status `scheduled` without scheduling information" + )] + Scheduled, + #[error("cannot decode legacy status `unknown`")] + Unknown, + #[error("invalid legacy requested status `{0}`")] + InvalidRequestedStatus(ProjectStatus), +} + +/// Encodes native state while retaining its audience in the requested status. +pub fn encode( + visibility: ProjectVisibility, + review_status: ProjectReviewStatus, +) -> LegacyProjectStatusFields { + let requested_status = match visibility { + ProjectVisibility::Listed => ProjectStatus::Approved, + ProjectVisibility::Unlisted => ProjectStatus::Unlisted, + ProjectVisibility::Private => ProjectStatus::Private, + }; + let status = match review_status { + ProjectReviewStatus::Draft => ProjectStatus::Draft, + ProjectReviewStatus::InReview => ProjectStatus::Processing, + ProjectReviewStatus::Approved => requested_status, + ProjectReviewStatus::Rejected => ProjectStatus::Rejected, + ProjectReviewStatus::Withheld => ProjectStatus::Withheld, + }; + LegacyProjectStatusFields { + status, + requested_status: Some(requested_status), + } +} + +/// Decodes historical state without inventing an audience for review-only statuses. +pub fn decode( + status: ProjectStatus, +) -> Result { + let (visibility, review_status, archived) = match status { + ProjectStatus::Approved => ( + Some(ProjectVisibility::Listed), + ProjectReviewStatus::Approved, + false, + ), + ProjectStatus::Unlisted => ( + Some(ProjectVisibility::Unlisted), + ProjectReviewStatus::Approved, + false, + ), + ProjectStatus::Private => ( + Some(ProjectVisibility::Private), + ProjectReviewStatus::Approved, + false, + ), + ProjectStatus::Archived => ( + Some(ProjectVisibility::Listed), + ProjectReviewStatus::Approved, + true, + ), + ProjectStatus::Draft => (None, ProjectReviewStatus::Draft, false), + ProjectStatus::Processing => { + (None, ProjectReviewStatus::InReview, false) + } + ProjectStatus::Rejected => (None, ProjectReviewStatus::Rejected, false), + ProjectStatus::Withheld => (None, ProjectReviewStatus::Withheld, false), + ProjectStatus::Scheduled => { + return Err(LegacyProjectStatusError::Scheduled); + } + ProjectStatus::Unknown => { + return Err(LegacyProjectStatusError::Unknown); + } + }; + Ok(LegacyStatusMeaning { + visibility, + review_status, + archived, + }) +} + +/// Resolves only missing visibility; a definite main status takes precedence. +pub fn decode_fields( + status: ProjectStatus, + requested_status: Option, +) -> Result { + let mut meaning = decode(status)?; + if meaning.visibility.is_none() { + meaning.visibility = requested_status + .map(decode_requested_visibility) + .transpose()?; + } + Ok(meaning) +} + +pub fn decode_requested_visibility( + status: ProjectStatus, +) -> Result { + match status { + ProjectStatus::Approved => Ok(ProjectVisibility::Listed), + ProjectStatus::Unlisted => Ok(ProjectVisibility::Unlisted), + ProjectStatus::Private => Ok(ProjectVisibility::Private), + _ => Err(LegacyProjectStatusError::InvalidRequestedStatus(status)), + } +} + +#[cfg(test)] +mod tests { + use super::*; + + const AUDIENCES: [(ProjectVisibility, ProjectStatus); 3] = [ + (ProjectVisibility::Listed, ProjectStatus::Approved), + (ProjectVisibility::Unlisted, ProjectStatus::Unlisted), + (ProjectVisibility::Private, ProjectStatus::Private), + ]; + const REVIEW_ONLY: [(ProjectStatus, ProjectReviewStatus); 4] = [ + (ProjectStatus::Draft, ProjectReviewStatus::Draft), + (ProjectStatus::Processing, ProjectReviewStatus::InReview), + (ProjectStatus::Rejected, ProjectReviewStatus::Rejected), + (ProjectStatus::Withheld, ProjectReviewStatus::Withheld), + ]; + + #[test] + fn historical_thread_payloads_keep_legacy_statuses() { + for status in ["archived", "scheduled", "unknown", "processing"] { + let value = serde_json::json!({ + "type": "status_change", + "old_status": status, + "new_status": "approved", + }); + let message: crate::models::threads::MessageBody = + serde_json::from_value(value.clone()).unwrap(); + assert_eq!(serde_json::to_value(message).unwrap(), value); + let message: crate::models::v2::threads::LegacyMessageBody = + serde_json::from_value(value.clone()).unwrap(); + assert_eq!(serde_json::to_value(message).unwrap(), value); + } + let value = serde_json::json!({ + "type": "auto_approval", + "old_status": "processing", + "new_status": "unlisted", + }); + let message: crate::models::threads::MessageBody = + serde_json::from_value(value.clone()).unwrap(); + assert_eq!(serde_json::to_value(message).unwrap(), value); + } + + #[test] + fn all_native_state_pairs_roundtrip() { + for (visibility, requested_status) in AUDIENCES { + for (review_status, expected_status) in [ + (ProjectReviewStatus::Draft, ProjectStatus::Draft), + (ProjectReviewStatus::InReview, ProjectStatus::Processing), + (ProjectReviewStatus::Approved, requested_status), + (ProjectReviewStatus::Rejected, ProjectStatus::Rejected), + (ProjectReviewStatus::Withheld, ProjectStatus::Withheld), + ] { + let fields = encode(visibility, review_status); + assert_eq!(fields.status, expected_status); + assert_eq!(fields.requested_status, Some(requested_status)); + assert_eq!( + decode_fields(fields.status, fields.requested_status), + Ok(LegacyStatusMeaning { + visibility: Some(visibility), + review_status, + archived: false, + }) + ); + } + } + } + + #[test] + fn historical_review_statuses_preserve_missing_visibility() { + for (status, review_status) in REVIEW_ONLY { + let expected = LegacyStatusMeaning { + visibility: None, + review_status, + archived: false, + }; + assert_eq!(decode(status), Ok(expected)); + assert_eq!(decode_fields(status, None), Ok(expected)); + for (visibility, requested_status) in AUDIENCES { + assert_eq!( + decode_fields(status, Some(requested_status)), + Ok(LegacyStatusMeaning { + visibility: Some(visibility), + ..expected + }) + ); + } + } + } + + #[test] + fn definite_visibility_wins_over_unused_requested_status() { + for (visibility, status) in AUDIENCES { + for requested_status in [ + None, + Some(ProjectStatus::Private), + Some(ProjectStatus::Approved), + Some(ProjectStatus::Archived), + Some(ProjectStatus::Unknown), + ] { + assert_eq!( + decode_fields(status, requested_status), + Ok(LegacyStatusMeaning { + visibility: Some(visibility), + review_status: ProjectReviewStatus::Approved, + archived: false, + }) + ); + } + } + } + + #[test] + fn archived_preserves_archival_information() { + let expected = LegacyStatusMeaning { + visibility: Some(ProjectVisibility::Listed), + review_status: ProjectReviewStatus::Approved, + archived: true, + }; + assert_eq!(decode(ProjectStatus::Archived), Ok(expected)); + for requested_status in [ + None, + Some(ProjectStatus::Private), + Some(ProjectStatus::Unknown), + ] { + assert_eq!( + decode_fields(ProjectStatus::Archived, requested_status), + Ok(expected) + ); + } + } + + #[test] + fn unsupported_main_statuses_have_explicit_errors() { + for (status, error) in [ + ( + ProjectStatus::Scheduled, + LegacyProjectStatusError::Scheduled, + ), + (ProjectStatus::Unknown, LegacyProjectStatusError::Unknown), + ] { + assert_eq!(decode(status), Err(error)); + assert_eq!(decode_fields(status, None), Err(error)); + assert_eq!( + decode_fields(status, Some(ProjectStatus::Approved)), + Err(error) + ); + } + } + + #[test] + fn requested_visibility_accepts_only_audience_statuses() { + for (visibility, status) in AUDIENCES { + assert_eq!(decode_requested_visibility(status), Ok(visibility)); + } + for status in [ + ProjectStatus::Archived, + ProjectStatus::Draft, + ProjectStatus::Processing, + ProjectStatus::Rejected, + ProjectStatus::Withheld, + ProjectStatus::Scheduled, + ProjectStatus::Unknown, + ] { + let error = + LegacyProjectStatusError::InvalidRequestedStatus(status); + assert_eq!(decode_requested_visibility(status), Err(error)); + for (main_status, _) in REVIEW_ONLY { + assert_eq!( + decode_fields(main_status, Some(status)), + Err(error) + ); + } + } + } +} diff --git a/apps/labrinth/src/util/mod.rs b/apps/labrinth/src/util/mod.rs index b767dc50b33..bcf1045a91e 100644 --- a/apps/labrinth/src/util/mod.rs +++ b/apps/labrinth/src/util/mod.rs @@ -16,6 +16,7 @@ pub mod http; pub mod img; pub mod ip; pub mod kafka; +pub mod legacy_project_status; pub mod minecraft_meta; pub mod neverbounce; pub mod non_empty_vec; diff --git a/apps/labrinth/tests/moderation_lock.rs b/apps/labrinth/tests/moderation_lock.rs index 3d79dc5ce68..e7547a0ea7a 100644 --- a/apps/labrinth/tests/moderation_lock.rs +++ b/apps/labrinth/tests/moderation_lock.rs @@ -8,40 +8,13 @@ use common::environment::{TestEnvironment, with_test_environment}; use labrinth::database::models::moderation_lock_item::{ DBModerationLock, LOCK_EXPIRY_MINUTES, }; -use labrinth::database::models::project_item::DBProject; use labrinth::database::models::{DBProjectId, DBUserId}; -use serde_json::{Value, json}; +use serde_json::Value; use std::sync::Arc; use tokio::sync::Barrier; pub mod common; -/// Force a project into `processing` status directly in the database. -/// Clears the Redis project row so `DBProject::get` used by PATCH sees the new status. -async fn set_project_processing( - project_id: i64, - project_slug: &str, - pool: &labrinth::database::PgPool, - redis: &xredis::RedisPool, -) { - sqlx::query!( - "UPDATE mods SET status = 'processing' WHERE id = $1", - project_id - ) - .execute(pool) - .await - .expect("failed to set project to processing status"); - - DBProject::clear_cache( - DBProjectId(project_id), - Some(project_slug.to_string()), - None, - redis, - ) - .await - .expect("failed to clear project cache after status update"); -} - /// Back-date a lock's `locked_at` so it appears expired. async fn expire_lock(project_id: i64, pool: &labrinth::database::PgPool) { sqlx::query!( @@ -770,238 +743,6 @@ async fn test_http_delete_all_locks_admin() { .await; } -/// Moderator without a lock can move a project out of processing when nobody else has a lock. -#[actix_rt::test] -async fn test_complete_review_without_lock_succeeds() { - with_test_environment(None, |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - - set_project_processing( - test_env.dummy.project_alpha.project_id_parsed.0 as i64, - test_env.dummy.project_alpha.project_slug.as_str(), - &test_env.db.pool, - &test_env.db.redis_pool, - ) - .await; - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", MOD_USER_PAT.unwrap())) - .set_json(json!({ "status": "approved" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!( - resp.status(), - StatusCode::NO_CONTENT, - "moderator without lock should be able to complete review when no active lock exists: {}", - String::from_utf8_lossy(test::read_body(resp).await.as_ref()) - ); - }) - .await; -} - -#[actix_rt::test] -async fn test_complete_review_blocked_when_other_holds_lock() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - let project_id = DBProjectId( - test_env.dummy.project_alpha.project_id_parsed.0 as i64, - ); - let pool = &test_env.db.pool; - - set_project_processing( - project_id.0, - test_env.dummy.project_alpha.project_slug.as_str(), - pool, - &test_env.db.redis_pool, - ) - .await; - DBModerationLock::acquire( - project_id, - DBUserId(ADMIN_USER_ID_PARSED), - pool, - ) - .await - .unwrap() - .unwrap(); - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", MOD_USER_PAT.unwrap())) - .set_json(json!({ "status": "approved" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!(resp.status(), StatusCode::UNAUTHORIZED); - let body = test::read_body(resp).await; - let msg = String::from_utf8_lossy(&body); - assert!( - msg.contains("Admin") || msg.contains("admin"), - "error should name the holding moderator: {msg}" - ); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_complete_review_succeeds_when_other_lock_expired() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - let project_id = DBProjectId( - test_env.dummy.project_alpha.project_id_parsed.0 as i64, - ); - let pool = &test_env.db.pool; - - set_project_processing( - project_id.0, - test_env.dummy.project_alpha.project_slug.as_str(), - pool, - &test_env.db.redis_pool, - ) - .await; - DBModerationLock::acquire( - project_id, - DBUserId(ADMIN_USER_ID_PARSED), - pool, - ) - .await - .unwrap() - .unwrap(); - expire_lock(project_id.0, pool).await; - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", MOD_USER_PAT.unwrap())) - .set_json(json!({ "status": "approved" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!( - resp.status(), - StatusCode::NO_CONTENT, - "moderator should be able to complete review when another moderator's lock expired: {}", - String::from_utf8_lossy(test::read_body(resp).await.as_ref()) - ); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_complete_review_with_lock_succeeds() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - let project_id = DBProjectId( - test_env.dummy.project_alpha.project_id_parsed.0 as i64, - ); - let mod_id = DBUserId(MOD_USER_ID_PARSED); - let pool = &test_env.db.pool; - - set_project_processing( - project_id.0, - test_env.dummy.project_alpha.project_slug.as_str(), - pool, - &test_env.db.redis_pool, - ) - .await; - - DBModerationLock::acquire(project_id, mod_id, pool) - .await - .unwrap() - .expect("moderator should acquire lock"); - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", MOD_USER_PAT.unwrap())) - .set_json(json!({ "status": "approved" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!( - resp.status(), - StatusCode::NO_CONTENT, - "moderator with valid lock should be able to approve: {}", - String::from_utf8_lossy(test::read_body(resp).await.as_ref()) - ); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_non_processing_status_change_does_not_require_lock() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", MOD_USER_PAT.unwrap())) - .set_json(json!({ "status": "unlisted" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!( - resp.status(), - StatusCode::NO_CONTENT, - "approved → unlisted should not require a moderation lock: {}", - String::from_utf8_lossy(test::read_body(resp).await.as_ref()) - ); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_admin_can_complete_without_lock() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let alpha_id = &test_env.dummy.project_alpha.project_id; - let project_id_raw = - test_env.dummy.project_alpha.project_id_parsed.0 as i64; - - set_project_processing( - project_id_raw, - test_env.dummy.project_alpha.project_slug.as_str(), - &test_env.db.pool, - &test_env.db.redis_pool, - ) - .await; - - let req = actix_web::test::TestRequest::patch() - .uri(&format!("/v3/project/{alpha_id}")) - .append_header(("Authorization", ADMIN_USER_PAT.unwrap())) - .set_json(json!({ "status": "approved" })) - .to_request(); - - let resp = api.call(req).await; - assert_eq!( - resp.status(), - StatusCode::NO_CONTENT, - "admin should be able to approve without a lock: {}", - String::from_utf8_lossy(test::read_body(resp).await.as_ref()) - ); - }, - ) - .await; -} - #[actix_rt::test] async fn test_lock_expires_at_populated() { with_test_environment( diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs index 6c5fbba490d..c2990005cd9 100644 --- a/apps/labrinth/tests/project.rs +++ b/apps/labrinth/tests/project.rs @@ -27,9 +27,10 @@ use labrinth::database::models::project_item::{ }; use labrinth::models::ids::ProjectId; use labrinth::models::pats::Scopes; -use labrinth::models::projects::ProjectStatus; +use labrinth::models::projects::{ProjectReviewStatus, ProjectStatus}; use labrinth::models::teams::ProjectPermissions; use labrinth::routes::PROJECT_REDIRECTS_NAMESPACE; +use labrinth::test::db::initialize_project_state; use labrinth::test::pats::create_test_pat; use labrinth::util::actix::{MultipartSegment, MultipartSegmentData}; use serde_json::json; @@ -707,11 +708,50 @@ async fn test_add_remove_project() { .get_project_deserialized_common("demo", USER_USER_PAT) .await; let id = project.id.to_string(); + let db_id = parse_base62(&id).unwrap() as i64; + let history_before = + project_history(db_id, &test_env.db.ro_pool).await; + + let resp = api.remove_project(&id, None).await; + assert!(resp.status().is_client_error()); + assert_eq!( + project_history(db_id, &test_env.db.ro_pool).await, + history_before, + "a denied deletion must not record a delta", + ); // Remove the project let resp = test_env.api.remove_project("demo", USER_USER_PAT).await; assert_status!(&resp, StatusCode::NO_CONTENT); + let exists = sqlx::query_scalar!( + r#"SELECT EXISTS(SELECT 1 FROM mods WHERE id = $1) AS "exists!""#, + db_id, + ) + .fetch_one(&*test_env.db.ro_pool) + .await + .unwrap(); + assert!(!exists); + + let mut expected_history = history_before; + expected_history.push(json!({ + "done_by": USER_USER_ID_PARSED, + "delta": { "kind": "deleted" }, + })); + assert_eq!( + project_history(db_id, &test_env.db.ro_pool).await, + expected_history, + "the deletion delta must survive hard deletion", + ); + + let resp = api.remove_project(&id, USER_USER_PAT).await; + assert!(resp.status().is_client_error()); + assert_eq!( + project_history(db_id, &test_env.db.ro_pool).await, + expected_history, + "deleting a missing project must not record another delta", + ); + // Confirm that the project is gone from the cache let mut redis_pool = test_env.db.redis_pool.connect().await.unwrap(); @@ -743,6 +783,244 @@ async fn test_add_remove_project() { .await; } +#[actix_rt::test] +async fn test_ghost_transfer_records_deleted_project_history() { + for review_status in + [ProjectReviewStatus::Rejected, ProjectReviewStatus::Withheld] + { + with_test_environment( + None, + |test_env: TestEnvironment| async move { + let api = &test_env.api; + let id = &test_env.dummy.project_alpha.project_id; + let db_id = parse_base62(id).unwrap() as i64; + let response = api.get_project(id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state(&response, id, review_status, None) + .await + .unwrap(); + let mut expected_history = + project_history(db_id, &test_env.db.ro_pool).await; + + let response = api.remove_project(id, USER_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + + let exists = sqlx::query_scalar!( + r#"SELECT EXISTS(SELECT 1 FROM mods WHERE id = $1) AS "exists!""#, + db_id, + ) + .fetch_one(&*test_env.db.ro_pool) + .await + .unwrap(); + assert!(exists, "ghost transfer must retain the project row"); + expected_history.push(json!({ + "done_by": USER_USER_ID_PARSED, + "delta": { "kind": "deleted" }, + })); + assert_eq!( + project_history(db_id, &test_env.db.ro_pool).await, + expected_history, + "ghost transfer must record deletion by the current user", + ); + }, + ) + .await; + } +} + +async fn project_history( + project_id: i64, + pool: &labrinth::database::ReadOnlyPgPool, +) -> Vec { + sqlx::query_scalar!( + r#" + SELECT jsonb_build_object('done_by', done_by, 'delta', delta) AS "entry!" + FROM project_history WHERE project_id = $1 ORDER BY id + "#, + project_id, + ) + .fetch_all(&**pool) + .await + .unwrap() +} + +async fn patch_project_state( + project_id: i64, + pool: &labrinth::database::ReadOnlyPgPool, +) -> (String, String, Vec) { + let state = sqlx::query!( + r#" + SELECT visibility, review_status FROM mods WHERE id = $1 + "#, + project_id, + ) + .fetch_one(&**pool) + .await + .unwrap(); + let history = project_history(project_id, pool).await; + (state.visibility, state.review_status, history) +} + +#[actix_rt::test] +async fn test_create_project_history() { + with_test_environment_all(None, |test_env| async move { + for visibility in ["listed", "unlisted", "private"] { + let slug = format!("creation-history-{visibility}"); + let mut request_data = test_env + .api + .get_public_project_creation_data_json(&slug, None) + .await; + request_data["requested_status"] = json!(match visibility { + "listed" => "approved", + visibility => visibility, + }); + let response = test_env + .api + .create_project( + ProjectCreationRequestData { + slug: slug.clone(), + jar: None, + segment_data: vec![MultipartSegment { + name: "data".to_string(), + filename: None, + content_type: Some("application/json".to_string()), + data: MultipartSegmentData::Text( + serde_json::to_string(&request_data).unwrap(), + ), + }], + }, + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::OK); + + let project = test_env + .api + .get_project_deserialized_common(&slug, USER_USER_PAT) + .await; + let db_id = parse_base62(&project.id.to_string()).unwrap() as i64; + assert_eq!( + patch_project_state(db_id, &test_env.db.ro_pool).await, + ( + visibility.to_string(), + "draft".to_string(), + vec![json!({ + "done_by": USER_USER_ID_PARSED, + "delta": { + "kind": "created", + "visibility": visibility, + "review_status": "draft", + }, + })], + ), + "creation must record exactly one delta with the initial state and creator", + ); + } + }) + .await; +} + +#[actix_rt::test] +async fn test_patch_project_visibility_history() { + with_test_environment_all(None, |test_env| async move { + let project_id = &test_env.dummy.project_alpha.project_id; + let db_id = parse_base62(project_id).unwrap() as i64; + let (mut previous, review_status, mut history) = + patch_project_state(db_id, &test_env.db.ro_pool).await; + + for visibility in ["private", "unlisted", "listed"] { + assert_ne!(previous, visibility); + let response = test_env + .api + .edit_project( + project_id, + json!({ "visibility": visibility }), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + + history.push(json!({ + "done_by": USER_USER_ID_PARSED, + "delta": { + "kind": "visibility", + "from": previous, + "to": visibility, + }, + })); + let expected = ( + visibility.to_string(), + review_status.clone(), + history.clone(), + ); + assert_eq!( + patch_project_state(db_id, &test_env.db.ro_pool).await, + expected, + ); + + let response = test_env + .api + .edit_project( + project_id, + json!({ "visibility": visibility }), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!( + patch_project_state(db_id, &test_env.db.ro_pool).await, + expected, + "a no-op visibility PATCH must not record another delta", + ); + previous = visibility.to_string(); + } + }) + .await; +} + +#[actix_rt::test] +async fn test_v3_edit_project_schema_excludes_review_status() { + fn has_property(schema: &serde_json::Value, name: &str) -> bool { + schema["properties"].get(name).is_some() + || schema["allOf"].as_array().is_some_and(|schemas| { + schemas.iter().any(|schema| has_property(schema, name)) + }) + } + + for schema in [ + ::schema(), + ] { + let schema = serde_json::to_value(schema).unwrap(); + assert!(has_property(&schema, "visibility")); + for field in ["status", "requested_status", "review_status"] { + assert!( + !has_property(&schema, field), + "project PATCH schema must not declare `{field}`: {schema}", + ); + } + } +} + +#[actix_rt::test] +async fn test_v3_edit_project_flattens_unknown_status_fields() { + let fields = json!({ + "status": "not-a-status", + "requested_status": null, + "review_status": "not-a-status", + }); + let mut patch = fields.clone(); + patch["visibility"] = json!("private"); + let edit: labrinth::routes::v3::projects::EditProject = + serde_json::from_value(patch).unwrap(); + + assert_eq!(serde_json::to_value(&edit.loader_fields).unwrap(), fields); + let serialized = serde_json::to_value(edit).unwrap(); + assert_eq!(serialized["visibility"], "private"); + for (field, value) in fields.as_object().unwrap() { + assert_eq!(&serialized[field], value); + } +} + #[actix_rt::test] pub async fn test_patch_project() { with_test_environment( @@ -799,20 +1077,6 @@ pub async fn test_patch_project() { ); assert!(body.get("details").is_none()); - // Failure because these are illegal requested statuses for a normal user. - for req in ["unknown", "processing", "withheld", "scheduled"] { - let resp = api - .edit_project( - alpha_project_slug, - json!({ - "requested_status": req, - }), - USER_USER_PAT, - ) - .await; - assert_status!(&resp, StatusCode::BAD_REQUEST); - } - // Failure because these should not be able to be set by a non-mod for key in ["moderation_message", "moderation_message_body"] { let resp = api @@ -863,18 +1127,6 @@ pub async fn test_patch_project() { assert_status!(&resp, StatusCode::BAD_REQUEST); } - // Not allowed to directly set status, as 'beta_project_slug' (the other project) is "processing" and cannot have its status changed like this. - let resp = api - .edit_project( - beta_project_slug, - json!({ - "status": "private" - }), - USER_USER_PAT, - ) - .await; - assert_status!(&resp, StatusCode::UNAUTHORIZED); - // Successful request to patch many fields. let resp = api .edit_project( @@ -947,108 +1199,29 @@ pub async fn test_patch_project() { } #[actix_rt::test] -async fn test_submit_invalid_project_for_review() { +async fn test_moderator_and_admin_can_edit_invalid_project_in_review() { with_test_environment( None, |test_env: TestEnvironment| async move { let api = &test_env.api; let project_slug = &test_env.dummy.project_alpha.project_slug; - let response = api - .edit_project( - project_slug, - json!({ "status": "draft" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let project_before = api - .get_project_deserialized(project_slug, USER_USER_PAT) - .await; - assert_eq!(project_before.status, ProjectStatus::Draft); - let original_description = project_before.description; - - let response = api - .edit_project( - project_slug, - json!({ - "description": "", - "status": "processing", - }), - USER_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::BAD_REQUEST); - - let project_after = api - .get_project_deserialized(project_slug, USER_USER_PAT) - .await; - assert_eq!(project_after.status, ProjectStatus::Draft); - assert_eq!(project_after.description, original_description); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_moderator_can_edit_invalid_project_in_review() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let project_slug = &test_env.dummy.project_alpha.project_slug; - - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let response = api - .edit_project( - project_slug, - json!({ "description": "" }), - MOD_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let project = api - .get_project_deserialized(project_slug, MOD_USER_PAT) - .await; - assert_eq!(project.status, ProjectStatus::Processing); - assert!(project.description.is_empty()); - }, - ) - .await; -} - -#[actix_rt::test] -async fn test_moderators_can_approve_invalid_project() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let project_slug = &test_env.dummy.project_alpha.project_slug; + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); for pat in [MOD_USER_PAT, ADMIN_USER_PAT] { let response = api .edit_project( project_slug, - json!({ "status": "processing", "description": "" }), - pat, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let response = api - .edit_project( - project_slug, - json!({ "status": "approved" }), + json!({ "description": "" }), pat, ) .await; @@ -1056,7 +1229,7 @@ async fn test_moderators_can_approve_invalid_project() { let project = api.get_project_deserialized(project_slug, pat).await; - assert_eq!(project.status, ProjectStatus::Approved); + assert_eq!(project.status, ProjectStatus::Processing); assert!(project.description.is_empty()); } }, @@ -1072,14 +1245,16 @@ async fn test_edit_invalid_project_in_review_rolls_back() { let api = &test_env.api; let project_slug = &test_env.dummy.project_alpha.project_slug; - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); let project_before = api .get_project_deserialized(project_slug, USER_USER_PAT) @@ -1105,56 +1280,6 @@ async fn test_edit_invalid_project_in_review_rolls_back() { .await; } -#[actix_rt::test] -async fn test_leaving_review_skips_validation() { - with_test_environment( - None, - |test_env: TestEnvironment| async move { - let api = &test_env.api; - let project_slug = &test_env.dummy.project_alpha.project_slug; - let original_project = api - .get_project_deserialized(project_slug, USER_USER_PAT) - .await; - - for (status, expected_status) in [ - ("draft", ProjectStatus::Draft), - ("rejected", ProjectStatus::Rejected), - ] { - let response = api - .edit_project( - project_slug, - json!({ - "description": original_project.description.clone(), - "status": "processing", - }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let response = api - .edit_project( - project_slug, - json!({ - "description": "", - "status": status, - }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); - - let project = api - .get_project_deserialized(project_slug, USER_USER_PAT) - .await; - assert_eq!(project.status, expected_status); - assert!(project.description.is_empty()); - } - }, - ) - .await; -} - #[actix_rt::test] async fn test_description_similarity_to_summary() { with_test_environment( @@ -1162,11 +1287,16 @@ async fn test_description_similarity_to_summary() { |test_env: TestEnvironment| async move { let api = &test_env.api; let project_slug = &test_env.dummy.project_alpha.project_slug; + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state(&response, project_slug, ProjectReviewStatus::Draft, None) + .await + .unwrap(); let summary = "Explore new worlds with configurable tools and adventures."; let response = api .edit_project( project_slug, - json!({ "status": "draft", "summary": summary }), + json!({ "summary": summary }), ADMIN_USER_PAT, ) .await; @@ -1318,14 +1448,16 @@ async fn test_add_invalid_gallery_item_in_review_rolls_back() { let api = &test_env.api; let project_slug = &test_env.dummy.project_alpha.project_slug; - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); let project_before = api.get_project(project_slug, USER_USER_PAT).await; @@ -1376,14 +1508,16 @@ async fn test_edit_invalid_gallery_item_in_review_rolls_back() { .await; assert_status!(&response, StatusCode::NO_CONTENT); - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); let project_before = api.get_project(project_slug, USER_USER_PAT).await; @@ -1440,21 +1574,22 @@ async fn test_delete_gallery_item_from_invalid_project_in_review_rolls_back() { project_slug, json!({ "description": "", - "status": "draft", }), ADMIN_USER_PAT, ) .await; assert_status!(&response, StatusCode::NO_CONTENT); - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); let project_before = api.get_project(project_slug, USER_USER_PAT).await; @@ -1488,14 +1623,16 @@ async fn test_edit_invalid_disclosures_in_review_rolls_back() { let disclosures_uri = format!("/v3/project/{project_slug}/disclosures"); - let response = api - .edit_project( - project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + project_slug, + ProjectReviewStatus::InReview, + None, + ) + .await + .unwrap(); let request = test::TestRequest::get() .uri(&disclosures_uri) @@ -1686,7 +1823,7 @@ async fn permissions_patch_project_v3() { // For each permission covered by EDIT_DETAILS, ensure the permission is required let edit_details = ProjectPermissions::EDIT_DETAILS; let test_pairs = [ - // Body, status, requested_status tested separately + // Body and visibility tested separately ("slug", json!("")), // generated in the test to not collide slugs ("name", json!("randomname")), ("description", json!("randomdescription")), @@ -1733,14 +1870,12 @@ async fn permissions_patch_project_v3() { .collect::>() .await; - // Test with status and requested_status - // This requires a project with a version, so we use alpha_project_id + // Visibility changes require EDIT_DETAILS, including no-op updates. let req_gen = |ctx: PermissionsTestContext| async move { api.edit_project( &ctx.project_id.unwrap(), json!({ - "status": "private", - "requested_status": "private", + "visibility": "private", }), ctx.test_pat.as_deref(), ) @@ -2456,8 +2591,11 @@ async fn test_draft_description_save_allows_required_nags() { with_test_environment(None, |test_env: TestEnvironment| async move { let api = &test_env.api; let slug = &test_env.dummy.project_alpha.project_slug; - let response = api.edit_project(slug, json!({ "status": "draft" }), ADMIN_USER_PAT).await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state(&response, slug, ProjectReviewStatus::Draft, None) + .await + .unwrap(); let response = api.edit_project(slug, json!({ "description": "Too short" }), USER_USER_PAT).await; assert_status!(&response, StatusCode::NO_CONTENT); @@ -2482,15 +2620,36 @@ async fn test_draft_description_save_allows_required_nags() { async fn queue_project_for_technical_review( test_env: &TestEnvironment, - patch: serde_json::Value, + mut fixture: serde_json::Value, issue_facets: Vec>, ) { let project = &test_env.dummy.project_alpha; + let fields = fixture.as_object_mut().unwrap(); + let old_status: ProjectStatus = + serde_json::from_value(fields.remove("status").unwrap()).unwrap(); + let requested_status: Option = fields + .remove("requested_status") + .map(|value| serde_json::from_value(value).unwrap()); + if !fields.is_empty() { + let response = test_env + .api + .edit_project(&project.project_id, fixture, ADMIN_USER_PAT) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + } let response = test_env .api - .edit_project(&project.project_id, patch, ADMIN_USER_PAT) + .get_project(&project.project_id, ADMIN_USER_PAT) .await; - assert_status!(&response, StatusCode::NO_CONTENT); + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + &project.project_id, + old_status.review_status().unwrap(), + Some(old_status.requested_visibility(requested_status)), + ) + .await + .unwrap(); if !issue_facets.is_empty() { let issues = issue_facets @@ -2587,21 +2746,16 @@ async fn assert_no_technical_review_auto_approval( } #[actix_rt::test] -async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { +async fn test_safe_technical_review_auto_approves() { use labrinth::database::models::DBUserId; use labrinth::database::models::notification_item::DBNotification; - use labrinth::routes::internal::delphi::tech_review_queue; - for (requested_status, old_status) in [ + for requested_status in [ ProjectStatus::Approved, ProjectStatus::Unlisted, ProjectStatus::Private, - ] - .into_iter() - .flat_map(|status| { - [ProjectStatus::Processing, ProjectStatus::Rejected] - .map(|old_status| (status, old_status)) - }) { + ] { + let old_status = ProjectStatus::Processing; with_test_environment( None, move |test_env: TestEnvironment| async move { @@ -2621,16 +2775,6 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { ], ) .await; - if old_status == ProjectStatus::Rejected { - let mut txn = test_env.db.pool.begin().await.unwrap(); - tech_review_queue::remove_projects( - &[DBProjectId::from(project.project_id_parsed)], - tech_review_queue::TechReviewRemovalReason::ScanCompleted, - &mut txn, - ).await.unwrap(); - txn.commit().await.unwrap(); - } - let before = api .get_project_deserialized(&project.project_id, MOD_USER_PAT) .await; @@ -2683,21 +2827,18 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { .await .unwrap(); - let request = if old_status == ProjectStatus::Processing { - test::TestRequest::post() - .uri(&format!( - "/_internal/moderation/tech-review/submit/{}", - project.project_id - )) - .append_pat(MOD_USER_PAT) - .set_json(json!({ "verdict": "safe" })) - } else { - test::TestRequest::patch() - .uri(&format!("/v3/project/{}", project.project_id)) - .append_pat(USER_USER_PAT) - .set_json(json!({ "status": "processing" })) - }; - let response = api.call(request.to_request()).await; + let response = api + .call( + test::TestRequest::post() + .uri(&format!( + "/_internal/moderation/tech-review/submit/{}", + project.project_id + )) + .append_pat(MOD_USER_PAT) + .set_json(json!({ "verdict": "safe" })) + .to_request(), + ) + .await; assert_status!(&response, StatusCode::NO_CONTENT); let after = api @@ -2802,9 +2943,6 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { }) })); - if old_status != ProjectStatus::Processing { - return; - } let response = api .call( test::TestRequest::post() @@ -3142,7 +3280,10 @@ async fn test_unsafe_technical_review_exit_rejects_resolved_project() { test_env.dummy.project_alpha.project_id )) .append_pat(MOD_USER_PAT) - .set_json(json!({ "verdict": "unsafe" })) + .set_json(json!({ + "verdict": "unsafe", + "reason": "unsafe code found during technical review", + })) .to_request(), ) .await; @@ -3153,6 +3294,13 @@ async fn test_unsafe_technical_review_exit_rejects_resolved_project() { &["resolved"], ) .await; + let project_id = parse_base62(&test_env.dummy.project_alpha.project_id).unwrap() as i64; + let (_, _, history) = patch_project_state(project_id, &test_env.db.ro_pool).await; + let entry = history.last().unwrap(); + assert_eq!(entry["done_by"], MOD_USER_ID_PARSED); + assert_eq!(entry["delta"]["kind"], "review_status"); + assert_eq!(entry["delta"]["to"], "rejected"); + assert_eq!(entry["delta"]["because"]["reason"], "unsafe code found during technical review"); }, ) .await; diff --git a/apps/labrinth/tests/project_patch_v2.rs b/apps/labrinth/tests/project_patch_v2.rs new file mode 100644 index 00000000000..456b560b3fd --- /dev/null +++ b/apps/labrinth/tests/project_patch_v2.rs @@ -0,0 +1,323 @@ +use actix_http::StatusCode; +use actix_web::test; +use common::api_common::{Api, ApiProject, AppendsOptionalPat}; +use common::api_v2::ApiV2; +use common::database::*; +use common::environment::{TestEnvironment, with_test_environment}; + +use labrinth::models::projects::{ + ProjectDelta, ProjectReviewStatus, ProjectVisibility, + ReviewStatusProvenance, +}; +use labrinth::test::db::initialize_project_state; +use serde_json::{Value, json}; + +pub mod common; + +type Environment = TestEnvironment; + +const SUMMARY: &str = "Configurable exploration tools for adventurous players."; +const BODY: &str = "Discover custom structures and explore new dimensions with a collection of configurable tools. Install the mod with Fabric, then configure each feature independently to suit your world. Both single-player adventures and multiplayer servers are supported."; + +async fn initialize(env: &Environment, status: ProjectReviewStatus) { + let id = &env.dummy.project_alpha.project_id; + let response = env.api.get_project(id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state( + &response, + id, + status, + Some(ProjectVisibility::Listed), + ) + .await + .unwrap(); +} + +async fn project(env: &Environment) -> Value { + let response = env + .api + .get_project(&env.dummy.project_alpha.project_id, ADMIN_USER_PAT) + .await; + assert_status!(&response, StatusCode::OK); + test::read_body_json(response).await +} + +async fn state(env: &Environment) -> (String, String) { + let row = sqlx::query!( + r#"SELECT review_status, visibility FROM mods WHERE id = $1"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .fetch_one(&**env.db.ro_pool) + .await + .unwrap(); + (row.review_status, row.visibility) +} + +async fn review_history(env: &Environment) -> Vec<(Option, Value)> { + sqlx::query!( + r#"SELECT done_by, delta FROM project_history WHERE project_id = $1 ORDER BY occurred_at, id"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .fetch_all(&**env.db.ro_pool) + .await + .unwrap() + .into_iter() + .filter(|row| matches!(serde_json::from_value::(row.delta.clone()).unwrap(), ProjectDelta::ReviewStatus { .. })) + .map(|row| (row.done_by, row.delta)) + .collect() +} + +#[actix_rt::test] +async fn combined_edits_are_validated_before_submission() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let id = &env.dummy.project_alpha.project_id; + let response = env + .api + .edit_project(id, json!({"body": "Too short"}), USER_USER_PAT) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + let before = review_history(&env).await; + let response = env.api.edit_project(id, json!({ + "body": BODY, "description": SUMMARY, "status": "processing", + "client_side": "unsupported", "server_side": "required", + }), USER_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + let saved = project(&env).await; + assert_eq!(saved["body"], BODY); + assert_eq!(saved["description"], SUMMARY); + assert_eq!(saved["client_side"], "unsupported"); + assert_eq!(saved["server_side"], "required"); + assert_eq!(state(&env).await, ("in_review".into(), "listed".into())); + assert_eq!(review_history(&env).await.len(), before.len() + 1); + }) + .await; +} + +#[actix_rt::test] +async fn invalid_ordinary_edits_prevent_review_transition() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let original = project(&env).await; + let before = review_history(&env).await; + let response = env.api.edit_project(&env.dummy.project_alpha.project_id, json!({ + "description": "x".repeat(257), "body": BODY, "status": "processing", + }), USER_USER_PAT).await; + assert_status!(&response, StatusCode::BAD_REQUEST); + assert_eq!(project(&env).await, original); + assert_eq!(state(&env).await, ("draft".into(), "listed".into())); + assert_eq!(review_history(&env).await, before); + }).await; +} + +#[actix_rt::test] +async fn slug_edit_submits_using_canonical_id() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let before = review_history(&env).await; + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_slug, + json!({ + "slug": "renamed-v2-review-project", "body": BODY, + "description": SUMMARY, "status": "processing", + }), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!(project(&env).await["slug"], "renamed-v2-review-project"); + assert_eq!(state(&env).await, ("in_review".into(), "listed".into())); + assert_eq!(review_history(&env).await.len(), before.len() + 1); + }) + .await; +} + +#[actix_rt::test] +async fn moderator_legacy_status_changes_have_user_provenance() { + with_test_environment(None, |env: Environment| async move { + for (legacy, target) in [ + ("rejected", ProjectReviewStatus::Rejected), + ("approved", ProjectReviewStatus::Approved), + ] { + initialize(&env, ProjectReviewStatus::InReview).await; + let before = review_history(&env).await; + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_id, + json!({"status": legacy}), + MOD_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!( + state(&env).await, + (target.as_str().into(), "listed".into()) + ); + let after = review_history(&env).await; + assert_eq!(after.len(), before.len() + 1); + let (actor, delta) = after.last().unwrap(); + assert_eq!(*actor, Some(MOD_USER_ID_PARSED)); + match serde_json::from_value::(delta.clone()).unwrap() + { + ProjectDelta::ReviewStatus { + from, + to, + because: ReviewStatusProvenance::ByUser { reason }, + } => { + assert_eq!(from, ProjectReviewStatus::InReview); + assert_eq!(to, target); + assert!(delta["because"].get("user_id").is_none()); + assert_eq!(reason, None); + } + other => panic!("unexpected review delta: {other:?}"), + } + } + }) + .await; +} + +#[actix_rt::test] +async fn approved_owner_legacy_status_only_changes_visibility() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Approved).await; + let before = review_history(&env).await; + for visibility in ["unlisted", "private"] { + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_id, + json!({"status": visibility}), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!( + state(&env).await, + ("approved".into(), visibility.into()) + ); + assert_eq!(review_history(&env).await, before); + } + }) + .await; +} + +#[actix_rt::test] +async fn draft_requested_status_is_preserved_when_submitted() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let id = &env.dummy.project_alpha.project_id; + let before = review_history(&env).await; + let response = env + .api + .edit_project( + id, + json!({"requested_status": "unlisted"}), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!(state(&env).await, ("draft".into(), "unlisted".into())); + assert_eq!(review_history(&env).await, before); + let response = env + .api + .edit_project(id, json!({"status": "processing"}), USER_USER_PAT) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!(state(&env).await, ("in_review".into(), "unlisted".into())); + assert_eq!(project(&env).await["requested_status"], "unlisted"); + assert_eq!(review_history(&env).await.len(), before.len() + 1); + }) + .await; +} + +#[actix_rt::test] +async fn unsupported_legacy_statuses_do_not_apply_edits() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let original = project(&env).await; + let before = review_history(&env).await; + for field in ["status", "requested_status"] { + for unsupported in ["unknown", "scheduled"] { + let mut body = json!({"body": BODY, "description": SUMMARY}); + body[field] = json!(unsupported); + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_id, + body, + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::BAD_REQUEST); + assert_eq!(project(&env).await, original); + assert_eq!( + state(&env).await, + ("draft".into(), "listed".into()) + ); + assert_eq!(review_history(&env).await, before); + } + } + }) + .await; +} + +/// Legacy PATCH commits ordinary edits before the separate review transition; +/// a later permission or review-validation failure does not roll those edits back. +#[actix_rt::test] +async fn ordinary_edits_survive_later_review_failure() { + with_test_environment(None, |env: Environment| async move { + for (status, body, expected) in [ + ("approved", BODY, StatusCode::FORBIDDEN), + ("processing", "Too short", StatusCode::BAD_REQUEST), + ("processing", SUMMARY, StatusCode::BAD_REQUEST), + ] { + initialize(&env, ProjectReviewStatus::Draft).await; + let before = review_history(&env).await; + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_id, + json!({ + "body": body, "description": SUMMARY, "status": status, + }), + USER_USER_PAT, + ) + .await; + assert_status!(&response, expected); + let saved = project(&env).await; + assert_eq!(saved["body"], body); + assert_eq!(saved["description"], SUMMARY); + assert_eq!(state(&env).await, ("draft".into(), "listed".into())); + assert_eq!(review_history(&env).await, before); + } + }) + .await; +} + +#[actix_rt::test] +async fn explicit_v2_review_state_route_remains_available() { + with_test_environment(None, |env: Environment| async move { + initialize(&env, ProjectReviewStatus::Draft).await; + let before = review_history(&env).await; + let response = env + .api + .call( + test::TestRequest::post() + .uri(&format!( + "/v2/project/{}/review-state", + env.dummy.project_alpha.project_id + )) + .append_pat(USER_USER_PAT) + .set_json(json!({"review_status": "in_review"})) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_eq!(state(&env).await, ("in_review".into(), "listed".into())); + assert_eq!(review_history(&env).await.len(), before.len() + 1); + }) + .await; +} diff --git a/apps/labrinth/tests/project_review_state.rs b/apps/labrinth/tests/project_review_state.rs new file mode 100644 index 00000000000..23fa404144b --- /dev/null +++ b/apps/labrinth/tests/project_review_state.rs @@ -0,0 +1,479 @@ +use actix_http::StatusCode; +use actix_web::{dev::ServiceResponse, test}; +use common::api_common::{ + Api, ApiProject, ApiTeams, AppendsOptionalPat, generic::GenericApi, +}; +use common::database::*; +use common::environment::{TestEnvironment, with_test_environment_all}; +use labrinth::database::models::moderation_lock_item::{ + DBModerationLock, LOCK_EXPIRY_MINUTES, +}; +use labrinth::database::models::{DBProjectId, DBUserId}; +use labrinth::models::projects::{ + ProjectDelta, ProjectReviewStatus, ProjectVisibility, + ReviewStatusProvenance, +}; +use labrinth::test::db::initialize_project_state; +use serde_json::{Value, json}; + +pub mod common; + +type Environment = TestEnvironment; + +#[actix_rt::test] +async fn open_moderation_issues_block_submission_and_approval() { + with_test_environment_all(None, |env| async move { + initialize( + &env, + ProjectReviewStatus::Draft, + Some(ProjectVisibility::Private), + ) + .await; + let response = env + .api + .call( + test::TestRequest::put() + .uri(&format!( + "/v3/thread/{}/issue", + env.dummy.project_alpha.thread_id + )) + .append_pat(MOD_USER_PAT) + .set_json(json!({"issues": [{ + "why": {"message": "Resolve before review"}, + "facets": [{"what": {"type": "mark_addressed"}}] + }]})) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + for (source, target, pat) in [ + (ProjectReviewStatus::Draft, "in_review", USER_USER_PAT), + (ProjectReviewStatus::Rejected, "in_review", USER_USER_PAT), + (ProjectReviewStatus::InReview, "approved", MOD_USER_PAT), + ] { + initialize(&env, source, None).await; + sqlx::query!( + r#"UPDATE mods SET moderation_message = 'Changes required', + moderation_message_body = 'Resolve the outstanding issue', + queued = NOW() - INTERVAL '2 days', + initial_queued = NOW() - INTERVAL '3 days' + WHERE id = $1"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .execute(&env.db.pool) + .await + .unwrap(); + let before = history(&env).await; + let metadata_before = review_metadata(&env).await; + assert!(!metadata_before["queued"].is_null()); + assert!(!metadata_before["initial_queued"].is_null()); + assert_eq!( + metadata_before["moderation_message"], + "Changes required" + ); + assert_eq!( + metadata_before["moderation_message_body"], + "Resolve the outstanding issue" + ); + let thread_before = thread(&env).await; + let notifications_before = notifications(&env).await; + let response = + update(&env, json!({"review_status": target}), pat).await; + assert_status!(&response, StatusCode::BAD_REQUEST); + assert_state(&env, source, ProjectVisibility::Private).await; + assert_eq!(history(&env).await, before); + assert_eq!(review_metadata(&env).await, metadata_before); + assert_eq!(thread(&env).await, thread_before); + assert_eq!(notifications(&env).await, notifications_before); + } + }) + .await; +} + +async fn review_metadata(env: &Environment) -> Value { + sqlx::query_scalar!( + r#"SELECT to_jsonb(snapshot) AS "metadata!" FROM ( + SELECT queued, initial_queued, moderation_message, + moderation_message_body, approved, approved_because + FROM mods WHERE id = $1 + ) snapshot"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .fetch_one(&**env.db.ro_pool) + .await + .unwrap() +} + +async fn thread(env: &Environment) -> Value { + let response = env + .api + .get_thread(&env.dummy.project_alpha.thread_id, MOD_USER_PAT) + .await; + assert_status!(&response, StatusCode::OK); + test::read_body_json(response).await +} + +async fn notifications(env: &Environment) -> Value { + let response = env + .api + .get_user_notifications(USER_USER_ID, USER_USER_PAT) + .await; + assert_status!(&response, StatusCode::OK); + test::read_body_json(response).await +} + +#[actix_rt::test] +async fn owner_cannot_return_unapproved_project_to_draft() { + with_test_environment_all(None, |env| async move { + for source in [ + ProjectReviewStatus::Rejected, + ProjectReviewStatus::Withheld, + ProjectReviewStatus::InReview, + ] { + initialize(&env, source, Some(ProjectVisibility::Private)).await; + let before = history(&env).await; + let response = + update(&env, json!({"review_status": "draft"}), USER_USER_PAT) + .await; + assert_status!(&response, StatusCode::FORBIDDEN); + assert_state(&env, source, ProjectVisibility::Private).await; + assert_eq!(history(&env).await, before); + } + }) + .await; +} + +#[actix_rt::test] +async fn resolved_rejected_resubmission_auto_approves() { + with_test_environment_all(None, |env| async move { + for visibility in [ProjectVisibility::Unlisted, ProjectVisibility::Private] { + initialize(&env, ProjectReviewStatus::Rejected, Some(visibility)).await; + let response = env.api.call(test::TestRequest::put() + .uri(&format!("/v3/thread/{}/issue", env.dummy.project_alpha.thread_id)) + .append_pat(MOD_USER_PAT) + .set_json(json!({"issues": [{ + "why": {"message": "Remove unrelated tags"}, + "facets": [{"what": {"type": "remove_tags", "value": {"tags": ["magic"]}}}] + }]})).to_request()).await; + assert_status!(&response, StatusCode::NO_CONTENT); + sqlx::query!( + r#"UPDATE mods SET initial_queued = NOW() - INTERVAL '3 days' WHERE id = $1"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ).execute(&env.db.pool).await.unwrap(); + assert!(!review_metadata(&env).await["initial_queued"].is_null()); + let before_thread = thread(&env).await; + let issues = before_thread["issues"].as_array().unwrap(); + assert!(!issues.is_empty()); + assert!(issues.iter().all(|issue| issue["verdict"] == "resolved")); + let mut expected_ids = issues.iter().map(|issue| issue["id"].as_str().unwrap().to_owned()).collect::>(); + expected_ids.sort(); + let before = history(&env).await; + let response = update(&env, json!({"review_status": "in_review"}), USER_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, ProjectReviewStatus::Approved, visibility).await; + assert!(review_metadata(&env).await["initial_queued"].is_null()); + let after = history(&env).await; + assert_eq!(after.len(), before.len() + 1); + let (done_by, delta) = after.last().unwrap(); + assert_eq!(*done_by, None); + assert_eq!(delta["kind"], "review_status"); + assert_eq!(delta["from"], "rejected"); + assert_eq!(delta["to"], "approved"); + assert_eq!(delta["because"]["kind"], "auto_approval"); + assert_eq!(delta["because"]["trigger"], json!({"type": "resubmission", "user_id": USER_USER_ID})); + let mut actual_ids = delta["because"]["resolved_issue_ids"].as_array().unwrap().iter().map(|id| id.as_str().unwrap().to_owned()).collect::>(); + actual_ids.sort(); + assert_eq!(actual_ids, expected_ids); + } + }).await; +} + +#[actix_rt::test] +async fn moderator_can_set_native_review_targets() { + with_test_environment_all(None, |env| async move { + for target in [ + ProjectReviewStatus::Draft, + ProjectReviewStatus::InReview, + ProjectReviewStatus::Approved, + ProjectReviewStatus::Rejected, + ProjectReviewStatus::Withheld, + ] { + let source = if target == ProjectReviewStatus::Draft { + ProjectReviewStatus::InReview + } else { + ProjectReviewStatus::Draft + }; + initialize(&env, source, Some(ProjectVisibility::Unlisted)).await; + let before = history(&env).await; + let response = update( + &env, + json!({"review_status": target.as_str()}), + MOD_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, target, ProjectVisibility::Unlisted).await; + assert_eq!(history(&env).await.len(), before.len() + 1); + } + }) + .await; +} + +async fn initialize( + env: &Environment, + status: ProjectReviewStatus, + visibility: Option, +) { + let id = &env.dummy.project_alpha.project_id; + let response = env.api.get_project(id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + initialize_project_state(&response, id, status, visibility) + .await + .unwrap(); +} + +async fn update( + env: &Environment, + body: Value, + pat: Option<&str>, +) -> ServiceResponse { + let prefix = match &env.api { + GenericApi::V2(_) => "v2", + GenericApi::V3(_) => "v3", + }; + env.api + .call( + test::TestRequest::post() + .uri(&format!( + "/{prefix}/project/{}/review-state", + env.dummy.project_alpha.project_id + )) + .append_pat(pat) + .set_json(body) + .to_request(), + ) + .await +} + +async fn history(env: &Environment) -> Vec<(Option, Value)> { + sqlx::query!( + r#"SELECT done_by, delta FROM project_history WHERE project_id = $1 ORDER BY occurred_at, id"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .fetch_all(&**env.db.ro_pool) + .await.unwrap() + .into_iter().map(|row| (row.done_by, row.delta)).collect() +} + +async fn assert_state( + env: &Environment, + status: ProjectReviewStatus, + visibility: ProjectVisibility, +) { + let row = sqlx::query!( + r#"SELECT review_status, visibility FROM mods WHERE id = $1"#, + env.dummy.project_alpha.project_id_parsed.0 as i64, + ) + .fetch_one(&**env.db.ro_pool) + .await + .unwrap(); + assert_eq!(row.review_status, status.as_str()); + assert_eq!(row.visibility, visibility.as_str()); +} + +#[actix_rt::test] +async fn owner_submission_preserves_visibility() { + with_test_environment_all(None, |env| async move { + for visibility in + [ProjectVisibility::Unlisted, ProjectVisibility::Private] + { + initialize(&env, ProjectReviewStatus::Draft, Some(visibility)) + .await; + let before = history(&env).await; + let response = update( + &env, + json!({"review_status": "in_review"}), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, ProjectReviewStatus::InReview, visibility).await; + assert_eq!(history(&env).await.len(), before.len() + 1); + } + }) + .await; +} + +#[actix_rt::test] +async fn owner_submission_requires_valid_project() { + with_test_environment_all(None, |env| async move { + initialize( + &env, + ProjectReviewStatus::Draft, + Some(ProjectVisibility::Private), + ) + .await; + let response = env + .api + .edit_project( + &env.dummy.project_alpha.project_id, + json!({"description": "Too short"}), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + let before = history(&env).await; + let response = + update(&env, json!({"review_status": "in_review"}), USER_USER_PAT) + .await; + assert_status!(&response, StatusCode::BAD_REQUEST); + assert_state( + &env, + ProjectReviewStatus::Draft, + ProjectVisibility::Private, + ) + .await; + assert_eq!(history(&env).await, before); + }) + .await; +} + +#[actix_rt::test] +async fn owner_cannot_self_approve_or_change_approved_review() { + with_test_environment_all(None, |env| async move { + for source in + [ProjectReviewStatus::Draft, ProjectReviewStatus::Approved] + { + initialize(&env, source, Some(ProjectVisibility::Unlisted)).await; + let before = history(&env).await; + let targets = if source == ProjectReviewStatus::Approved { + vec!["in_review", "draft", "rejected", "withheld"] + } else { + vec!["approved", "rejected", "withheld"] + }; + for target in targets { + let response = update( + &env, + json!({"review_status": target}), + USER_USER_PAT, + ) + .await; + assert_status!(&response, StatusCode::FORBIDDEN); + assert_state(&env, source, ProjectVisibility::Unlisted).await; + assert_eq!(history(&env).await, before); + } + } + }) + .await; +} + +#[actix_rt::test] +async fn moderator_approval_records_user_and_reason_without_changing_visibility() + { + with_test_environment_all(None, |env| async move { + for visibility in [ProjectVisibility::Unlisted, ProjectVisibility::Private] { + initialize(&env, ProjectReviewStatus::InReview, Some(visibility)).await; + let before = history(&env).await; + let response = update(&env, json!({"review_status": "approved", "reason": "Reviewed project and files"}), MOD_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, ProjectReviewStatus::Approved, visibility).await; + let after = history(&env).await; + assert_eq!(after.len(), before.len() + 1); + let (done_by, delta) = after.last().unwrap(); + assert_eq!(*done_by, Some(MOD_USER_ID_PARSED)); + match serde_json::from_value::(delta.clone()).unwrap() { + ProjectDelta::ReviewStatus { from, to, because: ReviewStatusProvenance::ByUser { reason } } => { + assert_eq!(from, ProjectReviewStatus::InReview); + assert_eq!(to, ProjectReviewStatus::Approved); + assert!(delta["because"].get("user_id").is_none()); + assert_eq!(reason.as_deref(), Some("Reviewed project and files")); + } + other => panic!("unexpected audit delta: {other:?}"), + } + } + }).await; +} + +#[actix_rt::test] +async fn same_state_is_no_content_without_audit() { + with_test_environment_all(None, |env| async move { + for status in [ProjectReviewStatus::Draft, ProjectReviewStatus::InReview, ProjectReviewStatus::Approved, ProjectReviewStatus::Rejected, ProjectReviewStatus::Withheld] { + initialize(&env, status, Some(ProjectVisibility::Private)).await; + let before = history(&env).await; + let response = update(&env, json!({"review_status": status.as_str(), "reason": "No change"}), MOD_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, status, ProjectVisibility::Private).await; + assert_eq!(history(&env).await, before); + } + }).await; +} + +#[actix_rt::test] +async fn invalid_schema_and_unauthorized_requests_do_not_mutate() { + with_test_environment_all(None, |env| async move { + initialize( + &env, + ProjectReviewStatus::Draft, + Some(ProjectVisibility::Private), + ) + .await; + let before = history(&env).await; + for body in [ + json!({}), + json!({"review_status": "processing"}), + json!({"review_status": "unlisted"}), + json!({"review_status": "unknown"}), + json!({"review_status": null}), + json!({"review_status": 1}), + json!({"review_status": "in_review", "reason": 1}), + ] { + let response = update(&env, body, MOD_USER_PAT).await; + assert_status!(&response, StatusCode::BAD_REQUEST); + } + for pat in [None, FRIEND_USER_PAT] { + let response = + update(&env, json!({"review_status": "in_review"}), pat).await; + assert_status!(&response, StatusCode::FORBIDDEN); + } + assert_state( + &env, + ProjectReviewStatus::Draft, + ProjectVisibility::Private, + ) + .await; + assert_eq!(history(&env).await, before); + }) + .await; +} + +#[actix_rt::test] +async fn moderation_locks_gate_review_transitions() { + with_test_environment_all(None, |env| async move { + let id = DBProjectId::from(env.dummy.project_alpha.project_id_parsed); + for scenario in ["absent", "own", "other", "expired", "admin"] { + initialize(&env, ProjectReviewStatus::InReview, Some(ProjectVisibility::Unlisted)).await; + DBModerationLock::release(id, DBUserId(MOD_USER_ID_PARSED), &env.db.pool).await.unwrap(); + DBModerationLock::release(id, DBUserId(ADMIN_USER_ID_PARSED), &env.db.pool).await.unwrap(); + if scenario != "absent" { + let holder = if scenario == "own" || scenario == "admin" { MOD_USER_ID_PARSED } else { ADMIN_USER_ID_PARSED }; + DBModerationLock::acquire(id, DBUserId(holder), &env.db.pool).await.unwrap().unwrap(); + } + if scenario == "expired" { + sqlx::query!(r#"UPDATE moderation_locks SET locked_at = NOW() - ($1::bigint * INTERVAL '1 minute') - INTERVAL '1 second' WHERE project_id = $2"#, LOCK_EXPIRY_MINUTES, id.0) + .execute(&env.db.pool).await.unwrap(); + } + let before = history(&env).await; + let pat = if scenario == "admin" { ADMIN_USER_PAT } else { MOD_USER_PAT }; + let response = update(&env, json!({"review_status": "rejected"}), pat).await; + if scenario == "other" { + assert_status!(&response, StatusCode::FORBIDDEN); + assert_state(&env, ProjectReviewStatus::InReview, ProjectVisibility::Unlisted).await; + assert_eq!(history(&env).await, before); + } else { + assert_status!(&response, StatusCode::NO_CONTENT); + assert_state(&env, ProjectReviewStatus::Rejected, ProjectVisibility::Unlisted).await; + assert_eq!(history(&env).await.len(), before.len() + 1); + } + } + }).await; +} diff --git a/apps/labrinth/tests/scopes.rs b/apps/labrinth/tests/scopes.rs index ac02fb08c34..ffe32e4c356 100644 --- a/apps/labrinth/tests/scopes.rs +++ b/apps/labrinth/tests/scopes.rs @@ -412,14 +412,16 @@ pub async fn project_version_reads_scopes() { .unwrap(); // Leave review before hiding the project's version so review validation stays satisfied. - let resp = api - .edit_project( - beta_project_id, - json!({ "status": "draft" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&resp, StatusCode::NO_CONTENT); + let resp = api.get_project(beta_project_id, ADMIN_USER_PAT).await; + assert_status!(&resp, StatusCode::OK); + crate::common::db::initialize_project_state( + &resp, + beta_project_id, + labrinth::models::v3::projects::ProjectReviewStatus::Draft, + None, + ) + .await + .expect("failed to initialize project fixture state"); // Version reading // First, set version to hidden (which is when the scope is required to read it) diff --git a/apps/labrinth/tests/v2/bulk_project_versions.rs b/apps/labrinth/tests/v2/bulk_project_versions.rs index 8f8fbfcd1c8..b9ab0a43866 100644 --- a/apps/labrinth/tests/v2/bulk_project_versions.rs +++ b/apps/labrinth/tests/v2/bulk_project_versions.rs @@ -84,14 +84,16 @@ async fn bulk_project_versions_filter_each_project_without_collapsing_releases() let api = &env.api; let alpha = &env.dummy.project_alpha; let beta = &env.dummy.project_beta; - let response = api - .edit_project( - &beta.project_id, - json!({"status": "approved"}), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(&beta.project_id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + crate::common::db::initialize_project_state( + &response, + &beta.project_id, + labrinth::models::v3::projects::ProjectReviewStatus::Approved, + Some(labrinth::models::v3::projects::ProjectVisibility::Listed), + ) + .await + .expect("failed to initialize project fixture state"); let mut expected = HashSet::new(); let mut fabric = HashSet::new(); for project in [alpha.project_id_parsed, beta.project_id_parsed] { @@ -295,14 +297,16 @@ async fn bulk_project_versions_paginate_globally_without_a_default_limit() { let api = &env.api; let alpha = &env.dummy.project_alpha; let beta = &env.dummy.project_beta; - let response = api - .edit_project( - &beta.project_id, - json!({"status": "approved"}), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(&beta.project_id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + crate::common::db::initialize_project_state( + &response, + &beta.project_id, + labrinth::models::v3::projects::ProjectReviewStatus::Approved, + Some(labrinth::models::v3::projects::ProjectVisibility::Listed), + ) + .await + .expect("failed to initialize project fixture state"); let mut expected = HashSet::new(); for index in 0..101 { let project = if index % 2 == 0 { @@ -404,14 +408,16 @@ async fn bulk_project_versions_apply_visibility_before_global_pagination() { .edit_version(&hidden, json!({"status": "draft"}), USER_USER_PAT) .await; assert_status!(&response, StatusCode::NO_CONTENT); - let response = api - .edit_project( - &beta.project_id, - json!({"status": "processing"}), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = api.get_project(&beta.project_id, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + crate::common::db::initialize_project_state( + &response, + &beta.project_id, + labrinth::models::v3::projects::ProjectReviewStatus::InReview, + None, + ) + .await + .expect("failed to initialize project fixture state"); let response = api .edit_version( &beta.version_id, diff --git a/apps/labrinth/tests/v2/search.rs b/apps/labrinth/tests/v2/search.rs index f16b0ee20a9..17ac0e61aea 100644 --- a/apps/labrinth/tests/v2/search.rs +++ b/apps/labrinth/tests/v2/search.rs @@ -43,17 +43,6 @@ async fn search_projects() { let req = api.add_public_project(&slug, Some(jar), modify_json, pat); let (project, _) = req.await; - // Approve, so that the project is searchable - let resp = api - .edit_project( - &project.id.to_string(), - json!({ - "status": "approved" - }), - MOD_USER_PAT, - ) - .await; - assert_status!(&resp, StatusCode::NO_CONTENT); (project.id.0, id) } }; diff --git a/apps/labrinth/tests/v2/version.rs b/apps/labrinth/tests/v2/version.rs index a4d6c70f1fb..3478da00345 100644 --- a/apps/labrinth/tests/v2/version.rs +++ b/apps/labrinth/tests/v2/version.rs @@ -149,14 +149,17 @@ async fn update_files_respects_processing_project_visibility() { let api = &test_env.api; let project = &test_env.dummy.project_alpha; - let response = api - .edit_project( - &project.project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = + api.get_project(&project.project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + crate::common::db::initialize_project_state( + &response, + &project.project_slug, + labrinth::models::v3::projects::ProjectReviewStatus::InReview, + None, + ) + .await + .expect("failed to initialize project fixture state"); for pat in [USER_USER_PAT, MOD_USER_PAT] { let versions = api diff --git a/apps/labrinth/tests/version.rs b/apps/labrinth/tests/version.rs index 19ab8fab796..35d5b8859c0 100644 --- a/apps/labrinth/tests/version.rs +++ b/apps/labrinth/tests/version.rs @@ -99,14 +99,17 @@ async fn deleting_version_in_review_that_fails_validation_rolls_back() { let api = &test_env.api; let project = &test_env.dummy.project_alpha; - let response = api - .edit_project( - &project.project_slug, - json!({ "status": "processing" }), - ADMIN_USER_PAT, - ) - .await; - assert_status!(&response, StatusCode::NO_CONTENT); + let response = + api.get_project(&project.project_slug, ADMIN_USER_PAT).await; + assert_status!(&response, StatusCode::OK); + crate::common::db::initialize_project_state( + &response, + &project.project_slug, + labrinth::models::v3::projects::ProjectReviewStatus::InReview, + None, + ) + .await + .expect("failed to initialize project fixture state"); let response = api.remove_version(&project.version_id, USER_USER_PAT).await; diff --git a/packages/api-client/src/modules/labrinth/projects/v2.ts b/packages/api-client/src/modules/labrinth/projects/v2.ts index 62197d23caf..b7311327214 100644 --- a/packages/api-client/src/modules/labrinth/projects/v2.ts +++ b/packages/api-client/src/modules/labrinth/projects/v2.ts @@ -106,7 +106,7 @@ export class LabrinthProjectsV2Module extends AbstractModule { * }) * ``` */ - public async edit(id: string, data: Partial): Promise { + public async edit(id: string, data: Labrinth.Projects.v2.EditProjectRequest): Promise { return this.client.request(`/project/${id}`, { api: 'labrinth', version: 2, @@ -115,6 +115,19 @@ export class LabrinthProjectsV2Module extends AbstractModule { }) } + /** Set a project's review state. */ + public async setReviewState( + id: string, + data: Labrinth.Projects.v2.ReviewStateUpdate, + ): Promise { + return this.client.request(`/project/${id}/review-state`, { + api: 'labrinth', + version: 2, + method: 'POST', + body: data, + }) + } + /** * Delete a project * diff --git a/packages/api-client/src/modules/labrinth/projects/v3.ts b/packages/api-client/src/modules/labrinth/projects/v3.ts index 694cdde84da..08ef56dedea 100644 --- a/packages/api-client/src/modules/labrinth/projects/v3.ts +++ b/packages/api-client/src/modules/labrinth/projects/v3.ts @@ -130,6 +130,19 @@ export class LabrinthProjectsV3Module extends AbstractModule { }) } + /** Set a project's review state. */ + public async setReviewState( + id: string, + data: Labrinth.Projects.v3.ReviewStateUpdate, + ): Promise { + return this.client.request(`/project/${id}/review-state`, { + api: 'labrinth', + version: 3, + method: 'POST', + body: data, + }) + } + /** * Get the organization that owns a project * diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts index 73f40a36599..b2a1210e098 100644 --- a/packages/api-client/src/modules/labrinth/types.ts +++ b/packages/api-client/src/modules/labrinth/types.ts @@ -877,6 +877,34 @@ export namespace Labrinth { export namespace Projects { export namespace v2 { + export type ReviewStatus = v3.ReviewStatus + export type ReviewStateUpdate = v3.ReviewStateUpdate + export type Visibility = v3.Visibility + + export type EditProjectRequest = { + title?: string + description?: string + body?: string + categories?: string[] + additional_categories?: string[] + issues_url?: string | null + source_url?: string | null + wiki_url?: string | null + license_url?: string | null + discord_url?: string | null + donation_urls?: DonationLink[] + license_id?: string + client_side?: Environment + server_side?: Environment + slug?: string + visibility?: Visibility + status?: ProjectStatus + requested_status?: ProjectStatus | null + moderation_message?: string | null + moderation_message_body?: string | null + monetization_status?: MonetizationStatus + } + export type Environment = 'required' | 'optional' | 'unsupported' | 'unknown' export type ProjectStatus = @@ -1176,6 +1204,15 @@ export namespace Labrinth { nags: ProjectNag[] } + export type ReviewStatus = 'draft' | 'in_review' | 'approved' | 'rejected' | 'withheld' + + export type ReviewStateUpdate = { + review_status: ReviewStatus + reason?: string | null + } + + export type Visibility = 'listed' | 'unlisted' | 'private' + export type Project = { id: string slug?: string @@ -1304,8 +1341,7 @@ export namespace Labrinth { link_urls?: Record license_id?: string slug?: string - status?: v2.ProjectStatus - requested_status?: v2.ProjectStatus | null + visibility?: Visibility moderation_message?: string | null moderation_message_body?: string | null monetization_status?: v2.MonetizationStatus @@ -2970,6 +3006,7 @@ export namespace Labrinth { export type SubmitProjectRequest = { verdict: 'safe' | 'unsafe' message?: string + reason?: string | null } export type SearchResponse = {