diff --git a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue index ba291e264bd..31217865c0d 100644 --- a/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue +++ b/apps/frontend/src/components/ui/moderation/ModerationQueueCard.vue @@ -37,11 +37,17 @@
Requesting - +
- First submitted {{ formatRelativeTime(initialQueuedDate.toISOString()) }} + First submitted + {{ formatRelativeTime(initialQueuedDate.toISOString()) }}
diff --git a/apps/frontend/src/components/ui/thread/ConversationThread.vue b/apps/frontend/src/components/ui/thread/ConversationThread.vue index ae92101e3b0..8884d268f3b 100644 --- a/apps/frontend/src/components/ui/thread/ConversationThread.vue +++ b/apps/frontend/src/components/ui/thread/ConversationThread.vue @@ -872,7 +872,8 @@ const replyMutation = useMutation({ const assertCurrent = () => { if (props.thread.id !== threadId) throw new Error(formatMessage(messages.changedThread)) } - if (replyBody.value.trim()) { + const reviewReason = replyBody.value.trim() || undefined + if (reviewReason) { const reply = { threadId, body: replyBody.value, @@ -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, reviewReason)) !== false return true }, onError: (error) => diff --git a/apps/frontend/src/pages/[type]/[project]/moderation.vue b/apps/frontend/src/pages/[type]/[project]/moderation.vue index 8d3c6749379..7aef5703b64 100644 --- a/apps/frontend/src/pages/[type]/[project]/moderation.vue +++ b/apps/frontend/src/pages/[type]/[project]/moderation.vue @@ -528,7 +528,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, reviewReason?: string) { if (status === 'processing') { return await setProcessing() } @@ -541,7 +541,11 @@ 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.edit(projectId, { + status, + review_reason: reviewReason, + }) await invalidate() await queryClient.invalidateQueries({ queryKey: ['thread', threadId] }) return true diff --git a/apps/frontend/src/providers/project-review/review-decision.ts b/apps/frontend/src/providers/project-review/review-decision.ts index 194c7fc5753..00e3193f40d 100644 --- a/apps/frontend/src/providers/project-review/review-decision.ts +++ b/apps/frontend/src/providers/project-review/review-decision.ts @@ -52,6 +52,7 @@ export async function applyReviewDecision( } else if (decision.status) { await client.labrinth.projects_v3.edit(decision.projectId, { status: decision.status, + review_reason: decision.body.trim() || undefined, }) } assertCurrent() diff --git a/apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json b/apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json deleted file mode 100644 index 01b1d755f6c..00000000000 --- a/apps/labrinth/.sqlx/query-04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "db_name": "PostgreSQL", - "query": "\n SELECT status, slug\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "status", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "status" - } - } - }, - { - "ordinal": 1, - "name": "slug", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "slug" - } - } - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false, - true - ] - }, - "hash": "04dbb91ad93de31a6eab62f712743dc3b3e4c93605769fd7d653beff95bf46e0" -} diff --git a/apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json b/apps/labrinth/.sqlx/query-08c89420b7bb31235ce5fccf3f77cbaf79db836565767ef2bf13a8890c144475.json similarity index 87% rename from apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json rename to apps/labrinth/.sqlx/query-08c89420b7bb31235ce5fccf3f77cbaf79db836565767ef2bf13a8890c144475.json index 6d4dbbee971..4beb01ed09d 100644 --- a/apps/labrinth/.sqlx/query-20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2.json +++ b/apps/labrinth/.sqlx/query-08c89420b7bb31235ce5fccf3f77cbaf79db836565767ef2bf13a8890c144475.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.in_review\n\t\t\t\t)\n\t\t\t)\n\t\t", "describe": { "columns": [ { @@ -20,5 +20,5 @@ null ] }, - "hash": "20ebdaf894827f6084af18aedab2f6ce511a659c11e348f30afeb43007a90ee2" + "hash": "08c89420b7bb31235ce5fccf3f77cbaf79db836565767ef2bf13a8890c144475" } diff --git a/apps/labrinth/.sqlx/query-09b53be246c239325abee5bfa297c403aade9dd1dcd79f71ec6d7ba193bbbf3b.json b/apps/labrinth/.sqlx/query-09b53be246c239325abee5bfa297c403aade9dd1dcd79f71ec6d7ba193bbbf3b.json new file mode 100644 index 00000000000..5fb061dcd4b --- /dev/null +++ b/apps/labrinth/.sqlx/query-09b53be246c239325abee5bfa297c403aade9dd1dcd79f71ec6d7ba193bbbf3b.json @@ -0,0 +1,30 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT id\n FROM mods\n WHERE\n in_review = $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": [ + "Bool", + "Text", + "Bool" + ] + }, + "nullable": [ + false + ] + }, + "hash": "09b53be246c239325abee5bfa297c403aade9dd1dcd79f71ec6d7ba193bbbf3b" +} diff --git a/apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json b/apps/labrinth/.sqlx/query-18b4f9a39f59df78a937cff897a7ffce2080bc6910b76d0c91dfeb12d73a0207.json similarity index 78% rename from apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json rename to apps/labrinth/.sqlx/query-18b4f9a39f59df78a937cff897a7ffce2080bc6910b76d0c91dfeb12d73a0207.json index 2a4920501b8..f30b1824a23 100644 --- a/apps/labrinth/.sqlx/query-59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377.json +++ b/apps/labrinth/.sqlx/query-18b4f9a39f59df78a937cff897a7ffce2080bc6910b76d0c91dfeb12d73a0207.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, m.visibility, m.in_review, m.review_outcome,\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,28 +126,39 @@ }, { "ordinal": 11, - "name": "status", - "type_info": "Varchar", + "name": "visibility", + "type_info": "Text", "origin": { "Table": { "table": "mods", - "name": "status" + "name": "visibility" } } }, { "ordinal": 12, - "name": "requested_status", - "type_info": "Varchar", + "name": "in_review", + "type_info": "Bool", "origin": { "Table": { "table": "mods", - "name": "requested_status" + "name": "in_review" } } }, { "ordinal": 13, + "name": "review_outcome", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + }, + { + "ordinal": 14, "name": "license_url", "type_info": "Varchar", "origin": { @@ -158,7 +169,7 @@ } }, { - "ordinal": 14, + "ordinal": 15, "name": "team_id", "type_info": "Int8", "origin": { @@ -169,7 +180,7 @@ } }, { - "ordinal": 15, + "ordinal": 16, "name": "organization_id", "type_info": "Int8", "origin": { @@ -180,7 +191,7 @@ } }, { - "ordinal": 16, + "ordinal": 17, "name": "license", "type_info": "Varchar", "origin": { @@ -191,7 +202,7 @@ } }, { - "ordinal": 17, + "ordinal": 18, "name": "slug", "type_info": "Varchar", "origin": { @@ -202,7 +213,7 @@ } }, { - "ordinal": 18, + "ordinal": 19, "name": "moderation_message", "type_info": "Varchar", "origin": { @@ -213,7 +224,7 @@ } }, { - "ordinal": 19, + "ordinal": 20, "name": "moderation_message_body", "type_info": "Varchar", "origin": { @@ -224,7 +235,7 @@ } }, { - "ordinal": 20, + "ordinal": 21, "name": "webhook_sent", "type_info": "Bool", "origin": { @@ -235,7 +246,7 @@ } }, { - "ordinal": 21, + "ordinal": 22, "name": "color", "type_info": "Int4", "origin": { @@ -246,7 +257,7 @@ } }, { - "ordinal": 22, + "ordinal": 23, "name": "thread_id", "type_info": "Int8", "origin": { @@ -257,7 +268,7 @@ } }, { - "ordinal": 23, + "ordinal": 24, "name": "monetization_status", "type_info": "Varchar", "origin": { @@ -268,7 +279,7 @@ } }, { - "ordinal": 24, + "ordinal": 25, "name": "side_types_migration_review_status", "type_info": "Varchar", "origin": { @@ -279,19 +290,19 @@ } }, { - "ordinal": 25, + "ordinal": 26, "name": "categories", "type_info": "VarcharArray", "origin": "Expression" }, { - "ordinal": 26, + "ordinal": 27, "name": "additional_categories", "type_info": "VarcharArray", "origin": "Expression" }, { - "ordinal": 27, + "ordinal": 28, "name": "components: sqlx::types::Json", "type_info": "Jsonb", "origin": { @@ -321,7 +332,8 @@ true, true, false, - true, + false, + false, true, false, true, @@ -339,5 +351,5 @@ false ] }, - "hash": "59b6eea93ce248d2b1eaf14fe8970bba8ccd2df0995a21bdb34ae3214cef6377" + "hash": "18b4f9a39f59df78a937cff897a7ffce2080bc6910b76d0c91dfeb12d73a0207" } diff --git a/apps/labrinth/.sqlx/query-91d3e14891447e9ff273609532dda689893ecd6ecb21b80864121ef08cac6096.json b/apps/labrinth/.sqlx/query-19c00b0677f41a9678fb9ea38d2e1ac3d9266171b623570f7e21f0475c574966.json similarity index 76% rename from apps/labrinth/.sqlx/query-91d3e14891447e9ff273609532dda689893ecd6ecb21b80864121ef08cac6096.json rename to apps/labrinth/.sqlx/query-19c00b0677f41a9678fb9ea38d2e1ac3d9266171b623570f7e21f0475c574966.json index e021646e114..604eeac9021 100644 --- a/apps/labrinth/.sqlx/query-91d3e14891447e9ff273609532dda689893ecd6ecb21b80864121ef08cac6096.json +++ b/apps/labrinth/.sqlx/query-19c00b0677f41a9678fb9ea38d2e1ac3d9266171b623570f7e21f0475c574966.json @@ -1,11 +1,11 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT id, email,\n avatar_url, raw_avatar_url, username, bio,\n users.created, role, badges,\n (\n SELECT MAX(campaign_donations.donated_at)\n FROM campaign_donations\n WHERE campaign_donations.user_id = users.id\n ) AS campaign_pride_26_last_donated_at,\n (\n SELECT SUM(campaign_donations.amount_usd)\n FROM campaign_donations\n WHERE campaign_donations.user_id = users.id\n ) AS campaign_pride_26_total_amount_donated_usd,\n github_id, discord_id, gitlab_id, google_id, steam_id, microsoft_id,\n email_verified, password, totp_secret, paypal_id, paypal_country, paypal_email,\n venmo_handle, stripe_customer_id, allow_friend_requests, is_subscribed_to_newsletter,\n eligibility_verified_at,\n user_locks.locked_by AS \"lock_locked_by?\",\n user_locks.reason AS \"lock_reason?\",\n user_locks.created AS \"lock_created?\",\n user_restrictions.removed_perms AS \"restriction_removed_perms?\",\n user_restrictions.reason AS \"restriction_reason?\",\n user_restrictions.private_reason AS \"restriction_private_reason?\",\n user_restrictions.restricted_by AS \"restriction_restricted_by?\",\n user_restrictions.updated AS \"restriction_updated?\"\n FROM users\n LEFT JOIN user_locks ON user_locks.user_id = users.id\n LEFT JOIN user_restrictions ON user_restrictions.user_id = users.id\n WHERE id = ANY($1) OR LOWER(username) = ANY($2)\n ", + "query": "\n SELECT users.id AS \"id!\", email,\n avatar_url, raw_avatar_url, users.username AS \"username!\", bio,\n users.created AS \"created!\", users.role AS \"role!\", users.badges AS \"badges!\",\n (\n SELECT MAX(campaign_donations.donated_at)\n FROM campaign_donations\n WHERE campaign_donations.user_id = users.id\n ) AS campaign_pride_26_last_donated_at,\n (\n SELECT SUM(campaign_donations.amount_usd)\n FROM campaign_donations\n WHERE campaign_donations.user_id = users.id\n ) AS campaign_pride_26_total_amount_donated_usd,\n github_id, discord_id, gitlab_id, google_id, steam_id, microsoft_id,\n users.email_verified AS \"email_verified!\", password, totp_secret, paypal_id, paypal_country, paypal_email,\n venmo_handle, stripe_customer_id,\n users.allow_friend_requests AS \"allow_friend_requests!\",\n users.is_subscribed_to_newsletter AS \"is_subscribed_to_newsletter!\",\n eligibility_verified_at,\n user_locks.locked_by AS \"lock_locked_by?\",\n user_locks.reason AS \"lock_reason?\",\n user_locks.created AS \"lock_created?\",\n user_restrictions.removed_perms AS \"restriction_removed_perms?\",\n user_restrictions.reason AS \"restriction_reason?\",\n user_restrictions.private_reason AS \"restriction_private_reason?\",\n user_restrictions.restricted_by AS \"restriction_restricted_by?\",\n user_restrictions.updated AS \"restriction_updated?\"\n FROM users\n LEFT JOIN user_locks ON user_locks.user_id = users.id\n LEFT JOIN user_restrictions ON user_restrictions.user_id = users.id\n WHERE id = ANY($1) OR LOWER(username) = ANY($2)\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "id", + "name": "id!", "type_info": "Int8", "origin": { "Table": { @@ -49,7 +49,7 @@ }, { "ordinal": 4, - "name": "username", + "name": "username!", "type_info": "Varchar", "origin": { "Table": { @@ -71,7 +71,7 @@ }, { "ordinal": 6, - "name": "created", + "name": "created!", "type_info": "Timestamptz", "origin": { "Table": { @@ -82,7 +82,7 @@ }, { "ordinal": 7, - "name": "role", + "name": "role!", "type_info": "Varchar", "origin": { "Table": { @@ -93,7 +93,7 @@ }, { "ordinal": 8, - "name": "badges", + "name": "badges!", "type_info": "Int8", "origin": { "Table": { @@ -182,7 +182,7 @@ }, { "ordinal": 17, - "name": "email_verified", + "name": "email_verified!", "type_info": "Bool", "origin": { "Table": { @@ -270,7 +270,7 @@ }, { "ordinal": 25, - "name": "allow_friend_requests", + "name": "allow_friend_requests!", "type_info": "Bool", "origin": { "Table": { @@ -281,7 +281,7 @@ }, { "ordinal": 26, - "name": "is_subscribed_to_newsletter", + "name": "is_subscribed_to_newsletter!", "type_info": "Bool", "origin": { "Table": { @@ -435,5 +435,5 @@ true ] }, - "hash": "91d3e14891447e9ff273609532dda689893ecd6ecb21b80864121ef08cac6096" + "hash": "19c00b0677f41a9678fb9ea38d2e1ac3d9266171b623570f7e21f0475c574966" } diff --git a/apps/labrinth/.sqlx/query-26144040271adbbbc4101bb0b8cd09c43e58c09285e56f5128482204a3b83a61.json b/apps/labrinth/.sqlx/query-26144040271adbbbc4101bb0b8cd09c43e58c09285e56f5128482204a3b83a61.json new file mode 100644 index 00000000000..cb106391fef --- /dev/null +++ b/apps/labrinth/.sqlx/query-26144040271adbbbc4101bb0b8cd09c43e58c09285e56f5128482204a3b83a61.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE mods SET review_outcome = $1, in_review = FALSE WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Int8" + ] + }, + "nullable": [] + }, + "hash": "26144040271adbbbc4101bb0b8cd09c43e58c09285e56f5128482204a3b83a61" +} 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-3debbe788f5f609580d6019da8fd524d7babc31fe07bd320925dbc03a56c5739.json b/apps/labrinth/.sqlx/query-3debbe788f5f609580d6019da8fd524d7babc31fe07bd320925dbc03a56c5739.json new file mode 100644 index 00000000000..2afabb93360 --- /dev/null +++ b/apps/labrinth/.sqlx/query-3debbe788f5f609580d6019da8fd524d7babc31fe07bd320925dbc03a56c5739.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.in_review = $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": [ + "Bool", + "TextArray", + "Text", + "Text", + "Bool", + "Text", + "Bool" + ] + }, + "nullable": [ + false + ] + }, + "hash": "3debbe788f5f609580d6019da8fd524d7babc31fe07bd320925dbc03a56c5739" +} 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-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json b/apps/labrinth/.sqlx/query-45c24662c6baad0d3d2340440614beeef119e52d36039207deb8fecb3aa1ebd3.json similarity index 72% rename from apps/labrinth/.sqlx/query-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json rename to apps/labrinth/.sqlx/query-45c24662c6baad0d3d2340440614beeef119e52d36039207deb8fecb3aa1ebd3.json index f8095f9d8bf..af8c5bffb27 100644 --- a/apps/labrinth/.sqlx/query-7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87.json +++ b/apps/labrinth/.sqlx/query-45c24662c6baad0d3d2340440614beeef119e52d36039207deb8fecb3aa1ebd3.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "SELECT id FROM mods WHERE status = 'processing'", + "query": "SELECT id FROM mods WHERE in_review", "describe": { "columns": [ { @@ -22,5 +22,5 @@ false ] }, - "hash": "7285d8fc34604cc1364decbbc5dca1260cc250ea4455402f84e9f1530c31df87" + "hash": "45c24662c6baad0d3d2340440614beeef119e52d36039207deb8fecb3aa1ebd3" } diff --git a/apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json b/apps/labrinth/.sqlx/query-494ee2a632bee6721a10b7e196fd003783d307ab078d166617d4aac99beb51fa.json similarity index 72% rename from apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json rename to apps/labrinth/.sqlx/query-494ee2a632bee6721a10b7e196fd003783d307ab078d166617d4aac99beb51fa.json index d6a34e1c94b..509115d9378 100644 --- a/apps/labrinth/.sqlx/query-829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a.json +++ b/apps/labrinth/.sqlx/query-494ee2a632bee6721a10b7e196fd003783d307ab078d166617d4aac99beb51fa.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 = 'public' AND review_outcome = 'approved' LIMIT 1", "describe": { "columns": [ { @@ -19,5 +19,5 @@ null ] }, - "hash": "829a4523233e957f8876d248a17ec04c245af41f43fa40aff9ee07e893dabf3a" + "hash": "494ee2a632bee6721a10b7e196fd003783d307ab078d166617d4aac99beb51fa" } 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-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json b/apps/labrinth/.sqlx/query-51d41fa35d1fb0c159c738c2e1c5eddced144162872e8a00e1b8a11ffb07a39e.json similarity index 87% rename from apps/labrinth/.sqlx/query-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json rename to apps/labrinth/.sqlx/query-51d41fa35d1fb0c159c738c2e1c5eddced144162872e8a00e1b8a11ffb07a39e.json index 4879204ce18..b550ce9cf9b 100644 --- a/apps/labrinth/.sqlx/query-7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92.json +++ b/apps/labrinth/.sqlx/query-51d41fa35d1fb0c159c738c2e1c5eddced144162872e8a00e1b8a11ffb07a39e.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 (access.full_access OR (m.visibility IN ('public', 'unlisted') AND m.review_outcome IN ('approved', 'withheld')))\n ", "describe": { "columns": [ { @@ -22,7 +22,6 @@ "VarcharArray", "VarcharArray", "VarcharArray", - "VarcharArray", "Bool", "Int8" ] @@ -31,5 +30,5 @@ false ] }, - "hash": "7314e6803e4e2eeb03d63b125a6f3d94bd7e6b2a47629291d86a2e7268b75a92" + "hash": "51d41fa35d1fb0c159c738c2e1c5eddced144162872e8a00e1b8a11ffb07a39e" } diff --git a/apps/labrinth/.sqlx/query-544956a0183eb884281f303121e2d1bcb7074ee614ca9ea5caf6dd5ee0559d6b.json b/apps/labrinth/.sqlx/query-544956a0183eb884281f303121e2d1bcb7074ee614ca9ea5caf6dd5ee0559d6b.json new file mode 100644 index 00000000000..07cd71d075f --- /dev/null +++ b/apps/labrinth/.sqlx/query-544956a0183eb884281f303121e2d1bcb7074ee614ca9ea5caf6dd5ee0559d6b.json @@ -0,0 +1,34 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO mods (\n id, team_id, name, summary, description,\n published, downloads, icon_url, raw_icon_url, visibility, in_review,\n license_url, license,\n slug, color, monetization_status, organization_id,\n side_types_migration_review_status,\n components, review_outcome, queued, status\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, $20, $21, 'draft'\n )\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Int8", + "Varchar", + "Varchar", + "Varchar", + "Timestamptz", + "Int4", + "Varchar", + "Text", + "Text", + "Bool", + "Varchar", + "Varchar", + "Text", + "Int4", + "Varchar", + "Int8", + "Varchar", + "Jsonb", + "Text", + "Timestamptz" + ] + }, + "nullable": [] + }, + "hash": "544956a0183eb884281f303121e2d1bcb7074ee614ca9ea5caf6dd5ee0559d6b" +} diff --git a/apps/labrinth/.sqlx/query-59db8a5c75686ae28ba432603252ea85dd0a1a47f05078781b74e5e199d0bfdb.json b/apps/labrinth/.sqlx/query-59db8a5c75686ae28ba432603252ea85dd0a1a47f05078781b74e5e199d0bfdb.json new file mode 100644 index 00000000000..bb3c9b0492c --- /dev/null +++ b/apps/labrinth/.sqlx/query-59db8a5c75686ae28ba432603252ea85dd0a1a47f05078781b74e5e199d0bfdb.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 = 'public' AND review_outcome = '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": "59db8a5c75686ae28ba432603252ea85dd0a1a47f05078781b74e5e199d0bfdb" +} diff --git a/apps/labrinth/.sqlx/query-64896f98bfae26766b97bafb13227638e2d60a18c7c2b4fd0db42f58d201835a.json b/apps/labrinth/.sqlx/query-64896f98bfae26766b97bafb13227638e2d60a18c7c2b4fd0db42f58d201835a.json new file mode 100644 index 00000000000..cdf1c82ac2d --- /dev/null +++ b/apps/labrinth/.sqlx/query-64896f98bfae26766b97bafb13227638e2d60a18c7c2b4fd0db42f58d201835a.json @@ -0,0 +1,261 @@ +{ + "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.in_review = $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.visibility,\n m.in_review,\n m.review_outcome,\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.visibility AS \"visibility?\",\n page_projects.in_review AS \"in_review?\",\n page_projects.review_outcome AS \"review_outcome?\",\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": "visibility?", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 7, + "name": "in_review?", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "in_review" + } + } + }, + { + "ordinal": 8, + "name": "review_outcome?", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + }, + { + "ordinal": 9, + "name": "queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "queued" + } + } + }, + { + "ordinal": 10, + "name": "initial_queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "initial_queued" + } + } + }, + { + "ordinal": 11, + "name": "published?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "published" + } + } + }, + { + "ordinal": 12, + "name": "updated?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "updated" + } + } + }, + { + "ordinal": 13, + "name": "organization_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "organization_id" + } + } + }, + { + "ordinal": 14, + "name": "organization_name?", + "type_info": "Text", + "origin": { + "Table": { + "table": "organizations", + "name": "name" + } + } + }, + { + "ordinal": 15, + "name": "organization_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "organizations", + "name": "icon_url" + } + } + }, + { + "ordinal": 16, + "name": "owner_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "team_members", + "name": "user_id" + } + } + }, + { + "ordinal": 17, + "name": "owner_name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "username" + } + } + }, + { + "ordinal": 18, + "name": "owner_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "avatar_url" + } + } + }, + { + "ordinal": 19, + "name": "project_types?: Vec", + "type_info": "TextArray", + "origin": "Expression" + }, + { + "ordinal": 20, + "name": "external_dependencies_count?", + "type_info": "Int8", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Bool", + "TextArray", + "Text", + "Text", + "Bool", + "Int8", + "Int8", + "Text", + "Bool" + ] + }, + "nullable": [ + null, + false, + true, + false, + false, + true, + false, + false, + false, + true, + true, + false, + false, + true, + false, + true, + false, + false, + true, + null, + null + ] + }, + "hash": "64896f98bfae26766b97bafb13227638e2d60a18c7c2b4fd0db42f58d201835a" +} diff --git a/apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json b/apps/labrinth/.sqlx/query-6f22b34c4ce0a045e568409aaaf9e25d8fb7c5be3477445036b43d8d102e688f.json similarity index 61% rename from apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json rename to apps/labrinth/.sqlx/query-6f22b34c4ce0a045e568409aaaf9e25d8fb7c5be3477445036b43d8d102e688f.json index ecaa7f95598..c91515b167d 100644 --- a/apps/labrinth/.sqlx/query-2d460f25461e95c744c835af5d67f8a7dd2438a46e3033611dfc0edd74fb9180.json +++ b/apps/labrinth/.sqlx/query-6f22b34c4ce0a045e568409aaaf9e25d8fb7c5be3477445036b43d8d102e688f.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 = 'public' AND m.review_outcome = '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": "6f22b34c4ce0a045e568409aaaf9e25d8fb7c5be3477445036b43d8d102e688f" } 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-731d2b9c961ad15777025c2f06d59a25e34c91b2719118e3a72823de73fb927a.json b/apps/labrinth/.sqlx/query-731d2b9c961ad15777025c2f06d59a25e34c91b2719118e3a72823de73fb927a.json new file mode 100644 index 00000000000..79e2344e8d3 --- /dev/null +++ b/apps/labrinth/.sqlx/query-731d2b9c961ad15777025c2f06d59a25e34c91b2719118e3a72823de73fb927a.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n\t\t\tUPDATE mods\n\t\t\tSET review_outcome = $1,\n in_review = FALSE,\n initial_queued = NULL,\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": [ + "Text", + "Int8", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "731d2b9c961ad15777025c2f06d59a25e34c91b2719118e3a72823de73fb927a" +} diff --git a/apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json b/apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json deleted file mode 100644 index a7a5551fe8a..00000000000 --- a/apps/labrinth/.sqlx/query-7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "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 ", - "describe": { - "columns": [ - { - "ordinal": 0, - "name": "id!", - "type_info": "Int8", - "origin": { - "Table": { - "table": "mods", - "name": "id" - } - } - }, - { - "ordinal": 1, - "name": "status!", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "status" - } - } - }, - { - "ordinal": 2, - "name": "slug", - "type_info": "Varchar", - "origin": { - "Table": { - "table": "mods", - "name": "slug" - } - } - }, - { - "ordinal": 3, - "name": "thread_id!", - "type_info": "Int8", - "origin": { - "Table": { - "table": "threads", - "name": "id" - } - } - } - ], - "parameters": { - "Left": [ - "Int8" - ] - }, - "nullable": [ - false, - false, - true, - false - ] - }, - "hash": "7a3ab78f56ae29dd35aadc928e92da7a72fa8604e62c2168e6b98d90772acb16" -} diff --git a/apps/labrinth/.sqlx/query-7a90dee627fc9b2e2c7522d7822be104bb704b941e4f3b9be82a4629ff7c8983.json b/apps/labrinth/.sqlx/query-7a90dee627fc9b2e2c7522d7822be104bb704b941e4f3b9be82a4629ff7c8983.json new file mode 100644 index 00000000000..ae869df3eda --- /dev/null +++ b/apps/labrinth/.sqlx/query-7a90dee627fc9b2e2c7522d7822be104bb704b941e4f3b9be82a4629ff7c8983.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "\n UPDATE mods\n SET in_review = TRUE\n WHERE (id = $1)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "7a90dee627fc9b2e2c7522d7822be104bb704b941e4f3b9be82a4629ff7c8983" +} 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-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json b/apps/labrinth/.sqlx/query-805ce02d79139b5c80a33321a690f37ed3d8104f239148e614eb5ebe66a37090.json similarity index 94% rename from apps/labrinth/.sqlx/query-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json rename to apps/labrinth/.sqlx/query-805ce02d79139b5c80a33321a690f37ed3d8104f239148e614eb5ebe66a37090.json index 9fe38e4f20d..c357eef228b 100644 --- a/apps/labrinth/.sqlx/query-881de045a10c1debe041ec558fd92fdfbf8b8ffa1b21d3d4a271ab6f9c8adb78.json +++ b/apps/labrinth/.sqlx/query-805ce02d79139b5c80a33321a690f37ed3d8104f239148e614eb5ebe66a37090.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 = 'public' AND m.review_outcome = '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": "805ce02d79139b5c80a33321a690f37ed3d8104f239148e614eb5ebe66a37090" } diff --git a/apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json b/apps/labrinth/.sqlx/query-8f1e3b6c2c33639f3127857595dbea726751ecac5876d51a41cd4559e640e9c6.json similarity index 75% rename from apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json rename to apps/labrinth/.sqlx/query-8f1e3b6c2c33639f3127857595dbea726751ecac5876d51a41cd4559e640e9c6.json index 5ede4307657..a9d55c9b2f0 100644 --- a/apps/labrinth/.sqlx/query-f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b.json +++ b/apps/labrinth/.sqlx/query-8f1e3b6c2c33639f3127857595dbea726751ecac5876d51a41cd4559e640e9c6.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_outcome = 'approved'\n AND components ? 'minecraft_java_server'\n ", "describe": { "columns": [ { @@ -27,14 +27,12 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ false, false ] }, - "hash": "f6e0f4c2f9e28706b7fc2abe306179e5c600b1449444e96ef0000fc14334dd5b" + "hash": "8f1e3b6c2c33639f3127857595dbea726751ecac5876d51a41cd4559e640e9c6" } diff --git a/apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json b/apps/labrinth/.sqlx/query-9f7ff2549578c7664141fab64904161f50375fbd420c1c2c09d0a5c6d58e59b1.json similarity index 50% rename from apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json rename to apps/labrinth/.sqlx/query-9f7ff2549578c7664141fab64904161f50375fbd420c1c2c09d0a5c6d58e59b1.json index 73142111d33..1e47f1a83ea 100644 --- a/apps/labrinth/.sqlx/query-82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2.json +++ b/apps/labrinth/.sqlx/query-9f7ff2549578c7664141fab64904161f50375fbd420c1c2c09d0a5c6d58e59b1.json @@ -1,15 +1,15 @@ { "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET status = $1\n WHERE id = $2\n ", + "query": "\n UPDATE mods\n SET review_outcome = $1, in_review = FALSE\n WHERE id = $2\n ", "describe": { "columns": [], "parameters": { "Left": [ - "Varchar", + "Text", "Int8" ] }, "nullable": [] }, - "hash": "82e46320390619773a259aef7431c35cfd16fec52dbf3b4a6ddb3108e50169f2" + "hash": "9f7ff2549578c7664141fab64904161f50375fbd420c1c2c09d0a5c6d58e59b1" } diff --git a/apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json b/apps/labrinth/.sqlx/query-a0cac63d98cc6b5617e5acf3c3b70330d57b8ce09ff311553dc2be793f47c0c1.json similarity index 52% rename from apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json rename to apps/labrinth/.sqlx/query-a0cac63d98cc6b5617e5acf3c3b70330d57b8ce09ff311553dc2be793f47c0c1.json index 2731d395fff..d5fe0dd7bfc 100644 --- a/apps/labrinth/.sqlx/query-329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d.json +++ b/apps/labrinth/.sqlx/query-a0cac63d98cc6b5617e5acf3c3b70330d57b8ce09ff311553dc2be793f47c0c1.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "UPDATE mods SET status = 'processing' WHERE id = $1", + "query": "UPDATE mods SET in_review = TRUE WHERE id = $1", "describe": { "columns": [], "parameters": { @@ -10,5 +10,5 @@ }, "nullable": [] }, - "hash": "329c009635ad2a4c214da2f4651b8c14fe329deac983bc2f43ba74e066f9cf8d" + "hash": "a0cac63d98cc6b5617e5acf3c3b70330d57b8ce09ff311553dc2be793f47c0c1" } diff --git a/apps/labrinth/.sqlx/query-a5be998d152ad5ca04e3873571cc07f304b456751cf69f97321ab273c8763add.json b/apps/labrinth/.sqlx/query-a5be998d152ad5ca04e3873571cc07f304b456751cf69f97321ab273c8763add.json new file mode 100644 index 00000000000..c30c65447f6 --- /dev/null +++ b/apps/labrinth/.sqlx/query-a5be998d152ad5ca04e3873571cc07f304b456751cf69f97321ab273c8763add.json @@ -0,0 +1,88 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT\n m.id AS \"id!\",\n m.visibility AS \"visibility!\",\n m.in_review AS \"in_review!\",\n m.review_outcome AS \"review_outcome!\",\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 FOR UPDATE OF m\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id!", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "id" + } + } + }, + { + "ordinal": 1, + "name": "visibility!", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 2, + "name": "in_review!", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "in_review" + } + } + }, + { + "ordinal": 3, + "name": "review_outcome!", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + }, + { + "ordinal": 4, + "name": "slug", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + }, + { + "ordinal": 5, + "name": "thread_id!", + "type_info": "Int8", + "origin": { + "Table": { + "table": "threads", + "name": "id" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + false, + false, + true, + false + ] + }, + "hash": "a5be998d152ad5ca04e3873571cc07f304b456751cf69f97321ab273c8763add" +} diff --git a/apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json b/apps/labrinth/.sqlx/query-aae536dedabfa73d602f86e76bf888a32a74a82eb86e4b93120fa009756b8f2d.json similarity index 96% rename from apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json rename to apps/labrinth/.sqlx/query-aae536dedabfa73d602f86e76bf888a32a74a82eb86e4b93120fa009756b8f2d.json index b4812d2f90d..d2aa60bd2a5 100644 --- a/apps/labrinth/.sqlx/query-abfe1f90c9d311e21107f994c241526d473aae2cab2106e05947b816a4d1c0d0.json +++ b/apps/labrinth/.sqlx/query-aae536dedabfa73d602f86e76bf888a32a74a82eb86e4b93120fa009756b8f2d.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.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": "aae536dedabfa73d602f86e76bf888a32a74a82eb86e4b93120fa009756b8f2d" } diff --git a/apps/labrinth/.sqlx/query-b1051b1a545a7ca86b4fb35ea4347017b98bc1e80321a112fa937179b0d571d6.json b/apps/labrinth/.sqlx/query-b1051b1a545a7ca86b4fb35ea4347017b98bc1e80321a112fa937179b0d571d6.json new file mode 100644 index 00000000000..50f3b5caa6b --- /dev/null +++ b/apps/labrinth/.sqlx/query-b1051b1a545a7ca86b4fb35ea4347017b98bc1e80321a112fa937179b0d571d6.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "DELETE FROM project_history WHERE project_id = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "b1051b1a545a7ca86b4fb35ea4347017b98bc1e80321a112fa937179b0d571d6" +} 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-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json b/apps/labrinth/.sqlx/query-b6e1ee8f6507e0d4b52130151e15f5beb4140e146e0a33e707dc5cd468e1dcb5.json similarity index 65% rename from apps/labrinth/.sqlx/query-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json rename to apps/labrinth/.sqlx/query-b6e1ee8f6507e0d4b52130151e15f5beb4140e146e0a33e707dc5cd468e1dcb5.json index fa5ba84781d..c9898ad047b 100644 --- a/apps/labrinth/.sqlx/query-6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d.json +++ b/apps/labrinth/.sqlx/query-b6e1ee8f6507e0d4b52130151e15f5beb4140e146e0a33e707dc5cd468e1dcb5.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 = 'public' AND review_outcome = 'approved'\n ", "describe": { "columns": [ { @@ -11,13 +11,11 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ null ] }, - "hash": "6e07cc68675d0f583182eaa9f50853fa5996b9f83543fe8b6c2a073cf6a9cb5d" + "hash": "b6e1ee8f6507e0d4b52130151e15f5beb4140e146e0a33e707dc5cd468e1dcb5" } diff --git a/apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json b/apps/labrinth/.sqlx/query-ba61bfb0ed7f2a6ec9939ee22007304900c54d812ed6dec17626c59345f19153.json similarity index 66% rename from apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json rename to apps/labrinth/.sqlx/query-ba61bfb0ed7f2a6ec9939ee22007304900c54d812ed6dec17626c59345f19153.json index c57c1322a37..1932316eebf 100644 --- a/apps/labrinth/.sqlx/query-20da3e21ce6115bd80746be3f6e7273771aed45eea03e46c23ef74a0a59ecfe3.json +++ b/apps/labrinth/.sqlx/query-ba61bfb0ed7f2a6ec9939ee22007304900c54d812ed6dec17626c59345f19153.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 = 'public' AND review_outcome = '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": "ba61bfb0ed7f2a6ec9939ee22007304900c54d812ed6dec17626c59345f19153" } diff --git a/apps/labrinth/.sqlx/query-bd136bb9dd2a23ca73f61e90b77c21c5637665e9ef49e2a0239656ae3c59c2a5.json b/apps/labrinth/.sqlx/query-bd136bb9dd2a23ca73f61e90b77c21c5637665e9ef49e2a0239656ae3c59c2a5.json new file mode 100644 index 00000000000..e711e569123 --- /dev/null +++ b/apps/labrinth/.sqlx/query-bd136bb9dd2a23ca73f61e90b77c21c5637665e9ef49e2a0239656ae3c59c2a5.json @@ -0,0 +1,76 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT id, project_id, done_by, occurred_at,\n delta AS \"delta: sqlx::types::Json\"\n FROM project_history\n WHERE project_id = $1\n ORDER BY occurred_at, id\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": "Int8", + "origin": { + "Table": { + "table": "project_history", + "name": "id" + } + } + }, + { + "ordinal": 1, + "name": "project_id", + "type_info": "Int8", + "origin": { + "Table": { + "table": "project_history", + "name": "project_id" + } + } + }, + { + "ordinal": 2, + "name": "done_by", + "type_info": "Int8", + "origin": { + "Table": { + "table": "project_history", + "name": "done_by" + } + } + }, + { + "ordinal": 3, + "name": "occurred_at", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "project_history", + "name": "occurred_at" + } + } + }, + { + "ordinal": 4, + "name": "delta: sqlx::types::Json", + "type_info": "Jsonb", + "origin": { + "Table": { + "table": "project_history", + "name": "delta" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + true, + false, + false + ] + }, + "hash": "bd136bb9dd2a23ca73f61e90b77c21c5637665e9ef49e2a0239656ae3c59c2a5" +} diff --git a/apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json b/apps/labrinth/.sqlx/query-c2805f2bb7b696d83459b000b58d45941a22417e18ed5612ef28694728e70f79.json similarity index 56% rename from apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json rename to apps/labrinth/.sqlx/query-c2805f2bb7b696d83459b000b58d45941a22417e18ed5612ef28694728e70f79.json index d8d75835269..43a18f60505 100644 --- a/apps/labrinth/.sqlx/query-b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d.json +++ b/apps/labrinth/.sqlx/query-c2805f2bb7b696d83459b000b58d45941a22417e18ed5612ef28694728e70f79.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.in_review OR m.review_outcome = 'approved')\n AND (cardinality($6::text[]) = 0 OR m.review_outcome = 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 ", "describe": { "columns": [ { @@ -37,5 +37,5 @@ null ] }, - "hash": "b1a73d6f9b772e7bd0e2f9900447cb545ff412b9a19a200237997e4414400a8d" + "hash": "c2805f2bb7b696d83459b000b58d45941a22417e18ed5612ef28694728e70f79" } 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-c44139a78305a398294dfeed4c517554edd5970b2decefaa27784d18239e15df.json b/apps/labrinth/.sqlx/query-c44139a78305a398294dfeed4c517554edd5970b2decefaa27784d18239e15df.json new file mode 100644 index 00000000000..fdd8279ca4b --- /dev/null +++ b/apps/labrinth/.sqlx/query-c44139a78305a398294dfeed4c517554edd5970b2decefaa27784d18239e15df.json @@ -0,0 +1,15 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE mods SET visibility = $1 WHERE id = $2", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Text", + "Int8" + ] + }, + "nullable": [] + }, + "hash": "c44139a78305a398294dfeed4c517554edd5970b2decefaa27784d18239e15df" +} 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-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-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json b/apps/labrinth/.sqlx/query-d14187aa9387695d903bda1e8fe310ff85beb7482250becc639c75c19e76515e.json similarity index 68% rename from apps/labrinth/.sqlx/query-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json rename to apps/labrinth/.sqlx/query-d14187aa9387695d903bda1e8fe310ff85beb7482250becc639c75c19e76515e.json index d4b08fd8622..f3877614ad6 100644 --- a/apps/labrinth/.sqlx/query-a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c.json +++ b/apps/labrinth/.sqlx/query-d14187aa9387695d903bda1e8fe310ff85beb7482250becc639c75c19e76515e.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 = 'public' AND m.review_outcome = 'approved'\n ", "describe": { "columns": [ { @@ -12,7 +12,6 @@ ], "parameters": { "Left": [ - "TextArray", "TextArray" ] }, @@ -20,5 +19,5 @@ null ] }, - "hash": "a1ba3b5cc50b1eb24f5529e06be1439f4a313c4ea8845c2733db752e53f5ae1c" + "hash": "d14187aa9387695d903bda1e8fe310ff85beb7482250becc639c75c19e76515e" } diff --git a/apps/labrinth/.sqlx/query-aa60ab1baa25beefdf6dff23ab6f4a08619011ced36c34d7c251af7fe7b9ccc5.json b/apps/labrinth/.sqlx/query-d6e93e0a270a07b66147c2bc3fb4375f636e9afc4bd3a10e9315377942c1d914.json similarity index 55% rename from apps/labrinth/.sqlx/query-aa60ab1baa25beefdf6dff23ab6f4a08619011ced36c34d7c251af7fe7b9ccc5.json rename to apps/labrinth/.sqlx/query-d6e93e0a270a07b66147c2bc3fb4375f636e9afc4bd3a10e9315377942c1d914.json index 0be35724fb7..a7962b34967 100644 --- a/apps/labrinth/.sqlx/query-aa60ab1baa25beefdf6dff23ab6f4a08619011ced36c34d7c251af7fe7b9ccc5.json +++ b/apps/labrinth/.sqlx/query-d6e93e0a270a07b66147c2bc3fb4375f636e9afc4bd3a10e9315377942c1d914.json @@ -1,11 +1,11 @@ { "db_name": "PostgreSQL", - "query": "\n SELECT\n r.created,\n COALESCE(m.name, v.version_number, u.username, 'unknown') \"title!\"\n FROM reports r\n LEFT JOIN mods m ON r.mod_id = m.id\n LEFT JOIN versions v ON r.version_id = v.id\n LEFT JOIN users u ON r.user_id = u.id\n WHERE r.id = $1\n ", + "query": "\n SELECT\n r.created AS \"created!\",\n COALESCE(m.name, v.version_number, u.username, 'unknown') \"title!\"\n FROM reports r\n LEFT JOIN mods m ON r.mod_id = m.id\n LEFT JOIN versions v ON r.version_id = v.id\n LEFT JOIN users u ON r.user_id = u.id\n WHERE r.id = $1\n ", "describe": { "columns": [ { "ordinal": 0, - "name": "created", + "name": "created!", "type_info": "Timestamptz", "origin": { "Table": { @@ -31,5 +31,5 @@ null ] }, - "hash": "aa60ab1baa25beefdf6dff23ab6f4a08619011ced36c34d7c251af7fe7b9ccc5" + "hash": "d6e93e0a270a07b66147c2bc3fb4375f636e9afc4bd3a10e9315377942c1d914" } diff --git a/apps/labrinth/.sqlx/query-e15c4034543482a2cfaafc704d31d605812c8c810cf8b2ded413677d22598a50.json b/apps/labrinth/.sqlx/query-e15c4034543482a2cfaafc704d31d605812c8c810cf8b2ded413677d22598a50.json new file mode 100644 index 00000000000..78620745d6b --- /dev/null +++ b/apps/labrinth/.sqlx/query-e15c4034543482a2cfaafc704d31d605812c8c810cf8b2ded413677d22598a50.json @@ -0,0 +1,14 @@ +{ + "db_name": "PostgreSQL", + "query": "UPDATE mods SET in_review = FALSE WHERE id = $1", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [] + }, + "hash": "e15c4034543482a2cfaafc704d31d605812c8c810cf8b2ded413677d22598a50" +} diff --git a/apps/labrinth/.sqlx/query-26ca3d90c2e2289027ef434e370f4aa746272cd51dd50445057deb213db37049.json b/apps/labrinth/.sqlx/query-e24ca588e17ef86c9e49982e06da925c3c153c1d60b56acf20b051522b4974ea.json similarity index 57% rename from apps/labrinth/.sqlx/query-26ca3d90c2e2289027ef434e370f4aa746272cd51dd50445057deb213db37049.json rename to apps/labrinth/.sqlx/query-e24ca588e17ef86c9e49982e06da925c3c153c1d60b56acf20b051522b4974ea.json index 5ab18b5979b..3fd56b39fea 100644 --- a/apps/labrinth/.sqlx/query-26ca3d90c2e2289027ef434e370f4aa746272cd51dd50445057deb213db37049.json +++ b/apps/labrinth/.sqlx/query-e24ca588e17ef86c9e49982e06da925c3c153c1d60b56acf20b051522b4974ea.json @@ -1,6 +1,6 @@ { "db_name": "PostgreSQL", - "query": "\n UPDATE mods\n SET organization_id = NULL, slug = COALESCE($1, slug)\n WHERE id = $2\n ", + "query": "\n UPDATE mods\n SET organization_id = NULL, slug = COALESCE($1, slug), in_review = FALSE\n WHERE id = $2\n ", "describe": { "columns": [], "parameters": { @@ -11,5 +11,5 @@ }, "nullable": [] }, - "hash": "26ca3d90c2e2289027ef434e370f4aa746272cd51dd50445057deb213db37049" + "hash": "e24ca588e17ef86c9e49982e06da925c3c153c1d60b56acf20b051522b4974ea" } diff --git a/apps/labrinth/.sqlx/query-e2e1ca468494236b6d96e3a5ab8cec0235d7c0cdc5dee362081d7818630d4ca5.json b/apps/labrinth/.sqlx/query-e2e1ca468494236b6d96e3a5ab8cec0235d7c0cdc5dee362081d7818630d4ca5.json new file mode 100644 index 00000000000..2efbacc7a85 --- /dev/null +++ b/apps/labrinth/.sqlx/query-e2e1ca468494236b6d96e3a5ab8cec0235d7c0cdc5dee362081d7818630d4ca5.json @@ -0,0 +1,64 @@ +{ + "db_name": "PostgreSQL", + "query": "\n SELECT visibility, in_review, review_outcome, slug\n FROM mods\n WHERE id = $1\n FOR UPDATE\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "visibility", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 1, + "name": "in_review", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "in_review" + } + } + }, + { + "ordinal": 2, + "name": "review_outcome", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + }, + { + "ordinal": 3, + "name": "slug", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "mods", + "name": "slug" + } + } + } + ], + "parameters": { + "Left": [ + "Int8" + ] + }, + "nullable": [ + false, + false, + false, + true + ] + }, + "hash": "e2e1ca468494236b6d96e3a5ab8cec0235d7c0cdc5dee362081d7818630d4ca5" +} diff --git a/apps/labrinth/.sqlx/query-e314cbc3c29bb39d9c94d7cd8a4ebb03dd4ca3b667a5672f429ad85ea1160745.json b/apps/labrinth/.sqlx/query-e314cbc3c29bb39d9c94d7cd8a4ebb03dd4ca3b667a5672f429ad85ea1160745.json new file mode 100644 index 00000000000..d4db014bf64 --- /dev/null +++ b/apps/labrinth/.sqlx/query-e314cbc3c29bb39d9c94d7cd8a4ebb03dd4ca3b667a5672f429ad85ea1160745.json @@ -0,0 +1,16 @@ +{ + "db_name": "PostgreSQL", + "query": "\n INSERT INTO project_history (project_id, done_by, delta)\n VALUES ($1, $2, $3)\n ", + "describe": { + "columns": [], + "parameters": { + "Left": [ + "Int8", + "Int8", + "Jsonb" + ] + }, + "nullable": [] + }, + "hash": "e314cbc3c29bb39d9c94d7cd8a4ebb03dd4ca3b667a5672f429ad85ea1160745" +} 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-e530cccaa8f0c302258bab0abe08c9d69ce09919667fe4cac28b45118ad53be5.json b/apps/labrinth/.sqlx/query-e530cccaa8f0c302258bab0abe08c9d69ce09919667fe4cac28b45118ad53be5.json new file mode 100644 index 00000000000..97ee81ec015 --- /dev/null +++ b/apps/labrinth/.sqlx/query-e530cccaa8f0c302258bab0abe08c9d69ce09919667fe4cac28b45118ad53be5.json @@ -0,0 +1,258 @@ +{ + "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.in_review = $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.visibility,\n m.in_review,\n m.review_outcome,\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.visibility AS \"visibility?\",\n page_projects.in_review AS \"in_review?\",\n page_projects.review_outcome AS \"review_outcome?\",\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": "visibility?", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 7, + "name": "in_review?", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "in_review" + } + } + }, + { + "ordinal": 8, + "name": "review_outcome?", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + }, + { + "ordinal": 9, + "name": "queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "queued" + } + } + }, + { + "ordinal": 10, + "name": "initial_queued?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "initial_queued" + } + } + }, + { + "ordinal": 11, + "name": "published?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "published" + } + } + }, + { + "ordinal": 12, + "name": "updated?", + "type_info": "Timestamptz", + "origin": { + "Table": { + "table": "mods", + "name": "updated" + } + } + }, + { + "ordinal": 13, + "name": "organization_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "mods", + "name": "organization_id" + } + } + }, + { + "ordinal": 14, + "name": "organization_name?", + "type_info": "Text", + "origin": { + "Table": { + "table": "organizations", + "name": "name" + } + } + }, + { + "ordinal": 15, + "name": "organization_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "organizations", + "name": "icon_url" + } + } + }, + { + "ordinal": 16, + "name": "owner_id?", + "type_info": "Int8", + "origin": { + "Table": { + "table": "team_members", + "name": "user_id" + } + } + }, + { + "ordinal": 17, + "name": "owner_name?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "username" + } + } + }, + { + "ordinal": 18, + "name": "owner_icon_url?", + "type_info": "Varchar", + "origin": { + "Table": { + "table": "users", + "name": "avatar_url" + } + } + }, + { + "ordinal": 19, + "name": "project_types?: Vec", + "type_info": "TextArray", + "origin": "Expression" + }, + { + "ordinal": 20, + "name": "external_dependencies_count?", + "type_info": "Int8", + "origin": "Expression" + } + ], + "parameters": { + "Left": [ + "Bool", + "TextArray", + "Int8", + "Int8", + "Text", + "Bool" + ] + }, + "nullable": [ + null, + false, + true, + false, + false, + true, + false, + false, + false, + true, + true, + false, + false, + true, + false, + true, + false, + false, + true, + null, + null + ] + }, + "hash": "e530cccaa8f0c302258bab0abe08c9d69ce09919667fe4cac28b45118ad53be5" +} diff --git a/apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json b/apps/labrinth/.sqlx/query-e5957ab23e9bc5e69bf2126bf498f3765abb9c4208cb3a27f23a3c27187a7bae.json similarity index 93% rename from apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json rename to apps/labrinth/.sqlx/query-e5957ab23e9bc5e69bf2126bf498f3765abb9c4208cb3a27f23a3c27187a7bae.json index efa955be110..a90a4576368 100644 --- a/apps/labrinth/.sqlx/query-b760951120c1885530f3fb8208a5874fc472ec160a673abeeee10c778b9cf23f.json +++ b/apps/labrinth/.sqlx/query-e5957ab23e9bc5e69bf2126bf498f3765abb9c4208cb3a27f23a3c27187a7bae.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 = 'public' AND m.review_outcome = '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": "e5957ab23e9bc5e69bf2126bf498f3765abb9c4208cb3a27f23a3c27187a7bae" } diff --git a/apps/labrinth/.sqlx/query-efd46cf24f6d768c7ae99f4ce2f9ad87466f34bd5071788dc21b11ae65984b4f.json b/apps/labrinth/.sqlx/query-efd46cf24f6d768c7ae99f4ce2f9ad87466f34bd5071788dc21b11ae65984b4f.json new file mode 100644 index 00000000000..be9439ebca3 --- /dev/null +++ b/apps/labrinth/.sqlx/query-efd46cf24f6d768c7ae99f4ce2f9ad87466f34bd5071788dc21b11ae65984b4f.json @@ -0,0 +1,65 @@ +{ + "db_name": "PostgreSQL", + "query": "\n WITH old AS (\n SELECT id, visibility, in_review, review_outcome\n FROM mods\n WHERE id = $2\n ),\n updated AS (\n UPDATE mods\n SET review_outcome = $1, in_review = FALSE\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.visibility AS \"old_visibility!\",\n old.in_review AS \"old_in_review!\",\n old.review_outcome AS \"old_review_outcome!\"\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_visibility!", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "visibility" + } + } + }, + { + "ordinal": 2, + "name": "old_in_review!", + "type_info": "Bool", + "origin": { + "Table": { + "table": "mods", + "name": "in_review" + } + } + }, + { + "ordinal": 3, + "name": "old_review_outcome!", + "type_info": "Text", + "origin": { + "Table": { + "table": "mods", + "name": "review_outcome" + } + } + } + ], + "parameters": { + "Left": [ + "Text", + "Int8" + ] + }, + "nullable": [ + false, + false, + false, + false + ] + }, + "hash": "efd46cf24f6d768c7ae99f4ce2f9ad87466f34bd5071788dc21b11ae65984b4f" +} diff --git a/apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json b/apps/labrinth/.sqlx/query-f6a6c13ea37c75065cbd24799bee5ef8a9129d4b54f60ed5050a7f4228d74ad9.json similarity index 92% rename from apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json rename to apps/labrinth/.sqlx/query-f6a6c13ea37c75065cbd24799bee5ef8a9129d4b54f60ed5050a7f4228d74ad9.json index 4e485466f3b..0fdc8211147 100644 --- a/apps/labrinth/.sqlx/query-3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43.json +++ b/apps/labrinth/.sqlx/query-f6a6c13ea37c75065cbd24799bee5ef8a9129d4b54f60ed5050a7f4228d74ad9.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 = 'public' AND m.review_outcome = 'approved'\n ", "describe": { "columns": [ { @@ -72,8 +72,7 @@ ], "parameters": { "Left": [ - "Int8Array", - "TextArray" + "Int8Array" ] }, "nullable": [ @@ -85,5 +84,5 @@ true ] }, - "hash": "3afdd6b9070ea0951682facf207b9056ac842c402bd0941c45ebd1dc6d627d43" + "hash": "f6a6c13ea37c75065cbd24799bee5ef8a9129d4b54f60ed5050a7f4228d74ad9" } diff --git a/apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json b/apps/labrinth/.sqlx/query-fb795597dfbbf28a359c7f5ce2c15ace9eefae6f55923ac8b67c2fd5ce0dca64.json similarity index 71% rename from apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json rename to apps/labrinth/.sqlx/query-fb795597dfbbf28a359c7f5ce2c15ace9eefae6f55923ac8b67c2fd5ce0dca64.json index d4e4e2f18e1..a4197ef387e 100644 --- a/apps/labrinth/.sqlx/query-aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f.json +++ b/apps/labrinth/.sqlx/query-fb795597dfbbf28a359c7f5ce2c15ace9eefae6f55923ac8b67c2fd5ce0dca64.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 = 'public' AND m.review_outcome = 'approved'\n ", "describe": { "columns": [ { @@ -11,13 +11,11 @@ } ], "parameters": { - "Left": [ - "TextArray" - ] + "Left": [] }, "nullable": [ null ] }, - "hash": "aaec611bae08eac41c163367dc508208178170de91165095405f1b41e47f5e7f" + "hash": "fb795597dfbbf28a359c7f5ce2c15ace9eefae6f55923ac8b67c2fd5ce0dca64" } diff --git a/apps/labrinth/migrations/20261119120000_canonical_project_state.sql b/apps/labrinth/migrations/20261119120000_canonical_project_state.sql new file mode 100644 index 00000000000..aa98c6d1c69 --- /dev/null +++ b/apps/labrinth/migrations/20261119120000_canonical_project_state.sql @@ -0,0 +1,54 @@ +ALTER TABLE mods + ADD COLUMN visibility TEXT NOT NULL DEFAULT 'private', + ADD COLUMN in_review BOOLEAN NOT NULL DEFAULT FALSE, + ADD COLUMN review_outcome TEXT NOT NULL DEFAULT 'never_reviewed'; + +UPDATE mods +SET visibility = CASE + WHEN status = 'scheduled' THEN 'private' + WHEN status IN ('approved', 'archived') THEN 'public' + WHEN status IN ('unlisted', 'withheld') THEN 'unlisted' + WHEN status = 'private' THEN 'private' + WHEN requested_status IN ('approved', 'archived') THEN 'public' + WHEN requested_status = 'unlisted' THEN 'unlisted' + WHEN requested_status = 'private' THEN 'private' + WHEN status IN ('processing', 'rejected') THEN 'public' + ELSE 'private' + END, + in_review = status = 'processing', + review_outcome = CASE + WHEN status IN ('approved', 'archived', 'unlisted', 'private') THEN 'approved' + WHEN status = 'rejected' THEN 'rejected' + WHEN status = 'withheld' THEN 'withheld' + ELSE 'never_reviewed' + END; + +CREATE TABLE project_history ( + id BIGSERIAL PRIMARY KEY, + project_id BIGINT NOT NULL, + done_by BIGINT, + occurred_at TIMESTAMPTZ NOT NULL DEFAULT NOW(), + delta JSONB NOT NULL +); + +CREATE INDEX project_history_project_id_occurred_at_idx + ON project_history (project_id, occurred_at, id); + +-- (copied from 20250609134334_spatial-random-project-index.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_visibility_ids_gist ON mods USING gist (POINT(id, 0)) + WHERE visibility = 'public' AND review_outcome = 'approved'; + +-- DROP INDEX IF EXISTS mods_searchable_ids_gist; +-- DROP INDEX IF EXISTS mods_status; +-- ALTER TABLE mods DROP COLUMN status, DROP COLUMN requested_status; diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs index 785834104e8..15a72dc2a33 100644 --- a/apps/labrinth/src/auth/checks.rs +++ b/apps/labrinth/src/auth/checks.rs @@ -119,9 +119,9 @@ pub async fn filter_visible_project_ids( // Return projects that are not hidden or we are a mod of for project in projects { if (if hide_unlisted { - project.status.is_searchable() + project.is_searchable() } else { - !project.status.is_hidden() + !project.is_hidden() }) || user_option .as_ref() .is_some_and(|x| x.scopes.contains(Scopes::MODERATION_READ)) @@ -484,7 +484,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 = 'public' AND review_outcome = '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 90e258ed876..f8713c7401e 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) -> anyhow::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 - .context("failed syncing scheduled releases for projects")?; + info!("Releasing scheduled versions!"); sqlx::query!( " @@ -187,7 +175,7 @@ pub async fn release_scheduled(pool: PgPool) -> anyhow::Result<()> { .await .context("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/models/project_flag_item.rs b/apps/labrinth/src/database/models/project_flag_item.rs index d4dec4fc592..25bb46edba0 100644 --- a/apps/labrinth/src/database/models/project_flag_item.rs +++ b/apps/labrinth/src/database/models/project_flag_item.rs @@ -665,12 +665,11 @@ impl DBProjectFlagRun { } pub async fn queued_project_ids(pool: &PgPool) -> Result> { - let ids = sqlx::query_scalar!( - r#"SELECT id FROM mods WHERE status = 'processing'"#, - ) - .fetch_all(pool) - .await - .context("fetching queued project IDs")?; + let ids = + sqlx::query_scalar!(r#"SELECT id FROM mods WHERE in_review"#,) + .fetch_all(pool) + .await + .context("fetching queued project IDs")?; Ok(ids.into_iter().map(DBProjectId).collect()) } diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs index 1ecfaeb690f..40f0c479f2a 100644 --- a/apps/labrinth/src/database/models/project_item.rs +++ b/apps/labrinth/src/database/models/project_item.rs @@ -1,13 +1,14 @@ use super::{DBUser, ids::*}; -use crate::database::{PgTransaction, models}; +use crate::database::{PgTransaction, ReadOnlyPgPool, models}; use crate::file_hosting::FileHost; use crate::models::exp; 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, ProjectHistoryEntry, + ProjectReviewOutcome, ProjectVisibility, SideTypesMigrationReviewStatus, }; use anyhow::{Context, Result}; use ariadne::ids::base62_impl::parse_base62; @@ -23,7 +24,7 @@ use std::fmt::{Debug, Display}; use std::hash::Hash; use xredis::RedisPool; -pub const PROJECTS_NAMESPACE: &str = "projects:v9"; +pub const PROJECTS_NAMESPACE: &str = "projects:v11"; pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs:v6"; const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies:v4"; @@ -216,8 +217,9 @@ pub struct ProjectBuilder { pub categories: Vec, pub additional_categories: Vec, pub initial_versions: Vec, - pub status: ProjectStatus, - pub requested_status: Option, + pub visibility: ProjectVisibility, + pub in_review: bool, + pub review_outcome: ProjectReviewOutcome, pub license: String, pub slug: Option, pub link_urls: Vec, @@ -245,13 +247,14 @@ impl ProjectBuilder { published: Utc::now(), updated: Utc::now(), approved: None, - queued: if self.status == ProjectStatus::Processing { + queued: if self.in_review { Some(Utc::now()) } else { None }, - status: self.status, - requested_status: self.requested_status, + visibility: self.visibility, + in_review: self.in_review, + review_outcome: self.review_outcome, downloads: 0, follows: 0, icon_url: self.icon_url, @@ -341,8 +344,9 @@ pub struct DBProject { pub updated: DateTime, pub approved: Option>, pub queued: Option>, - pub status: ProjectStatus, - pub requested_status: Option, + pub visibility: ProjectVisibility, + pub in_review: bool, + pub review_outcome: ProjectReviewOutcome, pub downloads: i32, pub follows: i32, pub icon_url: Option, @@ -361,19 +365,97 @@ pub struct DBProject { } impl DBProject { + pub async fn get_history( + project_id: DBProjectId, + pool: &ReadOnlyPgPool, + ) -> Result> { + let rows = sqlx::query!( + r#" + SELECT id, project_id, done_by, occurred_at, + delta AS "delta: sqlx::types::Json" + FROM project_history + WHERE project_id = $1 + ORDER BY occurred_at, id + "#, + project_id as DBProjectId, + ) + .fetch_all(&**pool) + .await + .context("fetching project history")?; + Ok(rows + .into_iter() + .map(|row| ProjectHistoryEntry { + id: row.id, + project_id: DBProjectId(row.project_id).into(), + done_by: row.done_by.map(|id| DBUserId(id).into()), + occurred_at: row.occurred_at, + delta: row.delta.0, + }) + .collect()) + } + + pub async fn record_history( + project_id: DBProjectId, + done_by: Option, + delta: ProjectDelta, + transaction: &mut PgTransaction<'_>, + ) -> Result<()> { + let delta = serde_json::to_value(delta) + .context("serializing project history delta")?; + sqlx::query!( + r#" + INSERT INTO project_history (project_id, done_by, delta) + VALUES ($1, $2, $3) + "#, + project_id as DBProjectId, + done_by.map(|id| id.0), + delta, + ) + .execute(&mut *transaction) + .await + .context("recording project history")?; + Ok(()) + } + + pub fn calculate_effective_visibility( + visibility: ProjectVisibility, + review_outcome: ProjectReviewOutcome, + ) -> ProjectVisibility { + visibility.min(review_outcome.max_visibility()) + } + + pub fn effective_visibility(&self) -> ProjectVisibility { + Self::calculate_effective_visibility( + self.visibility, + self.review_outcome, + ) + } + + pub fn is_hidden(&self) -> bool { + self.effective_visibility() == ProjectVisibility::Private + } + + pub fn is_searchable(&self) -> bool { + self.effective_visibility() == ProjectVisibility::Public + } + + pub fn is_approved(&self) -> bool { + self.review_outcome == ProjectReviewOutcome::Approved + } + pub async fn insert( &self, transaction: &mut PgTransaction<'_>, ) -> Result<()> { 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, in_review, license_url, license, slug, color, monetization_status, organization_id, side_types_migration_review_status, - components + components, review_outcome, queued, status ) VALUES ( $1, $2, $3, $4, $5, $6, @@ -381,9 +463,9 @@ impl DBProject { $12, $13, LOWER($14), $15, $16, $17, $18, - $19 + $19, $20, $21, 'draft' ) - ", + "#, self.id as DBProjectId, self.team_id as DBTeamId, &self.name, @@ -393,8 +475,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()), + self.visibility.as_str(), + self.in_review, self.license_url.as_ref(), &self.license, self.slug.as_ref(), @@ -403,6 +485,8 @@ impl DBProject { self.organization_id.map(|x| x.0 as i64), self.side_types_migration_review_status.as_str(), serde_json::to_value(&self.components).expect("serialization shouldn't fail"), + self.review_outcome.as_str(), + self.queued, ) .execute(&mut *transaction) .await @@ -415,12 +499,20 @@ impl DBProject { id: DBProjectId, transaction: &mut PgTransaction<'_>, redis: &RedisPool, + done_by: Option, ) -> Result> { let project = Self::get_id(id, &mut *transaction, redis) .await .context("fetching project by id")?; if let Some(project) = project { + Self::record_history( + id, + done_by, + ProjectDelta::Deleted, + transaction, + ) + .await?; DBProject::clear_cache(id, project.inner.slug, Some(true), redis) .await .context("clearing project cache")?; @@ -827,7 +919,7 @@ 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, m.in_review, m.review_outcome, 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 +1001,9 @@ 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, - ), - requested_status: m - .requested_status - .as_deref() - .map(ProjectStatus::from_string), + visibility: ProjectVisibility::from_string(&m.visibility), + in_review: m.in_review, + review_outcome: ProjectReviewOutcome::from_string(&m.review_outcome), 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 42cc5694580..a9c4815f296 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::{ + LegacyProjectStatus, ProjectDelta, ProjectReviewOutcome, ProjectVisibility, +}; use crate::models::threads::MessageBody; use crate::models::users::Badges; use anyhow::{Context, Result}; @@ -226,9 +228,9 @@ impl DBUser { sqlx::query!( r#" - SELECT id, email, - avatar_url, raw_avatar_url, username, bio, - users.created, role, badges, + SELECT users.id AS "id!", email, + avatar_url, raw_avatar_url, users.username AS "username!", bio, + users.created AS "created!", users.role AS "role!", users.badges AS "badges!", ( SELECT MAX(campaign_donations.donated_at) FROM campaign_donations @@ -240,8 +242,10 @@ impl DBUser { WHERE campaign_donations.user_id = users.id ) AS campaign_pride_26_total_amount_donated_usd, github_id, discord_id, gitlab_id, google_id, steam_id, microsoft_id, - email_verified, password, totp_secret, paypal_id, paypal_country, paypal_email, - venmo_handle, stripe_customer_id, allow_friend_requests, is_subscribed_to_newsletter, + users.email_verified AS "email_verified!", password, totp_secret, paypal_id, paypal_country, paypal_email, + venmo_handle, stripe_customer_id, + users.allow_friend_requests AS "allow_friend_requests!", + users.is_subscribed_to_newsletter AS "is_subscribed_to_newsletter!", eligibility_verified_at, user_locks.locked_by AS "lock_locked_by?", user_locks.reason AS "lock_reason?", @@ -738,7 +742,9 @@ impl DBUser { r#" SELECT m.id AS "id!", - m.status AS "status!", + m.visibility AS "visibility!", + m.in_review AS "in_review!", + m.review_outcome AS "review_outcome!", m.slug, t.id AS "thread_id!" FROM mods m @@ -747,6 +753,7 @@ impl DBUser { AND tm.user_id = $1 AND tm.is_owner = TRUE INNER JOIN threads t ON t.mod_id = m.id + FOR UPDATE OF m "#, id as DBUserId, ) @@ -777,9 +784,7 @@ impl DBUser { "failed to insert project transfer thread message", )?; - if ProjectStatus::from_string(&project.status) - == ProjectStatus::Processing - { + if project.in_review { ThreadMessageBuilder { author_id: Some(deleted_user), body: MessageBody::Text { @@ -802,8 +807,12 @@ impl DBUser { ThreadMessageBuilder { author_id: Some(deleted_user), body: MessageBody::StatusChange { - new_status: ProjectStatus::Rejected, - old_status: ProjectStatus::Processing, + new_status: LegacyProjectStatus::Rejected, + old_status: crate::routes::v3::projects::mutation::legacy_status( + ProjectVisibility::from_string(&project.visibility), + project.in_review, + ProjectReviewOutcome::from_string(&project.review_outcome), + ), }, thread_id, hide_identity: false, @@ -817,17 +826,51 @@ impl DBUser { sqlx::query!( r#" UPDATE mods - SET status = $1 + SET review_outcome = $1, in_review = FALSE WHERE id = $2 "#, - ProjectStatus::Rejected.as_str(), + ProjectReviewOutcome::Rejected.as_str(), project.id, ) .execute(&mut *transaction) .await .context( - "failed to reject processing project owned by deleted user", + "failed to reject in-review project owned by deleted user", )?; + + models::DBProject::record_history( + DBProjectId(project.id), + None, + ProjectDelta::ChangeInReview { + from: true, + to: false, + }, + transaction, + ) + .await + .context( + "failed to record account deletion in-review history", + )?; + + let old_review_outcome = ProjectReviewOutcome::from_string( + &project.review_outcome, + ); + if old_review_outcome != ProjectReviewOutcome::Rejected { + models::DBProject::record_history( + DBProjectId(project.id), + None, + ProjectDelta::ChangeReviewOutcome { + from: old_review_outcome, + to: ProjectReviewOutcome::Rejected, + reason: None, + }, + transaction, + ) + .await + .context( + "failed to record account deletion review outcome history", + )?; + } } models::DBProject::clear_cache( diff --git a/apps/labrinth/src/database/redis/mod.rs b/apps/labrinth/src/database/redis/mod.rs index a8beed62376..b027745b92c 100644 --- a/apps/labrinth/src/database/redis/mod.rs +++ b/apps/labrinth/src/database/redis/mod.rs @@ -86,8 +86,8 @@ mod tests { use crate::models::exp::{self, minecraft}; use crate::models::notifications::NotificationBody; use crate::models::projects::{ - MonetizationStatus, ProjectStatus, SideTypesMigrationReviewStatus, - VersionStatus, + MonetizationStatus, ProjectReviewOutcome, ProjectVisibility, + SideTypesMigrationReviewStatus, VersionStatus, }; fn postcard_round_trip(value: &T) -> T @@ -113,8 +113,9 @@ mod tests { updated: now, approved: Some(now), queued: None, - status: ProjectStatus::Approved, - requested_status: None, + visibility: ProjectVisibility::Public, + in_review: false, + review_outcome: ProjectReviewOutcome::Approved, downloads: 3, follows: 4, icon_url: None, @@ -211,6 +212,21 @@ mod tests { components: exp::ProjectQuery::default(), }; postcard_round_trip(&project); + let response = crate::models::projects::Project::from(project.clone()); + assert_eq!( + response.status, + crate::models::v2::projects::ProjectStatus::Approved + ); + assert_eq!( + crate::models::v2::projects::ProjectStatus::from_project(&response), + response.status + ); + let mut queued = project; + queued.inner.in_review = true; + assert_eq!( + crate::models::projects::Project::from(queued).status, + crate::models::v2::projects::ProjectStatus::Processing + ); } #[test] diff --git a/apps/labrinth/src/models/exp/base.rs b/apps/labrinth/src/models/exp/base.rs index 07b3903f4bd..bb1c47e8555 100644 --- a/apps/labrinth/src/models/exp/base.rs +++ b/apps/labrinth/src/models/exp/base.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use validator::Validate; -use crate::models::{ids::OrganizationId, projects::ProjectStatus}; +use crate::models::{ids::OrganizationId, projects::ProjectVisibility}; #[derive(Debug, Clone, Serialize, Deserialize, Validate, utoipa::ToSchema)] pub struct Project { @@ -23,11 +23,17 @@ pub struct Project { /// A long description of the project, in markdown. #[validate(length(max = 65536))] pub description: String, - /// What status the user would like the project to be in after review. - pub requested_status: ProjectStatus, + /// The visibility requested by the project owner. + #[serde(default = "default_visibility")] + pub visibility: ProjectVisibility, + pub requested_status: Option, /// What organization the project belongs to. pub organization_id: Option, } +fn default_visibility() -> ProjectVisibility { + ProjectVisibility::Public +} + #[derive(Debug, Clone, Serialize, Deserialize, Validate, utoipa::ToSchema)] pub struct Version {} diff --git a/apps/labrinth/src/models/v2/notifications.rs b/apps/labrinth/src/models/v2/notifications.rs index 8163aec4a6b..2007b0390ef 100644 --- a/apps/labrinth/src/models/v2/notifications.rs +++ b/apps/labrinth/src/models/v2/notifications.rs @@ -8,7 +8,7 @@ use crate::models::{ UserSubscriptionId, }, notifications::{Notification, NotificationAction, NotificationBody}, - projects::ProjectStatus, + projects::LegacyProjectStatus, }; use ariadne::ids::UserId; use chrono::{DateTime, Utc}; @@ -89,8 +89,8 @@ pub enum LegacyNotificationBody { }, StatusChange { project_id: ProjectId, - old_status: ProjectStatus, - new_status: ProjectStatus, + old_status: LegacyProjectStatus, + new_status: LegacyProjectStatus, }, ModeratorMessage { thread_id: ThreadId, @@ -154,8 +154,8 @@ pub enum LegacyNotificationBody { }, ProjectStatusNeutral { project_id: ProjectId, - old_status: ProjectStatus, - new_status: ProjectStatus, + old_status: LegacyProjectStatus, + new_status: LegacyProjectStatus, }, ProjectTransferred { project_id: ProjectId, diff --git a/apps/labrinth/src/models/v2/projects.rs b/apps/labrinth/src/models/v2/projects.rs index 29d83f89d44..9f7235546c4 100644 --- a/apps/labrinth/src/models/v2/projects.rs +++ b/apps/labrinth/src/models/v2/projects.rs @@ -1,14 +1,14 @@ use std::convert::TryFrom; use super::super::ids::OrganizationId; -use crate::database::models::{DBProjectDisclosure, DBProjectId, version_item}; -use crate::models::disclosures::ProjectDisclosureType; +use crate::database::models::version_item; use crate::models::exp::minecraft::Environment; use crate::models::ids::{ProjectId, TeamId, ThreadId, VersionId}; use crate::models::link_platform::LinkPlatform; use crate::models::projects::{ Dependency, License, Link, Loader, ModeratorMessage, MonetizationStatus, - Project, ProjectStatus, Version, VersionFile, VersionStatus, VersionType, + Project, ProjectReviewOutcome, ProjectVisibility, Version, VersionFile, + VersionStatus, VersionType, }; use crate::routes::v2_reroute::{self, capitalize_first}; use anyhow::{Context, Result, anyhow}; @@ -19,6 +19,65 @@ use serde::{Deserialize, Serialize}; use validator::Validate; use xredis::RedisPool; +/// The combined project state exposed for legacy API clients. +#[derive( + Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq, utoipa::ToSchema, +)] +#[serde(rename_all = "snake_case")] +pub enum ProjectStatus { + Approved, + Rejected, + Draft, + Unlisted, + Processing, + Withheld, + Private, + Unknown, +} + +impl ProjectStatus { + pub fn visibility(self) -> Option { + match self { + Self::Approved => Some(ProjectVisibility::Public), + Self::Unlisted => Some(ProjectVisibility::Unlisted), + Self::Private => Some(ProjectVisibility::Private), + _ => None, + } + } + + pub fn from_state( + visibility: ProjectVisibility, + in_review: bool, + outcome: ProjectReviewOutcome, + ) -> Self { + if in_review { + return Self::Processing; + } + match outcome { + ProjectReviewOutcome::NeverReviewed => Self::Draft, + ProjectReviewOutcome::Rejected => Self::Rejected, + ProjectReviewOutcome::Withheld => Self::Withheld, + ProjectReviewOutcome::Approved => Self::from_visibility(visibility), + } + } + + pub fn from_project(project: &Project) -> Self { + Self::from_state( + project.effective_visibility(), + project.in_review, + project.review_outcome, + ) + } + + pub fn from_visibility(visibility: ProjectVisibility) -> Self { + match visibility { + ProjectVisibility::Public => Self::Approved, + ProjectVisibility::Unlisted => Self::Unlisted, + ProjectVisibility::Private => Self::Private, + } + } +} + /// A project returned from the API #[derive(Serialize, Deserialize, Clone, utoipa::ToSchema)] pub struct LegacyProject { @@ -110,6 +169,9 @@ impl LegacyProject { data: Project, versions_item: Option, ) -> Self { + let status = ProjectStatus::from_project(&data); + let requested_status = + Some(ProjectStatus::from_visibility(data.visibility)); let mut client_side = LegacySideType::Unknown; let mut server_side = LegacySideType::Unknown; @@ -203,8 +265,8 @@ impl LegacyProject { updated: data.updated, approved: data.approved, queued: data.queued, - status: data.status, - requested_status: data.requested_status, + status, + requested_status, moderator_message: data.moderator_message, license: data.license, downloads: data.downloads, @@ -245,35 +307,18 @@ impl LegacyProject { .iter() .filter_map(|p| p.versions.first().map(|i| (*i).into())) .collect(); - let project_ids: Vec = - data.iter().map(|p| p.id.into()).collect(); let example_versions = version_item::DBVersion::get_many(&version_ids, pool, redis) .await .context("fetching example versions for legacy projects")?; - let archived_disclosure_ids = DBProjectDisclosure::projects_with_type( - ProjectDisclosureType::Archived, - &project_ids, - pool, - ) - .await - .context("fetching archived disclosures for legacy projects")?; - let mut legacy_projects = Vec::new(); for project in data { let version_item = example_versions .iter() .find(|v| v.inner.project_id == project.id.into()) .cloned(); - let has_archived_disclosure = - archived_disclosure_ids.contains(&project.id.into()); - let mut project = LegacyProject::from(project, version_item); - if has_archived_disclosure - && project.status == ProjectStatus::Approved - { - project.status = ProjectStatus::Archived; - } + let project = LegacyProject::from(project, version_item); legacy_projects.push(project); } Ok(legacy_projects) @@ -485,3 +530,38 @@ pub fn validate_donation_platforms( } Ok(()) } + +#[cfg(test)] +mod project_status_tests { + use super::{ProjectStatus, ProjectVisibility}; + + #[test] + fn visibility_statuses_round_trip() { + for visibility in [ + ProjectVisibility::Public, + ProjectVisibility::Unlisted, + ProjectVisibility::Private, + ] { + let status = ProjectStatus::from_visibility(visibility); + assert_eq!(status.visibility(), Some(visibility)); + let json = serde_json::to_string(&status).unwrap(); + assert_eq!( + serde_json::from_str::(&json).unwrap(), + status + ); + } + } + + #[test] + fn moderation_statuses_do_not_request_visibility() { + for status in [ + ProjectStatus::Draft, + ProjectStatus::Processing, + ProjectStatus::Rejected, + ProjectStatus::Withheld, + ProjectStatus::Unknown, + ] { + assert_eq!(status.visibility(), None); + } + } +} diff --git a/apps/labrinth/src/models/v2/threads.rs b/apps/labrinth/src/models/v2/threads.rs index 2589c9030e8..300ce40657e 100644 --- a/apps/labrinth/src/models/v2/threads.rs +++ b/apps/labrinth/src/models/v2/threads.rs @@ -1,7 +1,7 @@ use crate::models::ids::{ ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId, }; -use crate::models::projects::ProjectStatus; +use crate::models::projects::LegacyProjectStatus; use crate::models::users::User; use ariadne::ids::UserId; use chrono::{DateTime, Utc}; @@ -38,8 +38,8 @@ pub enum LegacyMessageBody { associated_images: Vec, }, StatusChange { - new_status: ProjectStatus, - old_status: ProjectStatus, + new_status: LegacyProjectStatus, + old_status: LegacyProjectStatus, }, ThreadClosure, ThreadReopen, diff --git a/apps/labrinth/src/models/v3/notifications.rs b/apps/labrinth/src/models/v3/notifications.rs index 12a00412ea8..203500e6dc2 100644 --- a/apps/labrinth/src/models/v3/notifications.rs +++ b/apps/labrinth/src/models/v3/notifications.rs @@ -7,7 +7,7 @@ use crate::models::ids::{ NotificationId, ProjectId, ReportId, TeamId, ThreadId, ThreadMessageId, VersionId, }; -use crate::models::projects::ProjectStatus; +use crate::models::projects::LegacyProjectStatus; use crate::routes::ApiError; use anyhow::anyhow; use ariadne::ids::UserId; @@ -200,8 +200,8 @@ pub enum NotificationBody { }, StatusChange { project_id: ProjectId, - old_status: ProjectStatus, - new_status: ProjectStatus, + old_status: LegacyProjectStatus, + new_status: LegacyProjectStatus, }, /// This is for website notifications only. Email notifications have `ModerationMessageReceived`. ModeratorMessage { @@ -230,8 +230,8 @@ pub enum NotificationBody { }, ProjectStatusNeutral { project_id: ProjectId, - old_status: ProjectStatus, - new_status: ProjectStatus, + old_status: LegacyProjectStatus, + new_status: LegacyProjectStatus, }, ProjectTransferred { project_id: ProjectId, diff --git a/apps/labrinth/src/models/v3/projects.rs b/apps/labrinth/src/models/v3/projects.rs index 2c1e0e6b79f..6720a7afb89 100644 --- a/apps/labrinth/src/models/v3/projects.rs +++ b/apps/labrinth/src/models/v3/projects.rs @@ -23,16 +23,55 @@ pub enum ApprovalReason { Auto(ApprovalProvenance), } +/// Why a project's review outcome changed. +#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] +#[serde(tag = "type", rename_all = "snake_case")] +pub enum ReviewOutcomeReason { + ByUser { reason: Option }, + Auto { provenance: ApprovalProvenance }, +} + +/// A project history entry, including its actor and timestamp. +#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] +pub struct ProjectHistoryEntry { + pub id: i64, + pub project_id: ProjectId, + pub done_by: Option, + pub occurred_at: DateTime, + pub delta: ProjectDelta, +} + +/// A durable record of a project's lifecycle or state change. +#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] +#[serde(tag = "kind", rename_all = "snake_case")] +pub enum ProjectDelta { + Created, + Deleted, + ChangeVisibility { + from: ProjectVisibility, + to: ProjectVisibility, + }, + ChangeInReview { + from: bool, + to: bool, + }, + ChangeReviewOutcome { + from: ProjectReviewOutcome, + to: ProjectReviewOutcome, + reason: Option, + }, +} + /// Evidence captured when a project is automatically approved. #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] pub struct ApprovalProvenance { pub trigger: AutoApprovalCause, - pub previous_status: ProjectStatus, + pub resolved_issue_ids: Vec, } #[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)] -#[serde(tag = "type", rename_all = "snake_case")] +#[serde(tag = "kind", rename_all = "snake_case")] pub enum AutoApprovalCause { Resubmission { user_id: UserId }, TechnicalReviewNoDetails, @@ -77,10 +116,14 @@ pub struct Project { /// The date at which the project entered the moderation queue pub queued: Option>, - /// The status of the project - pub status: ProjectStatus, - /// The requested status of this project - pub requested_status: Option, + /// The visibility requested by the project owner. + pub visibility: ProjectVisibility, + pub status: crate::models::v2::projects::ProjectStatus, + pub requested_status: Option, + /// Whether the project is currently queued for review. + pub in_review: bool, + /// The latest moderation outcome, which caps public visibility. + pub review_outcome: ProjectReviewOutcome, /// DEPRECATED: moved to threads system /// The rejection data of the project @@ -239,8 +282,19 @@ impl From for Project { updated: m.updated, approved: m.approved, queued: m.queued, - status: m.status, - requested_status: m.requested_status, + status: crate::models::v2::projects::ProjectStatus::from_state( + m.visibility, + m.in_review, + m.review_outcome, + ), + requested_status: Some( + crate::models::v2::projects::ProjectStatus::from_visibility( + m.visibility, + ), + ), + visibility: m.visibility, + in_review: m.in_review, + review_outcome: m.review_outcome, moderator_message: if let Some(message) = m.moderation_message { Some(ModeratorMessage { message, @@ -309,6 +363,25 @@ impl From for Project { } impl Project { + pub fn effective_visibility(&self) -> ProjectVisibility { + crate::database::models::DBProject::calculate_effective_visibility( + self.visibility, + self.review_outcome, + ) + } + + pub fn is_hidden(&self) -> bool { + self.effective_visibility() == ProjectVisibility::Private + } + + pub fn is_searchable(&self) -> bool { + self.effective_visibility() == ProjectVisibility::Public + } + + pub fn is_approved(&self) -> bool { + self.review_outcome == ProjectReviewOutcome::Approved + } + // Matches the from QueryProject, but with a ResultSearchProject // pub fn from_search(m: ResultSearchProject) -> Option { // let project_id = ProjectId(parse_base62(&m.project_id).ok()?); @@ -337,10 +410,9 @@ impl Project { // .and_then(|dq| DateTime::parse_from_rfc3339(&dq).ok()) // .map(|d| d.into()); // - // let status = ProjectStatus::from_string(&m.status); - // let requested_status = m - // .requested_status - // .map(|mrs| ProjectStatus::from_string(&mrs)); + // let visibility = ProjectVisibility::from_string(&m.visibility); + // let in_review = m.in_review; + // let review_outcome = ProjectReviewOutcome::from_string(&m.review_outcome); // // let license_url = m.license_url; // let icon_url = m.icon_url; @@ -418,8 +490,9 @@ impl Project { // updated, // approved, // queued, - // status, - // requested_status, + // visibility, + // in_review, + // review_outcome, // moderator_message: None, // Deprecated // license: License { // id: m.license.clone(), @@ -519,15 +592,181 @@ impl From for Link { } } -/// A status decides the visibility of a project in search, URLs, and the whole site itself. -/// Approved - Project is displayed on search, and accessible by URL -/// Rejected - Project is not displayed on search, and not accessible by URL (Temporary state, project can reapply) -/// Draft - Project is not displayed on search, and not accessible by URL -/// Unlisted - Project is not displayed on search, but accessible by URL -/// Withheld - Same as unlisted, but set by a moderator. Cannot be switched to another type without moderator approval -/// Processing - Project is not displayed on search, and not accessible by URL (Temporary state, project under review) -/// Scheduled - Project is scheduled to be released in the future -/// Private - Project is approved, but is not viewable to the public +#[cfg(test)] +mod project_state_tests { + use super::{ + ApprovalProvenance, AutoApprovalCause, LegacyProjectStatus, + ProjectDelta, ProjectReviewOutcome, ProjectVisibility, + ReviewOutcomeReason, + }; + + #[test] + fn in_review_history_uses_kind_discriminator() { + let delta = serde_json::to_value(ProjectDelta::ChangeInReview { + from: false, + to: true, + }) + .unwrap(); + assert_eq!( + delta, + serde_json::json!({ + "kind": "change_in_review", + "from": false, + "to": true, + }) + ); + } + + #[test] + fn project_history_deltas_round_trip() { + let provenance = ApprovalProvenance { + trigger: AutoApprovalCause::TechnicalReviewNoDetails, + + resolved_issue_ids: Vec::new(), + }; + for delta in [ + ProjectDelta::Created, + ProjectDelta::Deleted, + ProjectDelta::ChangeInReview { + from: false, + to: true, + }, + ProjectDelta::ChangeInReview { + from: true, + to: false, + }, + ProjectDelta::ChangeVisibility { + from: ProjectVisibility::Public, + to: ProjectVisibility::Private, + }, + ProjectDelta::ChangeReviewOutcome { + from: ProjectReviewOutcome::NeverReviewed, + to: ProjectReviewOutcome::Approved, + reason: Some(ReviewOutcomeReason::Auto { + provenance: provenance.clone(), + }), + }, + ProjectDelta::ChangeReviewOutcome { + from: ProjectReviewOutcome::Approved, + to: ProjectReviewOutcome::Withheld, + reason: Some(ReviewOutcomeReason::ByUser { + reason: Some("Please fix the project description".into()), + }), + }, + ] { + let value = serde_json::to_value(delta).unwrap(); + let decoded: ProjectDelta = + serde_json::from_value(value.clone()).unwrap(); + assert_eq!(serde_json::to_value(decoded).unwrap(), value); + } + let delta = serde_json::to_value(ProjectDelta::ChangeReviewOutcome { + from: ProjectReviewOutcome::NeverReviewed, + to: ProjectReviewOutcome::Approved, + reason: Some(ReviewOutcomeReason::Auto { + provenance: provenance.clone(), + }), + }) + .unwrap(); + let message = serde_json::to_value( + crate::models::threads::MessageBody::AutoApproval { + old_status: LegacyProjectStatus::Processing, + new_status: LegacyProjectStatus::Approved, + provenance: Some(provenance), + }, + ) + .unwrap(); + assert_eq!(delta["reason"]["type"], "auto"); + assert_eq!( + delta["reason"]["provenance"]["trigger"]["kind"], + "technical_review_no_details" + ); + assert!( + delta["reason"]["provenance"] + .get("previous_status") + .is_none() + ); + assert_eq!(delta["reason"]["provenance"], message["provenance"]); + } + + #[test] + fn visibility_round_trips_and_ordering() { + let values = [ + ProjectVisibility::Private, + ProjectVisibility::Unlisted, + ProjectVisibility::Public, + ]; + assert!(values[0] < values[1] && values[1] < values[2]); + for value in values { + assert_eq!(ProjectVisibility::from_string(value.as_str()), value); + let json = serde_json::to_string(&value).unwrap(); + assert_eq!(json, format!("\"{}\"", value.as_str())); + assert_eq!( + serde_json::from_str::(&json).unwrap(), + value + ); + } + assert_eq!( + ProjectVisibility::from_string("unknown"), + ProjectVisibility::Private + ); + } + + #[test] + fn review_outcome_round_trips_and_effective_visibility_matrix() { + use ProjectReviewOutcome::{ + Approved, NeverReviewed, Rejected, Withheld, + }; + use ProjectVisibility::{Private, Public, Unlisted}; + for (outcome, expected) in [ + (NeverReviewed, [Private, Private, Private]), + (Approved, [Private, Unlisted, Public]), + (Rejected, [Private, Private, Private]), + (Withheld, [Private, Unlisted, Unlisted]), + ] { + assert_eq!( + ProjectReviewOutcome::from_string(outcome.as_str()), + outcome + ); + let json = serde_json::to_string(&outcome).unwrap(); + assert_eq!(json, format!("\"{}\"", outcome.as_str())); + assert_eq!( + serde_json::from_str::(&json).unwrap(), + outcome + ); + for (visibility, effective) in + [Private, Unlisted, Public].into_iter().zip(expected) + { + assert_eq!( + crate::database::models::DBProject::calculate_effective_visibility( + visibility, + outcome, + ), + effective, + ); + } + } + assert_eq!(ProjectReviewOutcome::from_string("unknown"), NeverReviewed); + } + + #[test] + fn removed_historical_states_are_unknown() { + for value in ["scheduled", "archived"] { + assert_eq!( + LegacyProjectStatus::from_string(value), + LegacyProjectStatus::Unknown + ); + assert_eq!( + serde_json::from_value::( + serde_json::json!(value) + ) + .unwrap(), + LegacyProjectStatus::Unknown + ); + } + } +} + +/// Owner-selected visibility, ordered from least to most public. #[derive( Serialize, Deserialize, @@ -535,151 +774,169 @@ impl From for Link { Clone, Eq, PartialEq, + Ord, + PartialOrd, Hash, Debug, utoipa::ToSchema, )] -#[serde(rename_all = "lowercase")] -pub enum ProjectStatus { - Approved, - Archived, - Rejected, - Draft, - Unlisted, - Processing, - Withheld, - Scheduled, +#[serde(rename_all = "snake_case")] +pub enum ProjectVisibility { Private, - Unknown, + Unlisted, + Public, +} + +impl ProjectVisibility { + pub fn from_string(value: &str) -> Self { + match value { + "public" => Self::Public, + "unlisted" => Self::Unlisted, + _ => Self::Private, + } + } + + pub fn as_str(&self) -> &'static str { + match self { + Self::Private => "private", + Self::Unlisted => "unlisted", + Self::Public => "public", + } + } } -impl std::fmt::Display for ProjectStatus { +impl std::fmt::Display for ProjectVisibility { fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { - write!(fmt, "{}", self.as_str()) + fmt.write_str(self.as_str()) } } -impl ProjectStatus { - pub fn from_string(string: &str) -> ProjectStatus { - match string { - "processing" => ProjectStatus::Processing, - "rejected" => ProjectStatus::Rejected, - "approved" => ProjectStatus::Approved, - "draft" => ProjectStatus::Draft, - "unlisted" => ProjectStatus::Unlisted, - "archived" => ProjectStatus::Archived, - "withheld" => ProjectStatus::Withheld, - "private" => ProjectStatus::Private, - _ => ProjectStatus::Unknown, +/// The latest review outcome, independent of current queue membership. +#[derive( + Serialize, + Deserialize, + Copy, + Clone, + Eq, + PartialEq, + Hash, + Debug, + utoipa::ToSchema, +)] +#[serde(rename_all = "snake_case")] +pub enum ProjectReviewOutcome { + NeverReviewed, + Approved, + Rejected, + Withheld, +} + +impl ProjectReviewOutcome { + pub fn from_string(value: &str) -> Self { + match value { + "approved" => Self::Approved, + "rejected" => Self::Rejected, + "withheld" => Self::Withheld, + _ => Self::NeverReviewed, } } + pub fn as_str(&self) -> &'static str { match self { - ProjectStatus::Approved => "approved", - ProjectStatus::Rejected => "rejected", - ProjectStatus::Draft => "draft", - ProjectStatus::Unlisted => "unlisted", - ProjectStatus::Processing => "processing", - ProjectStatus::Unknown => "unknown", - ProjectStatus::Archived => "archived", - ProjectStatus::Withheld => "withheld", - ProjectStatus::Scheduled => "scheduled", - ProjectStatus::Private => "private", + Self::NeverReviewed => "never_reviewed", + Self::Approved => "approved", + Self::Rejected => "rejected", + Self::Withheld => "withheld", } } - pub fn as_friendly_str(&self) -> &'static str { + + pub fn max_visibility(&self) -> ProjectVisibility { match self { - ProjectStatus::Approved => "Listed", - ProjectStatus::Rejected => "Rejected", - ProjectStatus::Draft => "Draft", - ProjectStatus::Unlisted => "Unlisted", - ProjectStatus::Processing => "Under review", - ProjectStatus::Unknown => "Unknown", - ProjectStatus::Archived => "Archived", - ProjectStatus::Withheld => "Withheld", - ProjectStatus::Scheduled => "Scheduled", - ProjectStatus::Private => "Private", + Self::Approved => ProjectVisibility::Public, + Self::Withheld => ProjectVisibility::Unlisted, + Self::NeverReviewed | Self::Rejected => ProjectVisibility::Private, } } +} - pub fn iterator() -> impl Iterator { - [ - ProjectStatus::Approved, - ProjectStatus::Archived, - ProjectStatus::Rejected, - ProjectStatus::Draft, - ProjectStatus::Unlisted, - ProjectStatus::Processing, - ProjectStatus::Withheld, - ProjectStatus::Scheduled, - ProjectStatus::Private, - ProjectStatus::Unknown, - ] - .iter() - .copied() +impl std::fmt::Display for ProjectReviewOutcome { + fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { + fmt.write_str(self.as_str()) } +} - // Project pages + info cannot be viewed - pub fn is_hidden(&self) -> bool { - match self { - ProjectStatus::Rejected => true, - ProjectStatus::Draft => true, - ProjectStatus::Processing => true, - ProjectStatus::Unknown => true, - ProjectStatus::Scheduled => true, - ProjectStatus::Private => true, - - ProjectStatus::Approved => false, - ProjectStatus::Unlisted => false, - ProjectStatus::Archived => false, - ProjectStatus::Withheld => false, - } - } +/// Historical event data only; never use this enum for current project state. +#[derive( + Serialize, + Deserialize, + Copy, + Clone, + Eq, + PartialEq, + Hash, + Debug, + utoipa::ToSchema, +)] +#[serde(rename_all = "snake_case")] +pub enum LegacyProjectStatus { + Approved, + Rejected, + Draft, + Unlisted, + Processing, + Withheld, + Private, + #[serde(other)] + Unknown, +} - // Project can be displayed in search - // IMPORTANT: if this is changed, make sure to: - // - update the `mods_searchable_ids_gist` - // index in the DB to keep random project queries fast (see the - // `20250609134334_spatial-random-project-index.sql` migration). - // - update the `is_visible_organization` function in - // `apps/labrinth/src/auth/checks.rs`, which duplicates this logic - // in a SQL query for efficiency. - pub fn is_searchable(&self) -> bool { - matches!(self, ProjectStatus::Approved | ProjectStatus::Archived) +impl LegacyProjectStatus { + pub fn from_string(value: &str) -> Self { + match value { + "approved" => Self::Approved, + "rejected" => Self::Rejected, + "draft" => Self::Draft, + "unlisted" => Self::Unlisted, + "processing" => Self::Processing, + "withheld" => Self::Withheld, + "private" => Self::Private, + _ => Self::Unknown, + } } - // Project is "Approved" by moderators - pub fn is_approved(&self) -> bool { - matches!( - self, - ProjectStatus::Approved - | ProjectStatus::Archived - | ProjectStatus::Unlisted - | ProjectStatus::Private - ) + pub fn as_str(&self) -> &'static str { + match self { + Self::Approved => "approved", + Self::Rejected => "rejected", + Self::Draft => "draft", + Self::Unlisted => "unlisted", + Self::Processing => "processing", + Self::Withheld => "withheld", + Self::Private => "private", + Self::Unknown => "unknown", + } } - // Project status can be requested after moderator approval - pub fn can_be_requested(&self) -> bool { + pub fn as_friendly_str(&self) -> &'static str { match self { - ProjectStatus::Approved => true, - ProjectStatus::Unlisted => true, - ProjectStatus::Private => true, - - // `draft` used to be requestable for some reason, now considered a bug. - ProjectStatus::Draft => false, - // `archived` is represented by a disclosure, not a status, so it - // can no longer be requested or set as a status. - ProjectStatus::Archived => false, - ProjectStatus::Rejected => false, - ProjectStatus::Processing => false, - ProjectStatus::Unknown => false, - ProjectStatus::Withheld => false, - ProjectStatus::Scheduled => false, + Self::Approved => "Listed", + Self::Rejected => "Rejected", + Self::Draft => "Draft", + Self::Unlisted => "Unlisted", + Self::Processing => "Under review", + Self::Withheld => "Withheld", + Self::Private => "Private", + Self::Unknown => "Unknown", } } } +impl std::fmt::Display for LegacyProjectStatus { + fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result { + fmt.write_str(self.as_str()) + } +} + #[derive( Serialize, Deserialize, Copy, Clone, Debug, Eq, PartialEq, utoipa::ToSchema, )] diff --git a/apps/labrinth/src/models/v3/thread_issues.rs b/apps/labrinth/src/models/v3/thread_issues.rs index 1c46528c2cf..d42b84f1943 100644 --- a/apps/labrinth/src/models/v3/thread_issues.rs +++ b/apps/labrinth/src/models/v3/thread_issues.rs @@ -824,10 +824,20 @@ mod tests { use crate::models::exp; use crate::models::ids::{ProjectId, TeamId, ThreadId}; use crate::models::projects::{ - GalleryItem, License, Link, MonetizationStatus, ProjectStatus, - SideTypesMigrationReviewStatus, + GalleryItem, License, Link, MonetizationStatus, ProjectReviewOutcome, + ProjectVisibility, SideTypesMigrationReviewStatus, }; + #[test] + fn project_response_includes_legacy_and_canonical_state() { + let value = serde_json::to_value(project()).unwrap(); + assert_eq!(value["status"], "draft"); + assert_eq!(value["requested_status"], "approved"); + assert_eq!(value["visibility"], "public"); + assert_eq!(value["in_review"], false); + assert_eq!(value["review_outcome"], "never_reviewed"); + } + fn project() -> Project { let now = Utc::now(); Project { @@ -844,8 +854,13 @@ mod tests { updated: now, approved: None, queued: None, - status: ProjectStatus::Draft, - requested_status: None, + status: crate::models::v2::projects::ProjectStatus::Draft, + requested_status: Some( + crate::models::v2::projects::ProjectStatus::Approved, + ), + visibility: ProjectVisibility::Public, + in_review: false, + review_outcome: ProjectReviewOutcome::NeverReviewed, moderator_message: None, license: License { id: "MIT".to_string(), diff --git a/apps/labrinth/src/models/v3/threads.rs b/apps/labrinth/src/models/v3/threads.rs index 2bd81d14c48..f5ca4abd33e 100644 --- a/apps/labrinth/src/models/v3/threads.rs +++ b/apps/labrinth/src/models/v3/threads.rs @@ -4,7 +4,7 @@ use crate::models::ids::{ ImageId, ProjectId, ReportId, ThreadId, ThreadMessageId, }; use crate::models::pats::Scopes; -use crate::models::projects::{ApprovalProvenance, ProjectStatus}; +use crate::models::projects::{ApprovalProvenance, LegacyProjectStatus}; use crate::models::thread_issues::ThreadIssue; use crate::models::users::User; use ariadne::ids::UserId; @@ -47,12 +47,12 @@ pub enum MessageBody { associated_images: Vec, }, StatusChange { - new_status: ProjectStatus, - old_status: ProjectStatus, + new_status: LegacyProjectStatus, + old_status: LegacyProjectStatus, }, AutoApproval { - new_status: ProjectStatus, - old_status: ProjectStatus, + new_status: LegacyProjectStatus, + old_status: LegacyProjectStatus, #[serde(default, skip_serializing_if = "Option::is_none")] provenance: Option, }, diff --git a/apps/labrinth/src/queue/email/templates.rs b/apps/labrinth/src/queue/email/templates.rs index 7f8ff811d67..df58bed9827 100644 --- a/apps/labrinth/src/queue/email/templates.rs +++ b/apps/labrinth/src/queue/email/templates.rs @@ -436,7 +436,7 @@ async fn collect_template_variables( let result = query!( r#" SELECT - r.created, + r.created AS "created!", COALESCE(m.name, v.version_number, u.username, 'unknown') "title!" FROM reports r LEFT JOIN mods m ON r.mod_id = m.id diff --git a/apps/labrinth/src/queue/server_ping.rs b/apps/labrinth/src/queue/server_ping.rs index 461a3b63503..f5c74ec8956 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; @@ -218,13 +217,9 @@ impl ServerPingQueue { SELECT id, components AS "components: Json" FROM mods WHERE - status = ANY($1) + review_outcome = '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 c350b387188..2270b71d343 100644 --- a/apps/labrinth/src/routes/internal/moderation/mod.rs +++ b/apps/labrinth/src/routes/internal/moderation/mod.rs @@ -9,7 +9,9 @@ use crate::database::models::{ }; use crate::database::{PgPool, ReadOnlyPgPool}; use crate::models::ids::{OrganizationId, ProjectId}; -use crate::models::projects::{ProjectStatus, VersionStatus}; +use crate::models::projects::{ + ProjectReviewOutcome, ProjectVisibility, VersionStatus, +}; use crate::queue::moderation::{ApprovalType, IdentifiedFile, MissingMetadata}; use crate::queue::session::AuthQueue; use crate::routes::v3::organizations::OrganizationIds; @@ -136,8 +138,10 @@ pub struct ModerationQueueProject { pub name: String, pub summary: String, pub icon_url: Option, - pub status: ProjectStatus, - pub requested_status: Option, + pub visibility: ProjectVisibility, + pub in_review: bool, + pub review_outcome: ProjectReviewOutcome, + pub effective_visibility: ProjectVisibility, pub queued: Option>, pub initial_queued: Option>, pub published: DateTime, @@ -311,7 +315,7 @@ pub async fn get_projects_internal( m.components FROM mods m WHERE - m.status = $1 + m.in_review = $1 AND ( $9::boolean = false OR NOT EXISTS ( @@ -449,8 +453,9 @@ pub async fn get_projects_internal( m.name, m.summary, m.icon_url, - m.status, - m.requested_status, + m.visibility, + m.in_review, + m.review_outcome, m.queued, m.initial_queued, m.published, @@ -487,8 +492,9 @@ pub async fn get_projects_internal( page_projects.name AS "name?", page_projects.summary AS "summary?", page_projects.icon_url AS "icon_url?", - page_projects.status AS "status?", - page_projects.requested_status AS "requested_status?", + page_projects.visibility AS "visibility?", + page_projects.in_review AS "in_review?", + page_projects.review_outcome AS "review_outcome?", page_projects.queued AS "queued?", page_projects.initial_queued AS "initial_queued?", page_projects.published AS "published?", @@ -511,7 +517,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(), + true, &listed_version_statuses, query, project_type, @@ -535,8 +541,9 @@ pub async fn get_projects_internal( row.name, row.summary, row.icon_url, - row.status, - row.requested_status, + row.visibility, + row.in_review, + row.review_outcome, row.queued, row.initial_queued, row.published, @@ -568,7 +575,7 @@ pub async fn get_projects_internal( m.published FROM mods m WHERE - m.status = $1 + m.in_review = $1 AND ( $6::boolean = false OR NOT EXISTS ( @@ -626,8 +633,9 @@ pub async fn get_projects_internal( m.name, m.summary, m.icon_url, - m.status, - m.requested_status, + m.visibility, + m.in_review, + m.review_outcome, m.queued, m.initial_queued, m.published, @@ -675,8 +683,9 @@ pub async fn get_projects_internal( page_projects.name AS "name?", page_projects.summary AS "summary?", page_projects.icon_url AS "icon_url?", - page_projects.status AS "status?", - page_projects.requested_status AS "requested_status?", + page_projects.visibility AS "visibility?", + page_projects.in_review AS "in_review?", + page_projects.review_outcome AS "review_outcome?", page_projects.queued AS "queued?", page_projects.initial_queued AS "initial_queued?", page_projects.published AS "published?", @@ -697,7 +706,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(), + true, &listed_version_statuses, count, offset, @@ -718,8 +727,9 @@ pub async fn get_projects_internal( row.name, row.summary, row.icon_url, - row.status, - row.requested_status, + row.visibility, + row.in_review, + row.review_outcome, row.queued, row.initial_queued, row.published, @@ -805,7 +815,7 @@ pub async fn get_project_ids( m.components FROM mods m WHERE - m.status = $1 + m.in_review = $1 AND ( $7::boolean = false OR NOT EXISTS ( @@ -912,7 +922,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(), + true, &listed_version_statuses, query, project_type, @@ -934,7 +944,7 @@ pub async fn get_project_ids( SELECT id FROM mods WHERE - status = $1 + in_review = $1 AND ( $3::boolean = false OR NOT EXISTS ( @@ -949,7 +959,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(), + true, sort, exclude_technical_review, ) @@ -972,8 +982,9 @@ fn row_to_queue_project( name: Option, summary: Option, icon_url: Option, - status: Option, - requested_status: Option, + visibility: Option, + in_review: Option, + review_outcome: Option, queued: Option>, initial_queued: Option>, published: Option>, @@ -1002,11 +1013,19 @@ fn row_to_queue_project( "project {project_id} is missing `summary` in moderation queue row" ) })?; - let status = status.internal_context_with(|| { - anyhow!( - "project {project_id} is missing `status` in moderation queue row" - ) + let visibility = visibility.internal_context_with(|| { + anyhow!("project {project_id} is missing `visibility` in moderation queue row") + })?; + let in_review = in_review.internal_context_with(|| { + anyhow!("project {project_id} is missing `in_review` in moderation queue row") })?; + let review_outcome = review_outcome.internal_context_with(|| { + anyhow!("project {project_id} is missing `review_outcome` in moderation queue row") + })?; + let visibility = ProjectVisibility::from_string(&visibility); + let review_outcome = ProjectReviewOutcome::from_string(&review_outcome); + let effective_visibility = + DBProject::calculate_effective_visibility(visibility, review_outcome); let published = published.internal_context_with(|| { anyhow!( "project {project_id} is missing `published` in moderation queue row" @@ -1034,10 +1053,10 @@ fn row_to_queue_project( name, summary, icon_url, - status: ProjectStatus::from_string(&status), - requested_status: requested_status - .as_deref() - .map(ProjectStatus::from_string), + visibility, + in_review, + review_outcome, + effective_visibility, queued, initial_queued, published, @@ -1759,14 +1778,14 @@ pub async fn delete_all_locks( Ok(web::Json(DeleteAllLocksResponse { deleted_count })) } -/// Get project id's for a given user with them grouped by their `ProjectStatus`. +/// Get project id's for a given user with them grouped by their `ProjectReviewOutcome`. /// -/// Only statuses with at least one project are present in the map. +/// Only review outcomes with at least one project are present in the map. #[utoipa::path( context_path = "/moderation", tag = "moderation", security(("bearer_auth" = [])), - responses((status = OK, body = HashMap>)) + responses((status = OK, body = HashMap>)) )] #[get("/user/{user_id}/all-projects-by-status")] pub async fn get_user_project_by_status( @@ -1775,7 +1794,8 @@ pub async fn get_user_project_by_status( pool: web::Data, redis: web::Data, session_queue: web::Data, -) -> Result>>, ApiError> { +) -> Result>>, ApiError> +{ get_user_from_headers( &req, &**pool, @@ -1798,7 +1818,7 @@ pub async fn get_user_project_by_status( Ok(web::Json(counts)) } -/// Get project id's for a list of user's with them grouped by their `ProjectStatus`. +/// Get project id's for a list of user's with them grouped by their `ProjectReviewOutcome`. /// /// Users that don't exist are silently omitted from the response; users /// that exist but have no projects are included with an empty map. @@ -1807,7 +1827,7 @@ pub async fn get_user_project_by_status( tag = "moderation", security(("bearer_auth" = [])), params(("ids" = String, Query)), - responses((status = OK, body = HashMap>>)) + responses((status = OK, body = HashMap>>)) )] #[get("/users/all-projects-by-status")] pub async fn get_users_project_by_status( @@ -1817,7 +1837,7 @@ pub async fn get_users_project_by_status( redis: web::Data, session_queue: web::Data, ) -> Result< - web::Json>>>, + web::Json>>>, ApiError, > { get_user_from_headers( @@ -1860,14 +1880,14 @@ pub async fn get_users_project_by_status( Ok(web::Json(grouped_projects_by_user)) } -/// Get project id's for a given organization with them grouped by their `ProjectStatus`. +/// Get project id's for a given organization with them grouped by their `ProjectReviewOutcome`. /// -/// Only statuses with at least one project are present in the map. +/// Only review outcomes with at least one project are present in the map. #[utoipa::path( context_path = "/moderation", tag = "moderation", security(("bearer_auth" = [])), - responses((status = OK, body = HashMap>)) + responses((status = OK, body = HashMap>)) )] #[get("/organization/{organization_id}/all-projects-by-status")] pub async fn get_organization_project_by_status( @@ -1876,7 +1896,8 @@ pub async fn get_organization_project_by_status( pool: web::Data, redis: web::Data, session_queue: web::Data, -) -> Result>>, ApiError> { +) -> Result>>, ApiError> +{ get_user_from_headers( &req, &**pool, @@ -1902,7 +1923,7 @@ pub async fn get_organization_project_by_status( Ok(web::Json(grouped_projects)) } -/// Get project id's for a list of organization's with them grouped by their `ProjectStatus`. +/// Get project id's for a list of organization's with them grouped by their `ProjectReviewOutcome`. /// /// Organizations that don't exist are silently omitted from the /// response; organizations that exist but have no projects are included @@ -1912,7 +1933,7 @@ pub async fn get_organization_project_by_status( tag = "moderation", security(("bearer_auth" = [])), params(("ids" = String, Query)), - responses((status = OK, body = HashMap>>)) + responses((status = OK, body = HashMap>>)) )] #[get("/organizations/all-projects-by-status")] pub async fn get_organizations_project_by_status( @@ -1922,7 +1943,9 @@ pub async fn get_organizations_project_by_status( redis: web::Data, session_queue: web::Data, ) -> Result< - web::Json>>>, + web::Json< + HashMap>>, + >, ApiError, > { get_user_from_headers( @@ -1971,12 +1994,12 @@ pub async fn get_organizations_project_by_status( Ok(web::Json(grouped_projects_by_org)) } -/// Groups the given User projects by their `ProjectStatus`. +/// Groups the given User projects by their `ProjectReviewOutcome`. async fn user_projects_by_status<'a, E>( user_id: database::models::DBUserId, pool: E, redis: &RedisPool, -) -> Result>, ApiError> +) -> Result>, ApiError> where E: database::Executor<'a, Database = sqlx::Postgres> + database::Acquire<'a, Database = sqlx::Postgres> @@ -1990,12 +2013,12 @@ where group_projects_by_status(&project_ids, pool, redis).await } -/// Groups the given Organization projects by their `ProjectStatus`. +/// Groups the given Organization projects by their `ProjectReviewOutcome`. async fn organization_projects_by_status<'a, E>( organization_id: DBOrganizationId, pool: E, redis: &RedisPool, -) -> Result>, ApiError> +) -> Result>, ApiError> where E: database::Executor<'a, Database = sqlx::Postgres> + database::Acquire<'a, Database = sqlx::Postgres> @@ -2008,12 +2031,12 @@ where group_projects_by_status(&project_ids, pool, redis).await } -/// Groups the given input Projects by their `ProjectStatus`. +/// Groups the given input Projects by their `ProjectReviewOutcome`. async fn group_projects_by_status<'a, E>( project_ids: &[DBProjectId], pool: E, redis: &RedisPool, -) -> Result>, ApiError> +) -> Result>, ApiError> where E: database::Executor<'a, Database = sqlx::Postgres> + database::Acquire<'a, Database = sqlx::Postgres> @@ -2027,11 +2050,11 @@ where .await .internal_context("fetching projects from database")?; - let mut grouped_projects: HashMap> = + let mut grouped_projects: HashMap> = HashMap::new(); for project in &projects { grouped_projects - .entry(project.inner.status) + .entry(project.inner.review_outcome) .or_default() .push(project.inner.id.into()); } diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs index 9ca388dade5..573c774f029 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::{ + LegacyProjectStatus, Project, ProjectDelta, ProjectReviewOutcome, + ProjectVisibility, + }, threads::{MessageBody, Thread}, }, queue::session::AuthQueue, @@ -98,7 +101,7 @@ pub struct SearchProjectsFilter { #[serde(default)] pub replied_to: Option, #[serde(default)] - pub project_status: Vec, + pub review_outcome: Vec, #[serde(default)] pub issue_type: Vec, } @@ -451,8 +454,11 @@ pub struct ProjectModerationInfo { pub thread_id: ThreadId, /// Project name. pub name: String, - /// Current project status. - pub status: ProjectStatus, + /// Creator-selected visibility. + pub visibility: ProjectVisibility, + pub in_review: bool, + pub review_outcome: ProjectReviewOutcome, + pub effective_visibility: ProjectVisibility, /// The aggregated project typos of the versions of this project #[serde(default)] pub project_types: Vec, @@ -849,8 +855,8 @@ 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.in_review OR m.review_outcome = 'approved') + AND (cardinality($6::text[]) = 0 OR m.review_outcome = ANY($6::text[])) AND ( cardinality($7::text[]) = 0 OR EXISTS ( @@ -899,7 +905,7 @@ pub async fn search_projects( replied_to_filter.as_deref(), &search_req .filter - .project_status + .review_outcome .iter() .map(|status| status.to_string()) .collect::>(), @@ -973,13 +979,17 @@ pub async fn search_projects( projects: projects .into_iter() .map(|(id, project)| { + let effective_visibility = project.effective_visibility(); ( id, ProjectModerationInfo { id, thread_id: project.thread_id, name: project.name, - status: project.status, + visibility: project.visibility, + in_review: project.in_review, + review_outcome: project.review_outcome, + effective_visibility, project_types: project.project_types, icon_url: project.icon_url, }, @@ -1254,13 +1264,13 @@ pub async fn submit_report( let record = sqlx::query!( r#" WITH old AS ( - SELECT id, status + SELECT id, visibility, in_review, review_outcome FROM mods WHERE id = $2 ), updated AS ( UPDATE mods - SET status = $1 + SET review_outcome = $1, in_review = FALSE FROM threads t WHERE mods.id = $2 @@ -1269,22 +1279,62 @@ pub async fn submit_report( ) SELECT updated.thread_id AS "thread_id: DBThreadId", - old.status AS "old_status!" + old.visibility AS "old_visibility!", + old.in_review AS "old_in_review!", + old.review_outcome AS "old_review_outcome!" FROM updated INNER JOIN old ON old.id = updated.id "#, - ProjectStatus::Rejected.as_str(), + ProjectReviewOutcome::Rejected.as_str(), project_id as _, ) .fetch_one(&mut txn) .await .internal_context("failed to mark project as rejected")?; + if record.old_in_review { + DBProject::record_history( + project_id, + Some(user.user.id.into()), + ProjectDelta::ChangeInReview { + from: true, + to: false, + }, + &mut txn, + ) + .await + .internal_context("recording technical review in-review history")?; + } + + let old_review_outcome = + ProjectReviewOutcome::from_string(&record.old_review_outcome); + if old_review_outcome != ProjectReviewOutcome::Rejected { + DBProject::record_history( + project_id, + Some(user.user.id.into()), + ProjectDelta::ChangeReviewOutcome { + from: old_review_outcome, + to: ProjectReviewOutcome::Rejected, + reason: None, + }, + &mut txn, + ) + .await + .internal_context("recording technical review outcome history")?; + } + ThreadMessageBuilder { author_id: Some(user.user.id.into()), body: MessageBody::StatusChange { - new_status: ProjectStatus::Rejected, - old_status: ProjectStatus::from_string(&record.old_status), + new_status: LegacyProjectStatus::Rejected, + old_status: + crate::routes::v3::projects::mutation::legacy_status( + ProjectVisibility::from_string(&record.old_visibility), + record.old_in_review, + ProjectReviewOutcome::from_string( + &record.old_review_outcome, + ), + ), }, thread_id: record.thread_id, hide_identity: user.scopes.contains(Scopes::MODERATION_WRITE), @@ -1681,20 +1731,23 @@ pub async fn update_global_issue_details( Ok(()) } -/// A user's project that is stuck in `processing` or `rejected` because the +/// A user's project that is in review or rejected because the /// most recent technical review verdict posted to its thread was `unsafe`. #[derive(Debug, Clone, Serialize, utoipa::ToSchema)] pub struct FlaggedProject { pub project_id: ProjectId, pub thread_id: ThreadId, - pub status: ProjectStatus, + pub visibility: ProjectVisibility, + pub in_review: bool, + pub review_outcome: ProjectReviewOutcome, + pub effective_visibility: ProjectVisibility, /// The `tech_review` message that carried the `unsafe` verdict. pub message_id: ThreadMessageId, /// When that verdict was posted. pub reviewed: DateTime, } -/// Get all of a user's `processing`/`rejected` projects whose most recent +/// Get all of a user's in-review or rejected projects whose most recent /// `tech_review` thread message was an `unsafe` verdict. #[utoipa::path( context_path = "/moderation/tech-review", @@ -1731,7 +1784,7 @@ pub async fn get_user_flagged_projects( Ok(web::Json(flagged)) } -/// Get all of multiple users' `processing`/`rejected` projects whose most +/// Get all of multiple users' in-review or rejected projects whose most /// recent `tech_review` thread message was an `unsafe` verdict. Users that /// don't exist are silently omitted from the response; users that exist /// but have no matching projects are included with an empty list. @@ -1789,7 +1842,7 @@ pub async fn get_users_flagged_projects( Ok(web::Json(flagged_by_user)) } -/// Get all of an organization's `processing`/`rejected` projects whose most +/// Get all of an organization's in-review or rejected projects whose most /// recent `tech_review` thread message was an `unsafe` verdict. #[utoipa::path( context_path = "/moderation/tech-review", @@ -1826,7 +1879,7 @@ pub async fn get_organization_flagged_projects( Ok(web::Json(flagged)) } -/// Get all of multiple organizations' `processing`/`rejected` projects +/// Get all of multiple organizations' in-review or rejected projects /// whose most recent `tech_review` thread message was an `unsafe` verdict. /// Organizations that don't exist are silently omitted from the response; /// organizations that exist but have no matching projects are included @@ -1889,7 +1942,7 @@ pub async fn get_organizations_flagged_projects( Ok(web::Json(flagged_by_org)) } -/// Finds a single user's `processing`/`rejected` projects whose most recent +/// Finds a single user's in-review or rejected projects whose most recent /// `tech_review` thread message was an `unsafe` verdict. Shared by the /// single- and multi-user flagged-projects endpoints. async fn user_flagged_projects<'a, E>( @@ -1909,7 +1962,7 @@ where flagged_projects_among(&project_ids, pool, redis).await } -/// Finds a single organization's `processing`/`rejected` projects whose +/// Finds a single organization's in-review or rejected projects whose /// most recent `tech_review` thread message was an `unsafe` verdict. /// Shared by the single- and multi-organization flagged-projects /// endpoints. @@ -1930,7 +1983,7 @@ where flagged_projects_among(&project_ids, pool, redis).await } -/// Finds `processing`/`rejected` projects (from the given ids) whose most +/// Finds in-review or rejected projects (from the given ids) whose most /// recent `tech_review` thread message was an `unsafe` verdict. Shared by /// the user- and organization-scoped flagged-projects helpers above. async fn flagged_projects_among<'a, E>( @@ -1947,17 +2000,16 @@ where return Ok(Vec::new()); } - // Only `processing`/`rejected` projects are relevant, so narrow down + // Only in-review or rejected projects are relevant, so narrow down // before pulling any thread data. let candidate_projects = DBProject::get_many_ids(project_ids, pool, redis) .await .internal_context("fetching projects from database")? .into_iter() .filter(|project| { - matches!( - project.inner.status, - ProjectStatus::Processing | ProjectStatus::Rejected - ) + project.inner.in_review + || project.inner.review_outcome + == ProjectReviewOutcome::Rejected }) .collect::>(); @@ -2001,7 +2053,10 @@ where Some(FlaggedProject { project_id: project.inner.id.into(), thread_id: project.thread_id.into(), - status: project.inner.status, + visibility: project.inner.visibility, + in_review: project.inner.in_review, + review_outcome: project.inner.review_outcome, + effective_visibility: project.inner.effective_visibility(), message_id: last_review.id.into(), reviewed: last_review.created, }) 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 5c74e05d701..f59a6952faa 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.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.in_review) ORDER BY effect.detail_id DESC LIMIT $3 OFFSET $4 "#, diff --git a/apps/labrinth/src/routes/v2/project_creation.rs b/apps/labrinth/src/routes/v2/project_creation.rs index a6d6922cb6f..ccbf29c9641 100644 --- a/apps/labrinth/src/routes/v2/project_creation.rs +++ b/apps/labrinth/src/routes/v2/project_creation.rs @@ -3,9 +3,9 @@ use crate::database::models::version_item; use crate::file_hosting::FileHost; use crate::models; use crate::models::ids::ImageId; -use crate::models::projects::{Loader, Project, ProjectStatus}; +use crate::models::projects::{Loader, Project}; use crate::models::v2::projects::{ - DonationLink, LegacyProject, LegacySideType, + DonationLink, LegacyProject, LegacySideType, ProjectStatus, }; use crate::queue::session::AuthQueue; use crate::routes::v3::project_creation::default_project_type; @@ -294,7 +294,10 @@ pub async fn project_create( is_draft: legacy_create.is_draft, license_id: legacy_create.license_id, gallery_items: legacy_create.gallery_items, - requested_status: legacy_create.requested_status, + requested_status: None, + visibility: legacy_create.requested_status.visibility().ok_or_else(|| { + crate::routes::ApiError::Request(anyhow::anyhow!("invalid requested project status")) + })?, uploaded_images: legacy_create.uploaded_images, organization_id: legacy_create.organization_id, }) diff --git a/apps/labrinth/src/routes/v2/projects.rs b/apps/labrinth/src/routes/v2/projects.rs index ac2a76384b5..fb1ee43d50a 100644 --- a/apps/labrinth/src/routes/v2/projects.rs +++ b/apps/labrinth/src/routes/v2/projects.rs @@ -1,15 +1,11 @@ -use crate::database::models as db_models; use crate::database::models::{project_item, version_item}; use crate::database::{PgPool, ReadOnlyPgPool}; use crate::file_hosting::FileHost; -use crate::models::disclosures::ProjectDisclosureType; use crate::models::link_platform::LinkPlatform; use crate::models::pats::Scopes; -use crate::models::projects::{ - Link, MonetizationStatus, Project, ProjectStatus, -}; +use crate::models::projects::{Link, MonetizationStatus, Project}; use crate::models::v2::projects::{ - DonationLink, LegacyProject, LegacySideType, LegacyVersion, + DonationLink, LegacyProject, LegacySideType, LegacyVersion, ProjectStatus, }; use crate::models::v2::search::LegacySearchResults; use crate::queue::session::AuthQueue; @@ -347,19 +343,7 @@ pub async fn project_get( } None => None, }; - let has_archived_disclosure = - db_models::DBProjectDisclosure::projects_with_type( - ProjectDisclosureType::Archived, - &[project.id.into()], - &***ro_pool, - ) - .await - .internal_context("fetching archival disclosure status")? - .contains(&project.id.into()); - let mut project = LegacyProject::from(project, version_item); - if has_archived_disclosure && project.status == ProjectStatus::Approved { - project.status = ProjectStatus::Archived; - } + let project = LegacyProject::from(project, version_item); Ok(HttpResponse::Ok().json(project)) } @@ -739,6 +723,10 @@ pub async fn project_edit( slug: v2_new_project.slug, status: v2_new_project.status, requested_status: v2_new_project.requested_status, + visibility: None, + in_review: None, + review_outcome: None, + review_reason: None, moderation_message: v2_new_project.moderation_message, moderation_message_body: v2_new_project.moderation_message_body, monetization_status: v2_new_project.monetization_status, diff --git a/apps/labrinth/src/routes/v3/analytics_get/mod.rs b/apps/labrinth/src/routes/v3/analytics_get/mod.rs index e4afc76d58b..f7c79e8d62d 100644 --- a/apps/labrinth/src/routes/v3/analytics_get/mod.rs +++ b/apps/labrinth/src/routes/v3/analytics_get/mod.rs @@ -41,7 +41,7 @@ use crate::{ models::{ ids::{ProjectId, VersionId}, pats::Scopes, - projects::ProjectStatus, + projects::LegacyProjectStatus, teams::ProjectPermissions, threads::MessageBody, v3::{analytics::DownloadReason, projects::Project, users::User}, @@ -163,8 +163,8 @@ pub enum ProjectAnalyticsEventKind { }, /// Project changed status. StatusChanged { - status_from: ProjectStatus, - status_to: ProjectStatus, + status_from: LegacyProjectStatus, + status_to: LegacyProjectStatus, }, } diff --git a/apps/labrinth/src/routes/v3/project_creation.rs b/apps/labrinth/src/routes/v3/project_creation.rs index f18dbc1ab2e..c912cb25f8b 100644 --- a/apps/labrinth/src/routes/v3/project_creation.rs +++ b/apps/labrinth/src/routes/v3/project_creation.rs @@ -7,7 +7,7 @@ use crate::database::PgPool; use crate::database::PgTransaction; use crate::database::models::loader_item::Loader; use crate::database::models::thread_item::ThreadBuilder; -use crate::database::models::{self, DBUser, image_item}; +use crate::database::models::{self, DBProject, DBUser, image_item}; use crate::file_hosting::{FileHost, FileHostPublicity, FileHostingError}; use crate::models::error::ApiError; use crate::models::exp; @@ -16,8 +16,9 @@ use crate::models::images::{Image, ImageContext}; use crate::models::link_platform::LinkPlatform; use crate::models::pats::Scopes; use crate::models::projects::{ - License, Link, MonetizationStatus, Project, ProjectStatus, - SideTypesMigrationReviewStatus, VersionStatus, + License, Link, MonetizationStatus, Project, ProjectDelta, + ProjectReviewOutcome, ProjectVisibility, SideTypesMigrationReviewStatus, + VersionStatus, }; use crate::models::teams::{OrganizationPermissions, ProjectPermissions}; use crate::models::threads::ThreadType; @@ -26,6 +27,7 @@ use crate::queue::session::AuthQueue; use crate::routes::internal::globals::GLOBALS; use crate::search::SearchState; use crate::util::MinecraftMeta; +use crate::util::error::Context; use crate::util::guards::admin_key_guard; use crate::util::img::upload_image_optimized; use crate::util::kafka::KafkaClientState; @@ -207,8 +209,8 @@ pub fn default_project_type() -> String { "mod".to_string() } -fn default_requested_status() -> ProjectStatus { - ProjectStatus::Approved +fn default_visibility() -> ProjectVisibility { + ProjectVisibility::Public } #[derive(Serialize, Deserialize, Validate, Clone)] @@ -262,9 +264,9 @@ pub struct ProjectCreateData { #[validate(nested, length(max = 64))] /// The multipart names of the gallery items to upload pub gallery_items: Option>, - #[serde(default = "default_requested_status")] - /// The status of the mod to be set once it is approved - pub requested_status: ProjectStatus, + #[serde(default = "default_visibility")] + pub visibility: ProjectVisibility, + pub requested_status: Option, // Associations to uploaded images in body/description #[validate(length(max = 10))] @@ -964,7 +966,17 @@ async fn project_create_inner( let team_id = team.insert(&mut *transaction).await?; - let status = ProjectStatus::Draft; + let visibility = project_create_data + .requested_status + .map(|status| { + status.visibility().ok_or_else(|| { + CreateError::InvalidInput( + "invalid requested project status".to_string(), + ) + }) + }) + .transpose()? + .unwrap_or(project_create_data.visibility); let license_id = spdx::Expression::parse( &project_create_data.license_id, @@ -1005,8 +1017,9 @@ async fn project_create_inner( categories, additional_categories, initial_versions: versions, - status, - requested_status: Some(project_create_data.requested_status), + visibility, + in_review: false, + review_outcome: ProjectReviewOutcome::NeverReviewed, license: license_id.to_string(), slug: Some(project_create_data.slug), link_urls, @@ -1034,6 +1047,14 @@ async fn project_create_inner( let id = project_builder_actual .insert(&mut *transaction, redis, file_host, delphi_scan_files) .await?; + DBProject::record_history( + id, + Some(current_user.user.id.into()), + ProjectDelta::Created, + &mut *transaction, + ) + .await + .internal_context("failed to record project creation history")?; DBUser::clear_project_cache(&[current_user.user.id.into()], redis) .await?; @@ -1118,8 +1139,15 @@ async fn project_create_inner( updated: now, approved: None, queued: None, - status, - requested_status: project_builder.requested_status, + status: crate::models::v2::projects::ProjectStatus::Draft, + requested_status: Some( + crate::models::v2::projects::ProjectStatus::from_visibility( + visibility, + ), + ), + visibility, + in_review: false, + review_outcome: ProjectReviewOutcome::NeverReviewed, moderator_message: None, license: License { id: project_create_data.license_id.clone(), diff --git a/apps/labrinth/src/routes/v3/project_creation/new.rs b/apps/labrinth/src/routes/v3/project_creation/new.rs index a7d02ce6a8e..27110f9561c 100644 --- a/apps/labrinth/src/routes/v3/project_creation/new.rs +++ b/apps/labrinth/src/routes/v3/project_creation/new.rs @@ -12,7 +12,7 @@ use crate::{ database::{ PgPool, models::{ - self, DBOrganization, DBTeamMember, DBUser, + self, DBOrganization, DBProject, DBTeamMember, DBUser, project_item::ProjectBuilder, thread_item::ThreadBuilder, version_item::VersionBuilder, }, @@ -23,7 +23,8 @@ use crate::{ ids::ProjectId, pats::Scopes, projects::{ - MonetizationStatus, ProjectStatus, VersionStatus, VersionType, + MonetizationStatus, ProjectDelta, ProjectReviewOutcome, + VersionStatus, VersionType, }, teams::{OrganizationPermissions, ProjectPermissions}, threads::ThreadType, @@ -191,9 +192,18 @@ pub async fn create( slug, summary, description, + visibility, requested_status, organization_id, } = base; + let visibility = requested_status + .map(|status| { + status + .visibility() + .request_context("invalid requested project status") + }) + .transpose()? + .unwrap_or(visibility); // check if this won't conflict with an existing project @@ -334,8 +344,9 @@ pub async fn create( categories: vec![], additional_categories: vec![], initial_versions: vec![], - status: ProjectStatus::Draft, - requested_status: Some(requested_status), + visibility, + in_review: false, + review_outcome: ProjectReviewOutcome::NeverReviewed, license: "LicenseRef-Unknown".into(), slug: Some(slug.clone()), link_urls: vec![], @@ -352,6 +363,14 @@ pub async fn create( .insert(&mut txn, &redis, &**file_host, &mut delphi_scan_files) .await .internal_context("failed to insert project")?; + DBProject::record_history( + project_id.into(), + Some(user.user.id.into()), + ProjectDelta::Created, + &mut txn, + ) + .await + .internal_context("failed to record project creation history")?; if let Some(version_builder) = version_builder { version_builder @@ -395,7 +414,7 @@ pub async fn create( #[cfg(test)] mod tests { use super::*; - use crate::models::projects::ProjectStatus; + use crate::models::projects::ProjectVisibility; fn project_create_with_slug(slug: &str) -> ProjectCreate { ProjectCreate { @@ -404,7 +423,8 @@ mod tests { slug: slug.into(), summary: "test summary".into(), description: String::new(), - requested_status: ProjectStatus::Approved, + visibility: ProjectVisibility::Public, + requested_status: None, organization_id: None, }, components: exp::ProjectEdit { @@ -426,6 +446,26 @@ mod tests { ); } + #[test] + fn project_create_accepts_legacy_server_visibility() { + for (status, expected) in [ + ("approved", ProjectVisibility::Public), + ("unlisted", ProjectVisibility::Unlisted), + ("private", ProjectVisibility::Private), + ] { + let request: ProjectCreate = serde_json::from_value(serde_json::json!({ + "base": { "name": "test server", "slug": "test-server", "summary": "test summary", "description": "", "requested_status": status }, + "minecraft_server": {}, + "minecraft_java_server": { "address": "" }, + "minecraft_bedrock_server": { "address": "" } + })).unwrap(); + assert_eq!( + request.base.requested_status.unwrap().visibility(), + Some(expected) + ); + } + } + #[test] fn project_create_accepts_url_safe_base_slugs() { for slug in ["valid-slug", "valid_slug", "valid.slug", "valid123"] { diff --git a/apps/labrinth/src/routes/v3/projects/mod.rs b/apps/labrinth/src/routes/v3/projects/mod.rs index c4f9c704c9e..8ed1a418f0b 100644 --- a/apps/labrinth/src/routes/v3/projects/mod.rs +++ b/apps/labrinth/src/routes/v3/projects/mod.rs @@ -18,17 +18,16 @@ 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::disclosures::{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, + ApprovalReason, AutoApprovalCause, LegacyProjectStatus, MonetizationStatus, + Project, ProjectDelta, ProjectHistoryEntry, ProjectReviewOutcome, + ProjectVisibility, ReviewOutcomeReason, SideTypesMigrationReviewStatus, }; use crate::models::teams::{DEFAULT_ROLE, ProjectPermissions}; use crate::models::threads::MessageBody; @@ -47,6 +46,7 @@ use crate::util::img::{delete_old_images, upload_image_optimized}; use crate::util::routes::read_limited_from_payload; use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web}; use anyhow::anyhow; +use ariadne::ids::base62_impl::parse_base62; use chrono::Utc; use futures::TryStreamExt; use itertools::Itertools; @@ -71,6 +71,7 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) { pub fn project_config(cfg: &mut actix_web::web::ServiceConfig) { cfg.service(project_get) + .service(project_history_get) .service(project_get_check) .service(project_delete) .service(project_edit) @@ -155,11 +156,6 @@ pub async fn random_projects_get( .map_err(|err| anyhow!(err)) .request_context("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 +167,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 = 'public' AND review_outcome = '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 +197,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 = 'public' AND review_outcome = 'approved' ORDER BY POINT(id, 0) <-> (SELECT point FROM random_id_point) - LIMIT $2", - &statuses, + LIMIT $1", params.count as i32, ) .fetch(&***ro_pool) @@ -336,6 +330,60 @@ pub async fn project_get( Ok(HttpResponse::Ok().json(project.into_inner())) } +/// Get a project's history, including retained history for deleted project IDs. +#[utoipa::path( + context_path = "/project", + tag = "projects", + responses((status = OK, body = Vec)) +)] +#[get("/{id}/history")] +pub async fn project_history_get( + req: HttpRequest, + info: web::Path<(String,)>, + pool: web::Data, + ro_pool: web::Data, + redis: web::Data, + session_queue: web::Data, +) -> Result>, ApiError> { + let user = get_user_from_headers( + &req, + &**pool, + &redis, + &session_queue, + Scopes::MODERATION_READ, + ) + .await + .auth_context("authenticating API request")?; + + if !user.scopes.contains(Scopes::MODERATION_READ) { + return Err(ApiError::Auth(anyhow!( + "moderation read permission is required" + ))); + } + + let (string,) = info.into_inner(); + let project = db_models::DBProject::get(&string, &***ro_pool, &redis) + .await + .internal_context("fetching project")?; + let id = if let Some(project) = &project { + project.inner.id + } else { + parse_base62(&string) + .map(ProjectId) + .map(DBProjectId::from) + .map_err(|_| ApiError::NotFound(anyhow!("resource not found")))? + }; + + let history = db_models::DBProject::get_history(id, &ro_pool) + .await + .internal_context("fetching project history")?; + if project.is_none() && history.is_empty() { + return Err(ApiError::NotFound(anyhow!("resource not found"))); + } + + Ok(web::Json(history)) +} + pub async fn project_get_internal( req: HttpRequest, info: web::Path<(String,)>, @@ -404,13 +452,19 @@ pub struct EditProject { regex(path = *crate::util::validate::RE_URL_SAFE) )] pub slug: Option, - pub status: Option, + pub status: Option, #[serde( default, - skip_serializing_if = "Option::is_none", - with = "::serde_with::rust::double_option" + with = "::serde_with::rust::double_option", + skip_serializing_if = "Option::is_none" )] - pub requested_status: Option>, + pub requested_status: + Option>, + pub visibility: Option, + pub in_review: Option, + pub review_outcome: Option, + #[validate(length(max = 65536))] + pub review_reason: Option, #[serde( default, skip_serializing_if = "Option::is_none", @@ -453,6 +507,68 @@ pub struct EditProject { Option>, } +impl EditProject { + fn apply_legacy_state(&mut self, moderator: bool) -> Result<(), ApiError> { + use crate::models::v2::projects::ProjectStatus; + if (self.status.is_some() || self.requested_status.is_some()) + && (self.visibility.is_some() + || self.in_review.is_some() + || self.review_outcome.is_some()) + { + return Err(ApiError::Request(anyhow!( + "legacy and canonical project state fields cannot be combined" + ))); + } + if let Some(Some(status)) = self.requested_status { + let visibility = status.visibility().ok_or_else(|| { + ApiError::Request(anyhow!("invalid requested project status")) + })?; + self.visibility = Some(visibility); + } + if let Some(status) = self.status { + if let Some(visibility) = status.visibility() { + self.visibility = Some(visibility); + if moderator { + self.in_review = Some(false); + self.review_outcome = Some(ProjectReviewOutcome::Approved); + } + } else { + match status { + ProjectStatus::Processing => { + self.in_review = Some(true); + if moderator { + self.review_outcome = + Some(ProjectReviewOutcome::NeverReviewed); + } + } + ProjectStatus::Draft => { + self.in_review = Some(false); + if moderator { + self.review_outcome = + Some(ProjectReviewOutcome::NeverReviewed); + } + } + ProjectStatus::Rejected | ProjectStatus::Withheld => { + self.in_review = Some(false); + self.review_outcome = + Some(if status == ProjectStatus::Rejected { + ProjectReviewOutcome::Rejected + } else { + ProjectReviewOutcome::Withheld + }); + } + _ => { + return Err(ApiError::Request(anyhow!( + "invalid project status" + ))); + } + } + } + } + Ok(()) + } +} + #[allow(clippy::too_many_arguments)] /// Update a project. #[utoipa::path( @@ -518,6 +634,7 @@ pub async fn project_edit_internal( .await .auth_context("authenticating API request")?; + let mut new_project = new_project; new_project.validate().map_err(|err| { let message = crate::util::validate::validation_errors_to_string(err, None) @@ -554,9 +671,9 @@ pub async fn project_edit_internal( ))); }; - let submit_for_review = new_project.status - == Some(ProjectStatus::Processing) - && !user.scopes.contains(Scopes::MODERATION_WRITE); + let submit_for_review = new_project.in_review == Some(true) + || new_project.status + == Some(crate::models::v2::projects::ProjectStatus::Processing); if submit_for_review && !perms.contains(ProjectPermissions::EDIT_DETAILS) { return Err(ApiError::Auth(anyhow!( @@ -570,7 +687,7 @@ pub async fn project_edit_internal( .internal_context("starting database transaction")?; let locked_project = sqlx::query!( r#" - SELECT status, slug + SELECT visibility, in_review, review_outcome, slug FROM mods WHERE id = $1 FOR UPDATE @@ -580,17 +697,27 @@ pub async fn project_edit_internal( .fetch_one(&mut transaction) .await .internal_context("locking project for editing")?; - project_item.inner.status = - ProjectStatus::from_string(&locked_project.status); - project_item.inner.slug = locked_project.slug; - - if submit_for_review && project_item.inner.status.is_approved() { - return Err(ApiError::Auth(anyhow!( - "you do not have permission to submit this project for review" + project_item.inner.visibility = + ProjectVisibility::from_string(&locked_project.visibility); + project_item.inner.in_review = locked_project.in_review; + project_item.inner.review_outcome = + ProjectReviewOutcome::from_string(&locked_project.review_outcome); + new_project + .apply_legacy_state(user.scopes.contains(Scopes::MODERATION_WRITE))?; + if new_project.review_reason.is_some() + && new_project.review_outcome.is_none() + { + return Err(ApiError::Request(anyhow!( + "review reason requires a review outcome change" ))); } + let original_in_review = project_item.inner.in_review; + let original_review_outcome = project_item.inner.review_outcome; + let originally_searchable = project_item.inner.is_searchable(); + project_item.inner.slug = locked_project.slug; - let validate_for_review = submit_for_review; + let validate_for_review = + submit_for_review && !user.scopes.contains(Scopes::MODERATION_WRITE); if let Some(name) = &new_project.name { if !perms.contains(ProjectPermissions::EDIT_DETAILS) { @@ -634,111 +761,84 @@ pub async fn project_edit_internal( .internal_context("querying database for `project_edit_internal`")?; } - if let Some(status) = &new_project.status - && !submit_for_review + if (new_project.status.is_some() + || new_project.requested_status.is_some() + || new_project.visibility.is_some() + || new_project.in_review.is_some() + || new_project.review_outcome.is_some()) + && !perms.contains(ProjectPermissions::EDIT_DETAILS) { - if !perms.contains(ProjectPermissions::EDIT_DETAILS) { - return Err(ApiError::Auth(anyhow!( - "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, + return Err(ApiError::Auth(anyhow!( + "you do not have permission to edit project state" + ))); + } + if new_project.review_outcome.is_some() + && !user.scopes.contains(Scopes::MODERATION_WRITE) + { + return Err(ApiError::Auth(anyhow!( + "only moderators may change review outcomes" + ))); + } + if project_item.inner.in_review + && (new_project.review_outcome.is_some() + || new_project.in_review == Some(false)) + && user.scopes.contains(Scopes::MODERATION_WRITE) + && !user.scopes.contains(Scopes::ADMIN_WRITE) + && let Some(lock) = + DBModerationLock::get_with_user(project_item.inner.id, &pool) + .await + .internal_context("fetching moderation lock from database")? + && lock.moderator_id != db_ids::DBUserId::from(user.user.id) + && !lock.expired + { + return Err(ApiError::Auth(anyhow!( + "project is currently being moderated by {}", + lock.moderator_username + ))); + } + let old_status = mutation::legacy_status( + project_item.inner.visibility, + project_item.inner.in_review, + project_item.inner.review_outcome, + ); + if let Some(visibility) = new_project.visibility { + sqlx::query!( + "UPDATE mods SET visibility = $1 WHERE id = $2", + visibility.as_str(), + id as db_ids::DBProjectId + ) + .execute(&mut transaction) + .await + .internal_context("updating project visibility")?; + if project_item.inner.visibility != visibility { + db_models::DBProject::record_history( + id, + Some(user.user.id.into()), + ProjectDelta::ChangeVisibility { + from: project_item.inner.visibility, + to: visibility, + }, &mut transaction, ) .await - .internal_context("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 - .internal_context("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(anyhow!( - "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 - .internal_context("fetching moderation lock from database")? - && lock.moderator_id != db_ids::DBUserId::from(user.user.id) - && !lock.expired - { - return Err(ApiError::Auth(anyhow!(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 - .internal_context( - "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)) - .internal_context( - "serializing project approval reason", - )?; - sqlx::query!( - " + .internal_context("recording project visibility change")?; + } + project_item.inner.visibility = visibility; + } + if let Some(outcome) = new_project.review_outcome { + let new_status = mutation::legacy_status( + project_item.inner.visibility, + false, + outcome, + ); + if outcome == ProjectReviewOutcome::Approved + && !project_item.inner.is_approved() + { + let reason = + serde_json::to_value(ApprovalReason::ByUser(user.user.id)) + .internal_context("serializing project approval reason")?; + sqlx::query!( + " UPDATE mods SET approved_because = CASE WHEN approved IS NULL THEN $2::jsonb @@ -748,51 +848,20 @@ pub async fn project_edit_internal( initial_queued = NULL WHERE id = $1 ", - id as db_ids::DBProjectId, - reason, - ) - .execute(&mut transaction) - .await - .internal_context( - "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 - .internal_context( - "querying database for `project_edit_internal`", - )?; - } + id as db_ids::DBProjectId, + reason, + ) + .execute(&mut transaction) + .await + .internal_context( + "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( + 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, @@ -804,141 +873,156 @@ pub async fn project_edit_internal( ENV.SITE_URL, user.user.username, user.user.username, - &project_item.inner.status.as_friendly_str(), - status.as_friendly_str(), + old_status.as_friendly_str(), + new_status.as_friendly_str(), ) .to_string(), ), ) .await .ok(); - } + } - if team_member.as_ref().is_none_or(|x| !x.accepted) { - let notified_members = sqlx::query!( - " + sqlx::query!( + r#"UPDATE mods SET review_outcome = $1, in_review = FALSE WHERE id = $2"#, + outcome.as_str(), + id as db_ids::DBProjectId, + ) + .execute(&mut transaction) + .await + .internal_context("updating project review outcome")?; + if project_item.inner.review_outcome != outcome { + db_models::DBProject::record_history( + id, + Some(user.user.id.into()), + ProjectDelta::ChangeReviewOutcome { + from: project_item.inner.review_outcome, + to: outcome, + reason: Some(ReviewOutcomeReason::ByUser { + reason: new_project.review_reason.clone(), + }), + }, + &mut transaction, + ) + .await + .internal_context("recording project review outcome change")?; + } + project_item.inner.review_outcome = outcome; + project_item.inner.in_review = false; + } + if new_project.in_review == Some(false) + && new_project.review_outcome.is_none() + { + sqlx::query!( + "UPDATE mods SET in_review = FALSE WHERE id = $1", + id as db_ids::DBProjectId + ) + .execute(&mut transaction) + .await + .internal_context("canceling project review")?; + project_item.inner.in_review = false; + } + + if project_item.inner.is_searchable() + && !originally_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 + .internal_context("querying database for `project_edit_internal`")?; + } + + let new_status = mutation::legacy_status( + project_item.inner.visibility, + project_item.inner.in_review, + project_item.inner.review_outcome, + ); + if old_status != new_status && !submit_for_review { + 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 - .internal_context("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 - .internal_context( - "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 - .internal_context( - "inserting database records for `project_edit_internal`", - )?; - } + project_item.inner.team_id as db_ids::DBTeamId + ) + .fetch(&mut transaction) + .map_ok(|c| db_models::DBUserId(c.id)) + .try_collect::>() + .await + .internal_context("fetching notified members from database")?; - ThreadMessageBuilder { - author_id: Some(user.user.id.into()), - body: MessageBody::StatusChange { - new_status: *status, - old_status: project_item.inner.status, + NotificationBuilder { + body: NotificationBody::StatusChange { + project_id: project_item.inner.id.into(), + old_status, + new_status, }, - thread_id: project_item.thread_id, - hide_identity: user.scopes.contains(Scopes::MODERATION_WRITE), } - .insert(&mut transaction) + .insert_many(notified_members.clone(), &mut transaction, &redis) .await .internal_context( "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) + NotificationBuilder { + body: if new_project.review_outcome + == Some(ProjectReviewOutcome::Approved) + { + NotificationBody::ProjectStatusApproved { + project_id: project_item.inner.id.into(), + } + } else { + NotificationBody::ProjectStatusNeutral { + project_id: project_item.inner.id.into(), + old_status, + new_status, + } + }, + } + .insert_many(notified_members, &mut transaction, &redis) .await .internal_context( - "querying database for `project_edit_internal`", + "inserting database records 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 - .internal_context("failed to remove archival disclosure")?; - } - } - } - - if let Some(requested_status) = &new_project.requested_status { - if !perms.contains(ProjectPermissions::EDIT_DETAILS) { - return Err(ApiError::Auth(anyhow!( - "You do not have the permissions to edit the requested status of this project!", - ))); } - if !requested_status - .map(|x| x.can_be_requested()) - .unwrap_or(true) - { - return Err(ApiError::Request(anyhow!(String::from( - "Specified status cannot be requested!", - )))); + ThreadMessageBuilder { + author_id: Some(user.user.id.into()), + body: MessageBody::StatusChange { + new_status, + old_status, + }, + thread_id: project_item.thread_id, + hide_identity: user.scopes.contains(Scopes::MODERATION_WRITE), } - - sqlx::query!( - " - UPDATE mods - SET requested_status = $1 - WHERE (id = $2) - ", - requested_status.map(|x| x.as_str()), - id as db_ids::DBProjectId, - ) - .execute(&mut transaction) + .insert(&mut transaction) .await - .internal_context("querying database for `project_edit_internal`")?; + .internal_context( + "inserting database records for `project_edit_internal`", + )?; } if perms.contains(ProjectPermissions::EDIT_DETAILS) { @@ -1170,7 +1254,7 @@ pub async fn project_edit_internal( } if let Some(moderation_message) = &new_project.moderation_message { if !user.scopes.contains(Scopes::MODERATION_WRITE) - && (!project_item.inner.status.is_approved() + && (!project_item.inner.is_approved() || moderation_message.is_some()) { return Err(ApiError::Auth(anyhow!( @@ -1195,7 +1279,7 @@ pub async fn project_edit_internal( if let Some(moderation_message_body) = &new_project.moderation_message_body { if !user.scopes.contains(Scopes::MODERATION_WRITE) - && (!project_item.inner.status.is_approved() + && (!project_item.inner.is_approved() || moderation_message_body.is_some()) { return Err(ApiError::Auth(anyhow!( @@ -1393,15 +1477,6 @@ pub async fn project_edit_internal( let mut reindex_versions = new_project.categories.is_some() || new_project.additional_categories.is_some(); - let became_searchable = !project_item.inner.status.is_searchable() - && new_project - .status - .is_some_and(|status| status.is_searchable()); - let became_unsearchable = project_item.inner.status.is_searchable() - && new_project - .status - .is_some_and(|status| !status.is_searchable()); - reindex_versions |= update( &mut transaction, id, @@ -1485,12 +1560,30 @@ pub async fn project_edit_internal( .await .api_context("deleting unused images")?; + if original_in_review != project_item.inner.in_review { + db_models::DBProject::record_history( + id, + Some(user.user.id.into()), + ProjectDelta::ChangeInReview { + from: original_in_review, + to: project_item.inner.in_review, + }, + &mut transaction, + ) + .await + .internal_context("recording project review queue change")?; + } + 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, + sync_archival_disclosure + || new_project.status + == Some( + crate::models::v2::projects::ProjectStatus::Processing, + ), &mut transaction, &pool, &redis, @@ -1498,9 +1591,10 @@ pub async fn project_edit_internal( .await?; } - mutation::finalize_project_edit( + let finally_searchable = mutation::finalize_project_edit( id, - project_item.inner.status, + original_in_review, + original_review_outcome, project_item.inner.slug.clone(), submit_for_review, transaction, @@ -1510,6 +1604,9 @@ pub async fn project_edit_internal( ) .await?; + let became_searchable = !originally_searchable && finally_searchable; + let became_unsearchable = originally_searchable && !finally_searchable; + for version in &edited_versions { db_models::DBVersion::clear_cache(version, &redis) .await @@ -1618,26 +1715,31 @@ async fn submit_project_for_review( .await .internal_context("querying database for `project_edit_internal`")?; - if state.status().is_approved() - || !user.scopes.contains(Scopes::MODERATION_WRITE) - && matches!( - state.status(), - ProjectStatus::Rejected | ProjectStatus::Withheld + if state.review_outcome() == ProjectReviewOutcome::Approved + && project.inner.review_outcome != ProjectReviewOutcome::Approved + { + return Ok(true); + } + + if !user.scopes.contains(Scopes::MODERATION_WRITE) + && matches!( + state.review_outcome(), + ProjectReviewOutcome::Rejected | ProjectReviewOutcome::Withheld + ) + && state + .try_auto_approve( + AutoApprovalCause::Resubmission { + user_id: user.user.id, + }, + transaction, + redis, ) - && state - .try_auto_approve( - AutoApprovalCause::Resubmission { - user_id: user.user.id, - }, - transaction, - redis, - ) - .await? + .await? { return Ok(true); } - let new_status = ProjectStatus::Processing; + let new_status = LegacyProjectStatus::Processing; if notify_team_members { let notified_members = sqlx::query!( " @@ -1656,7 +1758,11 @@ async fn submit_project_for_review( NotificationBuilder { body: NotificationBody::StatusChange { project_id: project.inner.id.into(), - old_status: project.inner.status, + old_status: mutation::legacy_status( + project.inner.visibility, + project.inner.in_review, + project.inner.review_outcome, + ), new_status, }, } @@ -1669,7 +1775,11 @@ async fn submit_project_for_review( NotificationBuilder { body: NotificationBody::ProjectStatusNeutral { project_id: project.inner.id.into(), - old_status: project.inner.status, + old_status: mutation::legacy_status( + project.inner.visibility, + project.inner.in_review, + project.inner.review_outcome, + ), new_status, }, } @@ -1684,7 +1794,11 @@ async fn submit_project_for_review( author_id: Some(user.user.id.into()), body: MessageBody::StatusChange { new_status, - old_status: project.inner.status, + old_status: mutation::legacy_status( + project.inner.visibility, + project.inner.in_review, + project.inner.review_outcome, + ), }, thread_id: project.thread_id, hide_identity: false, @@ -1698,16 +1812,29 @@ async fn submit_project_for_review( sqlx::query!( " UPDATE mods - SET status = $1 - WHERE (id = $2) + SET in_review = TRUE + WHERE (id = $1) ", - new_status.as_str(), project.inner.id as db_ids::DBProjectId, ) .execute(&mut *transaction) .await .internal_context("querying database for `project_edit_internal`")?; + if !state.in_review() { + db_models::DBProject::record_history( + project.inner.id, + Some(user.user.id.into()), + ProjectDelta::ChangeInReview { + from: false, + to: true, + }, + transaction, + ) + .await + .internal_context("recording project review submission")?; + } + Ok(false) } @@ -2219,7 +2346,7 @@ pub async fn projects_edit( project.inner.name )))); } - } else if project.inner.status.is_hidden() { + } else if project.inner.is_hidden() { return Err(ApiError::Request(anyhow!(format!( "Project {} not found", ProjectId(project.inner.id.0 as u64) @@ -2329,7 +2456,7 @@ pub async fn projects_edit( } if !user.scopes.contains(Scopes::MODERATION_WRITE) - && project.inner.status == ProjectStatus::Processing + && project.inner.in_review { validate::ensure_project_is_valid_for_review( project.inner.id, @@ -3000,7 +3127,7 @@ pub async fn add_gallery_item_internal( .internal_context("inserting galleries into database")?; let validation_error = if !user.scopes.contains(Scopes::MODERATION_WRITE) - && project_item.inner.status == ProjectStatus::Processing + && project_item.inner.in_review { validate::ensure_project_is_valid_for_review( project_item.inner.id, @@ -3539,7 +3666,7 @@ pub async fn project_delete_internal( .internal_context("failed to start transaction")?; let locked_project = sqlx::query!( r#" - SELECT status, slug + SELECT visibility, in_review, review_outcome, slug FROM mods WHERE id = $1 FOR UPDATE @@ -3549,10 +3676,12 @@ pub async fn project_delete_internal( .fetch_one(&mut transaction) .await .internal_context("locking project for deletion")?; - let original_status = ProjectStatus::from_string(&locked_project.status); + let original_review_outcome = + ProjectReviewOutcome::from_string(&locked_project.review_outcome); + let original_in_review = locked_project.in_review; let original_slug = locked_project.slug; - if original_status.is_approved() { + if original_review_outcome == ProjectReviewOutcome::Approved { crate::auth::validate::require_privileged_token( &req, &mut transaction, @@ -3572,8 +3701,8 @@ pub async fn project_delete_internal( // rejected & withheld projects are transferred to ghost so moderation data is preserved if matches!( - original_status, - ProjectStatus::Rejected | ProjectStatus::Withheld + original_review_outcome, + ProjectReviewOutcome::Rejected | ProjectReviewOutcome::Withheld ) { let deleted_user: db_ids::DBUserId = DELETED_USER.into(); @@ -3615,7 +3744,7 @@ pub async fn project_delete_internal( sqlx::query!( " UPDATE mods - SET organization_id = NULL, slug = COALESCE($1, slug) + SET organization_id = NULL, slug = COALESCE($1, slug), in_review = FALSE WHERE id = $2 ", deleted_slug, @@ -3703,9 +3832,19 @@ pub async fn project_delete_internal( .await .internal_context("failed to delete project followers")?; + db_models::DBProject::record_history( + project.inner.id, + Some(user.user.id.into()), + ProjectDelta::Deleted, + &mut transaction, + ) + .await + .internal_context("recording project deletion")?; + mutation::finalize_project_edit( project.inner.id, - original_status, + original_in_review, + original_review_outcome, original_slug, false, transaction, @@ -3761,6 +3900,7 @@ pub async fn project_delete_internal( project.inner.id, &mut transaction, &redis, + Some(user.user.id.into()), ) .await .internal_context("failed to remove project")?; @@ -4128,3 +4268,91 @@ pub async fn project_get_organization( Err(ApiError::NotFound(anyhow!("resource not found"))) } } + +#[cfg(test)] +mod legacy_state_tests { + use super::*; + + fn edit(value: serde_json::Value) -> EditProject { + serde_json::from_value(value).unwrap() + } + + #[test] + fn requested_status_changes_visibility_without_changing_review_state() { + let mut request = + edit(serde_json::json!({"requested_status": "private"})); + request.apply_legacy_state(false).unwrap(); + assert_eq!(request.visibility, Some(ProjectVisibility::Private)); + assert_eq!(request.in_review, None); + assert_eq!(request.review_outcome, None); + } + + #[test] + fn requested_status_sets_draft_preference_without_approval() { + let mut request = + edit(serde_json::json!({"requested_status": "unlisted"})); + request.apply_legacy_state(false).unwrap(); + assert_eq!(request.visibility, Some(ProjectVisibility::Unlisted)); + assert_eq!(request.review_outcome, None); + assert_eq!(request.in_review, None); + } + + #[test] + fn moderator_processing_resets_outcome_without_changing_visibility() { + let mut request = edit(serde_json::json!({"status": "processing"})); + request.apply_legacy_state(true).unwrap(); + assert_eq!(request.in_review, Some(true)); + assert_eq!(request.visibility, None); + assert_eq!( + request.review_outcome, + Some(ProjectReviewOutcome::NeverReviewed) + ); + } + + #[test] + fn owner_processing_preserves_outcome_and_visibility() { + let mut request = edit(serde_json::json!({"status": "processing"})); + request.apply_legacy_state(false).unwrap(); + assert_eq!(request.in_review, Some(true)); + assert_eq!(request.visibility, None); + assert_eq!(request.review_outcome, None); + } + + #[test] + fn moderator_draft_resets_outcome() { + let mut request = edit(serde_json::json!({"status": "draft"})); + request.apply_legacy_state(true).unwrap(); + assert_eq!(request.in_review, Some(false)); + assert_eq!( + request.review_outcome, + Some(ProjectReviewOutcome::NeverReviewed) + ); + } + + #[test] + fn moderator_approval_maps_visibility_and_outcome() { + let mut request = edit(serde_json::json!({"status": "private"})); + request.apply_legacy_state(true).unwrap(); + assert_eq!(request.visibility, Some(ProjectVisibility::Private)); + assert_eq!( + request.review_outcome, + Some(ProjectReviewOutcome::Approved) + ); + assert_eq!(request.in_review, Some(false)); + } + + #[test] + fn canonical_and_legacy_state_cannot_be_mixed() { + let mut request = edit( + serde_json::json!({"status": "processing", "visibility": "public"}), + ); + assert!(request.apply_legacy_state(false).is_err()); + } + + #[test] + fn null_requested_status_is_a_noop() { + let mut request = edit(serde_json::json!({"requested_status": null})); + request.apply_legacy_state(false).unwrap(); + assert_eq!(request.visibility, None); + } +} diff --git a/apps/labrinth/src/routes/v3/projects/mutation.rs b/apps/labrinth/src/routes/v3/projects/mutation.rs index c55fca97f54..a62ea7bd107 100644 --- a/apps/labrinth/src/routes/v3/projects/mutation.rs +++ b/apps/labrinth/src/routes/v3/projects/mutation.rs @@ -14,8 +14,9 @@ use crate::models::ids::ProjectId; use crate::models::notifications::NotificationBody; use crate::models::pats::Scopes; use crate::models::projects::{ - ApprovalProvenance, ApprovalReason, AutoApprovalCause, Project, - ProjectStatus, Version, + ApprovalProvenance, ApprovalReason, AutoApprovalCause, LegacyProjectStatus, + Project, ProjectDelta, ProjectReviewOutcome, ProjectVisibility, + ReviewOutcomeReason, Version, }; use crate::models::thread_issues::{ ThreadIssueContext, ThreadIssueTarget, ThreadIssueTeamMember, @@ -29,6 +30,26 @@ use crate::validate::project::{ ProjectNagSeverity, validate_with_context as validate_project, }; +pub(crate) fn legacy_status( + visibility: ProjectVisibility, + in_review: bool, + review_outcome: ProjectReviewOutcome, +) -> LegacyProjectStatus { + if in_review { + return LegacyProjectStatus::Processing; + } + match review_outcome { + ProjectReviewOutcome::NeverReviewed => LegacyProjectStatus::Draft, + ProjectReviewOutcome::Rejected => LegacyProjectStatus::Rejected, + ProjectReviewOutcome::Withheld => LegacyProjectStatus::Withheld, + ProjectReviewOutcome::Approved => match visibility { + ProjectVisibility::Public => LegacyProjectStatus::Approved, + ProjectVisibility::Unlisted => LegacyProjectStatus::Unlisted, + ProjectVisibility::Private => LegacyProjectStatus::Private, + }, + } +} + pub(crate) struct SyncedProjectState { data: ProjectQueryResult, project: Project, @@ -41,30 +62,22 @@ pub(crate) struct SyncedProjectState { } impl SyncedProjectState { - pub(crate) fn status(&self) -> ProjectStatus { - self.project.status + pub(crate) fn in_review(&self) -> bool { + self.project.in_review + } + + pub(crate) fn review_outcome(&self) -> ProjectReviewOutcome { + self.project.review_outcome } - fn auto_approval_status(&self) -> Option { - if self.has_required_nags - || self.has_outstanding_technical_review - || self.thread_issues.is_empty() - || self + fn can_auto_approve(&self) -> bool { + !self.has_required_nags + && !self.has_outstanding_technical_review + && !self.thread_issues.is_empty() + && self .thread_issues .iter() - .any(|issue| issue.verdict != ThreadIssueVerdict::Resolved) - { - return None; - } - - Some( - self.project - .requested_status - .filter(|status| { - status.is_approved() && status.can_be_requested() - }) - .unwrap_or(ProjectStatus::Approved), - ) + .all(|issue| issue.verdict == ThreadIssueVerdict::Resolved) } async fn verify_facets( @@ -90,13 +103,22 @@ impl SyncedProjectState { transaction: &mut PgTransaction<'_>, redis: &RedisPool, ) -> Result { - let Some(new_status) = self.auto_approval_status() else { + if !self.can_auto_approve() { return Ok(false); }; - let old_status = self.project.status; + let old_status = legacy_status( + self.project.visibility, + self.project.in_review, + self.project.review_outcome, + ); + let new_status = legacy_status( + self.project.visibility, + false, + ProjectReviewOutcome::Approved, + ); let provenance = ApprovalProvenance { trigger: cause, - previous_status: old_status, + resolved_issue_ids: self .thread_issues .iter() @@ -110,7 +132,9 @@ impl SyncedProjectState { sqlx::query!( r#" UPDATE mods - SET status = $1, + SET review_outcome = $1, + in_review = FALSE, + initial_queued = NULL, approved_because = CASE WHEN approved IS NULL THEN $3::jsonb ELSE approved_because @@ -118,7 +142,7 @@ impl SyncedProjectState { approved = COALESCE(approved, NOW()) WHERE id = $2 "#, - new_status.as_str(), + ProjectReviewOutcome::Approved.as_str(), self.data.inner.id as DBProjectId, reason, ) @@ -126,6 +150,37 @@ impl SyncedProjectState { .await .internal_context("auto-approving project")?; + if self.project.review_outcome != ProjectReviewOutcome::Approved { + db_models::DBProject::record_history( + self.data.inner.id, + None, + ProjectDelta::ChangeReviewOutcome { + from: self.project.review_outcome, + to: ProjectReviewOutcome::Approved, + reason: Some(ReviewOutcomeReason::Auto { + provenance: provenance.clone(), + }), + }, + transaction, + ) + .await + .internal_context("recording project auto-approval history")?; + } + + if self.project.in_review { + db_models::DBProject::record_history( + self.data.inner.id, + None, + ProjectDelta::ChangeInReview { + from: true, + to: false, + }, + transaction, + ) + .await + .internal_context("recording project auto-approval queue change")?; + } + self.verify_facets(transaction).await?; ThreadMessageBuilder { @@ -173,8 +228,10 @@ impl SyncedProjectState { .internal_context("notifying project team of auto-approval")?; } - self.data.inner.status = new_status; - self.project.status = new_status; + self.data.inner.review_outcome = ProjectReviewOutcome::Approved; + self.data.inner.in_review = false; + self.project.review_outcome = ProjectReviewOutcome::Approved; + self.project.in_review = false; Ok(true) } @@ -219,9 +276,7 @@ pub(crate) async fn sync_project_state( redis, ) .await?; - if exited_projects.contains(&project_id) - && state.status() == ProjectStatus::Processing - { + if exited_projects.contains(&project_id) && state.in_review() { state .try_auto_approve( AutoApprovalCause::TechnicalReviewNoDetails, @@ -458,7 +513,7 @@ pub(crate) async fn prepare_technical_review_exits( for project_id in project_ids { let mut state = load_project_state(project_id, transaction, pool, redis).await?; - if state.status() == ProjectStatus::Processing { + if state.in_review() { state .try_auto_approve(cause.clone(), transaction, redis) .await?; @@ -495,9 +550,7 @@ pub(crate) async fn prepare_mutations( redis, ) .await?; - if exited_projects.contains(&project_id) - && state.status() == ProjectStatus::Processing - { + if exited_projects.contains(&project_id) && state.in_review() { state .try_auto_approve( AutoApprovalCause::TechnicalReviewNoDetails, @@ -513,9 +566,7 @@ pub(crate) async fn prepare_mutations( .is_some_and(|user| !user.scopes.contains(Scopes::MODERATION_WRITE)) { for state in &states { - if state.project.status == ProjectStatus::Processing - && state.has_required_nags - { + if state.project.in_review && state.has_required_nags { return Err(ApiError::Request(anyhow!( "project cannot have required validation nags while in review" ))); @@ -554,25 +605,25 @@ impl PreparedMutations { pub(crate) async fn finalize_project_edit( project_id: DBProjectId, - original_status: ProjectStatus, + original_in_review: bool, + original_review_outcome: ProjectReviewOutcome, original_slug: Option, submit_for_review: bool, mut transaction: PgTransaction<'_>, pool: &PgPool, redis: &RedisPool, project_editor: Option<&UserWithScopes>, -) -> Result<(), ApiError> { +) -> Result { let state = sync_project_state(project_id, &mut transaction, pool, redis).await?; - let entered_review = state.project.status == ProjectStatus::Processing - && original_status != ProjectStatus::Processing; - let entered_approved_state = - state.project.status.is_approved() && !original_status.is_approved(); + let entered_review = state.project.in_review && !original_in_review; + let entered_approved_state = state.project.is_approved() + && original_review_outcome != ProjectReviewOutcome::Approved; let validate_review_state = entered_review || submit_for_review; - if (state.project.status == ProjectStatus::Processing + if (state.project.in_review || validate_review_state || entered_approved_state) && !project_editor @@ -636,7 +687,7 @@ pub(crate) async fn finalize_project_edit( .internal_context("clearing previous project slug cache")?; } - Ok(()) + Ok(state.project.is_searchable()) } #[cfg(test)] @@ -646,6 +697,46 @@ mod tests { use ariadne::ids::UserId; use serde_json::json; + #[test] + fn historical_status_preserves_private_and_unlisted_approvals() { + for (visibility, expected) in [ + (ProjectVisibility::Private, LegacyProjectStatus::Private), + (ProjectVisibility::Unlisted, LegacyProjectStatus::Unlisted), + (ProjectVisibility::Public, LegacyProjectStatus::Approved), + ] { + assert_eq!( + legacy_status( + visibility, + false, + ProjectReviewOutcome::Approved + ), + expected + ); + } + } + + #[test] + fn historical_review_status_does_not_replace_the_review_outcome() { + for outcome in [ + ProjectReviewOutcome::NeverReviewed, + ProjectReviewOutcome::Rejected, + ProjectReviewOutcome::Withheld, + ] { + assert_eq!( + legacy_status(ProjectVisibility::Public, true, outcome), + LegacyProjectStatus::Processing + ); + } + assert_eq!( + legacy_status( + ProjectVisibility::Public, + false, + ProjectReviewOutcome::Withheld + ), + LegacyProjectStatus::Withheld + ); + } + #[test] fn historical_auto_approval_message_has_no_provenance() { let value = json!({ @@ -669,15 +760,15 @@ mod tests { fn thread_and_database_share_approval_provenance() { let provenance = ApprovalProvenance { trigger: AutoApprovalCause::Resubmission { user_id: UserId(1) }, - previous_status: ProjectStatus::Rejected, + resolved_issue_ids: vec![ThreadIssueId(2)], }; let reason = serde_json::to_value(ApprovalReason::Auto(provenance.clone())) .unwrap(); let message = MessageBody::AutoApproval { - old_status: ProjectStatus::Rejected, - new_status: ProjectStatus::Approved, + old_status: LegacyProjectStatus::Rejected, + new_status: LegacyProjectStatus::Approved, provenance: Some(provenance), }; let value = serde_json::to_value(message).unwrap(); @@ -701,7 +792,7 @@ mod tests { trigger: AutoApprovalCause::ModeratorTechnicalReviewPass { user_id: UserId(1), }, - previous_status: ProjectStatus::Processing, + resolved_issue_ids: vec![ThreadIssueId(2)], }); assert_eq!( @@ -709,10 +800,10 @@ mod tests { json!({ "Auto": { "trigger": { - "type": "moderator_technical_review_pass", + "kind": "moderator_technical_review_pass", "user_id": "1" }, - "previous_status": "processing", + "resolved_issue_ids": ["2"] } }), diff --git a/apps/labrinth/src/routes/v3/statistics.rs b/apps/labrinth/src/routes/v3/statistics.rs index 0a5dee0f632..db2599a14b9 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 = 'public' AND review_outcome = '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 = 'public' AND m.review_outcome = '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 = 'public' AND m.review_outcome = '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 = 'public' AND m.review_outcome = '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 ed1e2fed5a5..5e22ae938a8 100644 --- a/apps/labrinth/src/routes/v3/threads.rs +++ b/apps/labrinth/src/routes/v3/threads.rs @@ -13,7 +13,6 @@ use crate::models::ids::{ use crate::models::images::{Image, ImageContext}; use crate::models::notifications::NotificationBody; use crate::models::pats::Scopes; -use crate::models::projects::ProjectStatus; use crate::models::thread_issues::{ ThreadIssueAcknowledgement, ThreadIssueTarget, }; @@ -992,7 +991,7 @@ pub async fn thread_send_message_internal( .internal_context("fetching thread project")?; if let Some(project) = project - && project.inner.status != ProjectStatus::Processing + && !project.inner.in_review && user.scopes.contains(Scopes::MODERATION_WRITE) && !is_private { diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs index 97e927c3ead..c7ce80112f9 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; use anyhow::anyhow; @@ -596,15 +596,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 ( @@ -648,7 +648,7 @@ 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.visibility IN ('public', 'unlisted') AND m.review_outcome IN ('approved', 'withheld'))) "#, &files.iter().map(|x| x.project_id.0).collect::>(), &update_data.game_versions.clone().unwrap_or_default(), @@ -664,10 +664,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 58d82f96dc1..d20cab4d87f 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( ) -> anyhow::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 = 'public' AND m.review_outcome = '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>, ) -> anyhow::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 = 'public' AND m.review_outcome = '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>, ) -> anyhow::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 = 'public' AND m.review_outcome = 'approved' ", &project_ids, - &searchable_statuses, ) .fetch(pool) .try_fold( diff --git a/apps/labrinth/src/test/api_common/models.rs b/apps/labrinth/src/test/api_common/models.rs index 0dbc696a62e..6b4cac97820 100644 --- a/apps/labrinth/src/test/api_common/models.rs +++ b/apps/labrinth/src/test/api_common/models.rs @@ -6,8 +6,8 @@ use crate::{ auth::AuthProvider, models::{ projects::{ - Dependency, GalleryItem, License, ModeratorMessage, - MonetizationStatus, ProjectStatus, VersionFile, VersionStatus, + Dependency, GalleryItem, LegacyProjectStatus, License, + ModeratorMessage, MonetizationStatus, VersionFile, VersionStatus, VersionType, }, teams::ProjectPermissions, @@ -44,8 +44,8 @@ pub struct CommonProject { pub updated: DateTime, pub approved: Option>, pub queued: Option>, - pub status: ProjectStatus, - pub requested_status: Option, + pub status: LegacyProjectStatus, + pub requested_status: Option, pub moderator_message: Option, pub license: License, pub downloads: u32, @@ -61,6 +61,7 @@ pub struct CommonProject { pub thread_id: ThreadId, pub monetization_status: MonetizationStatus, } + #[derive(Deserialize, Clone)] pub struct CommonVersion { pub id: VersionId, @@ -197,8 +198,8 @@ pub enum CommonMessageBody { associated_images: Vec, }, StatusChange { - new_status: ProjectStatus, - old_status: ProjectStatus, + new_status: LegacyProjectStatus, + old_status: LegacyProjectStatus, }, ThreadClosure, ThreadReopen, diff --git a/apps/labrinth/src/test/api_v3/project.rs b/apps/labrinth/src/test/api_v3/project.rs index 26695b204c7..992758a2dbc 100644 --- a/apps/labrinth/src/test/api_v3/project.rs +++ b/apps/labrinth/src/test/api_v3/project.rs @@ -54,7 +54,8 @@ impl ApiProject for ApiV3 { .append_pat(ADMIN_USER_PAT) .set_json(json!( { - "status": "approved" + "review_outcome": "approved", + "in_review": false } )) .to_request(); diff --git a/apps/labrinth/src/test/api_v3/request_data.rs b/apps/labrinth/src/test/api_v3/request_data.rs index 4d6c28780d6..96371043bd4 100644 --- a/apps/labrinth/src/test/api_v3/request_data.rs +++ b/apps/labrinth/src/test/api_v3/request_data.rs @@ -102,6 +102,7 @@ pub fn get_public_project_creation_data_json( "description": "This project is approved and its versions are listed. It contains enough descriptive information to satisfy project review validation requirements and explain what the project provides to its users.", "initial_versions": initial_versions, "is_draft": true, + "visibility": "public", "categories": [], "license_id": "MIT", } diff --git a/apps/labrinth/src/test/dummy_data.rs b/apps/labrinth/src/test/dummy_data.rs index 573fa5fd8bc..eb0a22d7ad3 100644 --- a/apps/labrinth/src/test/dummy_data.rs +++ b/apps/labrinth/src/test/dummy_data.rs @@ -438,8 +438,7 @@ pub async fn add_project_beta(api: &ApiV3) -> (Project, Version) { { "op": "add", "path": "/summary", "value": "A dummy project for testing with." }, { "op": "add", "path": "/description", "value": "This project is not yet approved, but it contains enough descriptive information to satisfy project review validation requirements while remaining available for testing private project behavior." }, { "op": "add", "path": "/initial_versions/0/status", "value": "unlisted" }, - { "op": "add", "path": "/status", "value": "private" }, - { "op": "add", "path": "/requested_status", "value": "private" }, + { "op": "add", "path": "/visibility", "value": "private" }, ])) .unwrap(); @@ -452,7 +451,7 @@ pub async fn add_project_beta(api: &ApiV3) -> (Project, Version) { assert_status!(&resp, StatusCode::OK); let resp = api - .edit_project("beta", json!({ "status": "processing" }), ADMIN_USER_PAT) + .edit_project("beta", json!({ "in_review": true }), ADMIN_USER_PAT) .await; assert_status!(&resp, StatusCode::NO_CONTENT); diff --git a/apps/labrinth/src/test/search.rs b/apps/labrinth/src/test/search.rs index 0f9d0a30264..6860e42c32a 100644 --- a/apps/labrinth/src/test/search.rs +++ b/apps/labrinth/src/test/search.rs @@ -47,7 +47,7 @@ pub async fn setup_search_projects( .edit_project( &project.id.to_string(), json!({ - "status": "approved" + "review_outcome": "approved", "in_review": false }), MOD_USER_PAT, ) diff --git a/apps/labrinth/src/validate/project/moderation.rs b/apps/labrinth/src/validate/project/moderation.rs index 8f4774a61a0..f144c9c19f5 100644 --- a/apps/labrinth/src/validate/project/moderation.rs +++ b/apps/labrinth/src/validate/project/moderation.rs @@ -1,4 +1,4 @@ -use crate::models::projects::ProjectStatus; +use crate::models::projects::ProjectReviewOutcome; use super::{ProjectNag, ProjectNagKind, ProjectNagSeverity}; @@ -6,8 +6,8 @@ pub(super) fn validate( project: &crate::models::projects::Project, ) -> Vec { if matches!( - project.status, - ProjectStatus::Rejected | ProjectStatus::Withheld + project.review_outcome, + ProjectReviewOutcome::Rejected | ProjectReviewOutcome::Withheld ) { vec![ProjectNag::new( ProjectNagKind::ModeratorFeedback, diff --git a/apps/labrinth/tests/moderation_lock.rs b/apps/labrinth/tests/moderation_lock.rs index 3d79dc5ce68..be0fea00155 100644 --- a/apps/labrinth/tests/moderation_lock.rs +++ b/apps/labrinth/tests/moderation_lock.rs @@ -16,21 +16,18 @@ 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. +/// Queue a project for review directly in the database. +/// Clears the Redis project row so `DBProject::get` used by PATCH sees the new state. 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"); + sqlx::query!("UPDATE mods SET in_review = TRUE WHERE id = $1", project_id) + .execute(pool) + .await + .expect("failed to set project to processing status"); DBProject::clear_cache( DBProjectId(project_id), @@ -788,7 +785,7 @@ async fn test_complete_review_without_lock_succeeds() { 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" })) + .set_json(json!({ "review_outcome": "approved", "in_review": false })) .to_request(); let resp = api.call(req).await; @@ -833,7 +830,9 @@ async fn test_complete_review_blocked_when_other_holds_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" })) + .set_json( + json!({ "review_outcome": "approved", "in_review": false }), + ) .to_request(); let resp = api.call(req).await; @@ -881,7 +880,7 @@ async fn test_complete_review_succeeds_when_other_lock_expired() { 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" })) + .set_json(json!({ "review_outcome": "approved", "in_review": false })) .to_request(); let resp = api.call(req).await; @@ -925,7 +924,9 @@ async fn test_complete_review_with_lock_succeeds() { 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" })) + .set_json( + json!({ "review_outcome": "approved", "in_review": false }), + ) .to_request(); let resp = api.call(req).await; @@ -951,7 +952,7 @@ async fn test_non_processing_status_change_does_not_require_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": "unlisted" })) + .set_json(json!({ "visibility": "unlisted" })) .to_request(); let resp = api.call(req).await; @@ -987,7 +988,9 @@ async fn test_admin_can_complete_without_lock() { 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" })) + .set_json( + json!({ "review_outcome": "approved", "in_review": false }), + ) .to_request(); let resp = api.call(req).await; diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs index 6c5fbba490d..4e024b1ebba 100644 --- a/apps/labrinth/tests/project.rs +++ b/apps/labrinth/tests/project.rs @@ -27,7 +27,7 @@ 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::LegacyProjectStatus; use labrinth::models::teams::ProjectPermissions; use labrinth::routes::PROJECT_REDIRECTS_NAMESPACE; use labrinth::test::pats::create_test_pat; @@ -38,6 +38,303 @@ use xredis::RedisValue; pub mod common; +fn legacy_project_status( + project: &labrinth::models::projects::Project, +) -> LegacyProjectStatus { + serde_json::from_value( + serde_json::to_value( + labrinth::models::v2::projects::ProjectStatus::from_project( + project, + ), + ) + .unwrap(), + ) + .unwrap() +} + +#[actix_rt::test] +async fn project_history_requires_moderation_read() { + with_test_environment(None, |env: TestEnvironment| async move { + let project_id = &env.dummy.project_alpha.project_id; + let moderator_read = create_test_pat( + Scopes::MODERATION_READ, + MOD_USER_ID_PARSED, + &env.db, + ) + .await; + let moderator_without_read = + create_test_pat(Scopes::PROJECT_READ, MOD_USER_ID_PARSED, &env.db) + .await; + let owner_read = create_test_pat( + Scopes::MODERATION_READ, + USER_USER_ID_PARSED, + &env.db, + ) + .await; + + for pat in [ + None, + USER_USER_PAT, + Some(owner_read.as_str()), + Some(moderator_without_read.as_str()), + ] { + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{project_id}/history")) + .append_pat(pat) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::UNAUTHORIZED); + } + + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{project_id}/history")) + .append_pat(Some(moderator_read.as_str())) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::OK); + }) + .await; +} + +#[actix_rt::test] +async fn project_history_records_review_submission_and_cancellation() { + use labrinth::database::models::DBUserId; + use labrinth::models::projects::{ProjectDelta, ProjectHistoryEntry}; + + with_test_environment(None, |env: TestEnvironment| async move { + let project_id = &env.dummy.project_alpha.project_id; + let id = DBProjectId(parse_base62(project_id).unwrap() as i64); + let response = env + .api + .call( + test::TestRequest::patch() + .uri(&format!("/v3/project/{project_id}")) + .append_pat(ADMIN_USER_PAT) + .set_json(json!({ + "in_review": false, + "review_outcome": "never_reviewed", + })) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + + sqlx::query!( + r#"DELETE FROM project_history WHERE project_id = $1"#, + id as DBProjectId, + ) + .execute(&*env.db.pool) + .await + .unwrap(); + + let mut submitted_history = None; + for (in_review, expected_count) in [(true, 1), (true, 1), (false, 2)] { + let response = env + .api + .call( + test::TestRequest::patch() + .uri(&format!("/v3/project/{project_id}")) + .append_pat(ADMIN_USER_PAT) + .set_json(json!({ "in_review": in_review })) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::NO_CONTENT); + + let project = env + .api + .get_project_deserialized(project_id, ADMIN_USER_PAT) + .await; + assert_eq!(project.in_review, in_review); + + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{project_id}/history")) + .append_pat(ADMIN_USER_PAT) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::OK); + let history: Vec = + test::read_body_json(response).await; + assert_eq!(history.len(), expected_count); + assert!(history.iter().all(|entry| { + entry.project_id == id.into() + && entry.done_by + == Some(DBUserId(ADMIN_USER_ID_PARSED).into()) + })); + assert!(matches!( + history[0].delta, + ProjectDelta::ChangeInReview { + from: false, + to: true, + } + )); + let submission = serde_json::to_value(&history[..1]).unwrap(); + if let Some(expected) = &submitted_history { + assert_eq!(&submission, expected); + } else { + submitted_history = Some(submission); + } + if !in_review { + assert!(matches!( + history[1].delta, + ProjectDelta::ChangeInReview { + from: true, + to: false, + } + )); + } + } + }) + .await; +} + +#[actix_rt::test] +async fn project_history_returns_ordered_events_and_survives_deletion() { + use labrinth::database::models::{DBProject, DBUserId}; + use labrinth::models::projects::{ + ProjectDelta, ProjectHistoryEntry, ProjectVisibility, + }; + + with_test_environment(None, |env: TestEnvironment| async move { + let project_id = &env.dummy.project_alpha.project_id; + let project_slug = &env.dummy.project_alpha.project_slug; + let id = DBProjectId(parse_base62(project_id).unwrap() as i64); + sqlx::query!( + r#"DELETE FROM project_history WHERE project_id = $1"#, + id as DBProjectId, + ) + .execute(&*env.db.pool) + .await + .unwrap(); + let moderator_read = create_test_pat( + Scopes::MODERATION_READ, + MOD_USER_ID_PARSED, + &env.db, + ) + .await; + + for reference in [project_id.as_str(), project_slug.as_str()] { + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{reference}/history")) + .append_pat(Some(moderator_read.as_str())) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::OK); + let history: Vec = + test::read_body_json(response).await; + assert!(history.is_empty()); + } + + let mut transaction = env.db.pool.begin().await.unwrap(); + DBProject::record_history( + id, + Some(DBUserId(USER_USER_ID_PARSED)), + ProjectDelta::Created, + &mut transaction, + ) + .await + .unwrap(); + DBProject::record_history( + id, + None, + ProjectDelta::ChangeVisibility { + from: ProjectVisibility::Public, + to: ProjectVisibility::Unlisted, + }, + &mut transaction, + ) + .await + .unwrap(); + transaction.commit().await.unwrap(); + + let mut expected_history = None; + for reference in [project_id.as_str(), project_slug.as_str()] { + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{reference}/history")) + .append_pat(Some(moderator_read.as_str())) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::OK); + let history: Vec = + test::read_body_json(response).await; + assert_eq!(history.len(), 2); + assert!(history.iter().all(|entry| entry.project_id == id.into())); + assert_eq!( + history[0].done_by, + Some(DBUserId(USER_USER_ID_PARSED).into()) + ); + assert!(matches!(history[0].delta, ProjectDelta::Created)); + assert_eq!(history[1].done_by, None); + assert!(matches!( + history[1].delta, + ProjectDelta::ChangeVisibility { + from: ProjectVisibility::Public, + to: ProjectVisibility::Unlisted, + } + )); + assert_eq!(history[0].occurred_at, history[1].occurred_at); + assert!(history[0].id < history[1].id); + let value = serde_json::to_value(&history).unwrap(); + if let Some(expected) = &expected_history { + assert_eq!(&value, expected); + } else { + expected_history = Some(value); + } + } + + let response = env.api.remove_project(project_id, USER_USER_PAT).await; + assert_status!(&response, StatusCode::NO_CONTENT); + let response = env + .api + .call( + test::TestRequest::get() + .uri(&format!("/v3/project/{project_id}/history")) + .append_pat(Some(moderator_read.as_str())) + .to_request(), + ) + .await; + assert_status!(&response, StatusCode::OK); + let history: Vec = + test::read_body_json(response).await; + assert_eq!(history.len(), 3); + assert_eq!( + serde_json::to_value(&history[..2]).unwrap(), + expected_history.unwrap() + ); + assert!(history.windows(2).all(|entries| { + (entries[0].occurred_at, entries[0].id) + < (entries[1].occurred_at, entries[1].id) + })); + assert_eq!(history[2].project_id, id.into()); + assert_eq!( + history[2].done_by, + Some(DBUserId(USER_USER_ID_PARSED).into()) + ); + assert!(matches!(history[2].delta, ProjectDelta::Deleted)); + }) + .await; +} + #[actix_rt::test] async fn test_get_project() { // Test setup and dummy data @@ -799,13 +1096,13 @@ pub async fn test_patch_project() { ); assert!(body.get("details").is_none()); - // Failure because these are illegal requested statuses for a normal user. + // These values are not valid owner-requested visibilities. for req in ["unknown", "processing", "withheld", "scheduled"] { let resp = api .edit_project( alpha_project_slug, json!({ - "requested_status": req, + "visibility": req, }), USER_USER_PAT, ) @@ -863,17 +1160,31 @@ 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 before = api + .get_project_deserialized(beta_project_slug, USER_USER_PAT) + .await; + assert!(before.in_review); + + // Visibility changes do not submit or cancel review. let resp = api .edit_project( beta_project_slug, json!({ - "status": "private" + "visibility": "private" }), USER_USER_PAT, ) .await; - assert_status!(&resp, StatusCode::UNAUTHORIZED); + assert_status!(&resp, StatusCode::NO_CONTENT); + let after = api + .get_project_deserialized(beta_project_slug, USER_USER_PAT) + .await; + assert_eq!( + after.visibility, + labrinth::models::projects::ProjectVisibility::Private + ); + assert_eq!(after.in_review, before.in_review); + assert_eq!(after.review_outcome, before.review_outcome); // Successful request to patch many fields. let resp = api @@ -957,7 +1268,7 @@ async fn test_submit_invalid_project_for_review() { let response = api .edit_project( project_slug, - json!({ "status": "draft" }), + json!({ "review_outcome": "never_reviewed", "in_review": false }), ADMIN_USER_PAT, ) .await; @@ -966,7 +1277,7 @@ async fn test_submit_invalid_project_for_review() { let project_before = api .get_project_deserialized(project_slug, USER_USER_PAT) .await; - assert_eq!(project_before.status, ProjectStatus::Draft); + assert_eq!(legacy_project_status(&project_before), LegacyProjectStatus::Draft); let original_description = project_before.description; let response = api @@ -974,7 +1285,7 @@ async fn test_submit_invalid_project_for_review() { project_slug, json!({ "description": "", - "status": "processing", + "in_review": true, }), USER_USER_PAT, ) @@ -984,7 +1295,7 @@ async fn test_submit_invalid_project_for_review() { let project_after = api .get_project_deserialized(project_slug, USER_USER_PAT) .await; - assert_eq!(project_after.status, ProjectStatus::Draft); + assert_eq!(legacy_project_status(&project_after), LegacyProjectStatus::Draft); assert_eq!(project_after.description, original_description); }, ) @@ -1002,7 +1313,7 @@ async fn test_moderator_can_edit_invalid_project_in_review() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1020,7 +1331,10 @@ async fn test_moderator_can_edit_invalid_project_in_review() { let project = api .get_project_deserialized(project_slug, MOD_USER_PAT) .await; - assert_eq!(project.status, ProjectStatus::Processing); + assert_eq!( + legacy_project_status(&project), + LegacyProjectStatus::Processing + ); assert!(project.description.is_empty()); }, ) @@ -1039,7 +1353,7 @@ async fn test_moderators_can_approve_invalid_project() { let response = api .edit_project( project_slug, - json!({ "status": "processing", "description": "" }), + json!({ "in_review": true, "description": "" }), pat, ) .await; @@ -1048,7 +1362,7 @@ async fn test_moderators_can_approve_invalid_project() { let response = api .edit_project( project_slug, - json!({ "status": "approved" }), + json!({ "review_outcome": "approved", "in_review": false }), pat, ) .await; @@ -1056,7 +1370,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!(legacy_project_status(&project), LegacyProjectStatus::Approved); assert!(project.description.is_empty()); } }, @@ -1075,7 +1389,7 @@ async fn test_edit_invalid_project_in_review_rolls_back() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1084,7 +1398,10 @@ async fn test_edit_invalid_project_in_review_rolls_back() { let project_before = api .get_project_deserialized(project_slug, USER_USER_PAT) .await; - assert_eq!(project_before.status, ProjectStatus::Processing); + assert_eq!( + legacy_project_status(&project_before), + LegacyProjectStatus::Processing + ); let response = api .edit_project( @@ -1098,7 +1415,10 @@ async fn test_edit_invalid_project_in_review_rolls_back() { let project_after = api .get_project_deserialized(project_slug, USER_USER_PAT) .await; - assert_eq!(project_after.status, ProjectStatus::Processing); + assert_eq!( + legacy_project_status(&project_after), + LegacyProjectStatus::Processing + ); assert_eq!(project_after.description, project_before.description); }, ) @@ -1117,15 +1437,15 @@ async fn test_leaving_review_skips_validation() { .await; for (status, expected_status) in [ - ("draft", ProjectStatus::Draft), - ("rejected", ProjectStatus::Rejected), + ("draft", LegacyProjectStatus::Draft), + ("rejected", LegacyProjectStatus::Rejected), ] { let response = api .edit_project( project_slug, json!({ "description": original_project.description.clone(), - "status": "processing", + "in_review": true, }), ADMIN_USER_PAT, ) @@ -1137,7 +1457,8 @@ async fn test_leaving_review_skips_validation() { project_slug, json!({ "description": "", - "status": status, + "review_outcome": if status == "draft" { "never_reviewed" } else { status }, + "in_review": false, }), ADMIN_USER_PAT, ) @@ -1147,7 +1468,7 @@ async fn test_leaving_review_skips_validation() { let project = api .get_project_deserialized(project_slug, USER_USER_PAT) .await; - assert_eq!(project.status, expected_status); + assert_eq!(legacy_project_status(&project), expected_status); assert!(project.description.is_empty()); } }, @@ -1166,7 +1487,7 @@ async fn test_description_similarity_to_summary() { let response = api .edit_project( project_slug, - json!({ "status": "draft", "summary": summary }), + json!({ "review_outcome": "never_reviewed", "in_review": false, "summary": summary }), ADMIN_USER_PAT, ) .await; @@ -1321,7 +1642,7 @@ async fn test_add_invalid_gallery_item_in_review_rolls_back() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1379,7 +1700,7 @@ async fn test_edit_invalid_gallery_item_in_review_rolls_back() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1440,7 +1761,7 @@ async fn test_delete_gallery_item_from_invalid_project_in_review_rolls_back() { project_slug, json!({ "description": "", - "status": "draft", + "review_outcome": "never_reviewed", "in_review": false, }), ADMIN_USER_PAT, ) @@ -1450,7 +1771,7 @@ async fn test_delete_gallery_item_from_invalid_project_in_review_rolls_back() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1491,7 +1812,7 @@ async fn test_edit_invalid_disclosures_in_review_rolls_back() { let response = api .edit_project( project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; @@ -1686,7 +2007,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 +2054,13 @@ async fn permissions_patch_project_v3() { .collect::>() .await; - // Test with status and requested_status + // Test owner-requested visibility // This requires a project with a version, so we use alpha_project_id 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,7 +2776,7 @@ 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; + let response = api.edit_project(slug, json!({ "review_outcome": "never_reviewed", "in_review": false }), ADMIN_USER_PAT).await; assert_status!(&response, StatusCode::NO_CONTENT); let response = api.edit_project(slug, json!({ "description": "Too short" }), USER_USER_PAT).await; @@ -2532,7 +2852,7 @@ async fn queue_project_for_technical_review( async fn assert_no_technical_review_auto_approval( test_env: &TestEnvironment, - expected_status: ProjectStatus, + expected_status: LegacyProjectStatus, expected_verdicts: &[&str], ) { let project = &test_env.dummy.project_alpha; @@ -2540,7 +2860,7 @@ async fn assert_no_technical_review_auto_approval( .api .get_project_deserialized(&project.project_id, MOD_USER_PAT) .await; - assert_eq!(after.status, expected_status); + assert_eq!(legacy_project_status(&after), expected_status); let queued = sqlx::query_scalar!( r#" @@ -2593,14 +2913,17 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { use labrinth::routes::internal::delphi::tech_review_queue; for (requested_status, old_status) in [ - ProjectStatus::Approved, - ProjectStatus::Unlisted, - ProjectStatus::Private, + LegacyProjectStatus::Approved, + LegacyProjectStatus::Unlisted, + LegacyProjectStatus::Private, ] .into_iter() .flat_map(|status| { - [ProjectStatus::Processing, ProjectStatus::Rejected] - .map(|old_status| (status, old_status)) + [ + LegacyProjectStatus::Processing, + LegacyProjectStatus::Rejected, + ] + .map(|old_status| (status, old_status)) }) { with_test_environment( None, @@ -2609,7 +2932,11 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { let project = &test_env.dummy.project_alpha; queue_project_for_technical_review( &test_env, - json!({ "status": old_status, "requested_status": requested_status }), + json!({ + "in_review": old_status == LegacyProjectStatus::Processing, + "review_outcome": if old_status == LegacyProjectStatus::Rejected { "rejected" } else { "approved" }, + "visibility": if requested_status == LegacyProjectStatus::Approved { "public" } else { requested_status.as_str() }, + }), vec![ vec![ json!({ "type": "remove_tags", "value": { "tags": ["magic"] } }), @@ -2621,7 +2948,7 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { ], ) .await; - if old_status == ProjectStatus::Rejected { + if old_status == LegacyProjectStatus::Rejected { let mut txn = test_env.db.pool.begin().await.unwrap(); tech_review_queue::remove_projects( &[DBProjectId::from(project.project_id_parsed)], @@ -2634,7 +2961,7 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { let before = api .get_project_deserialized(&project.project_id, MOD_USER_PAT) .await; - assert_eq!(before.status, old_status); + assert_eq!(legacy_project_status(&before), old_status); let response = api .call( test::TestRequest::get() @@ -2683,7 +3010,7 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { .await .unwrap(); - let request = if old_status == ProjectStatus::Processing { + let request = if old_status == LegacyProjectStatus::Processing { test::TestRequest::post() .uri(&format!( "/_internal/moderation/tech-review/submit/{}", @@ -2695,7 +3022,7 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { test::TestRequest::patch() .uri(&format!("/v3/project/{}", project.project_id)) .append_pat(USER_USER_PAT) - .set_json(json!({ "status": "processing" })) + .set_json(json!({ "in_review": true })) }; let response = api.call(request.to_request()).await; assert_status!(&response, StatusCode::NO_CONTENT); @@ -2706,8 +3033,13 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { USER_USER_PAT, ) .await; - assert_eq!(after.status, requested_status); - assert_eq!(after.requested_status, Some(requested_status)); + assert_eq!(legacy_project_status(&after), requested_status); + assert_eq!( + serde_json::to_value(labrinth::models::v2::projects::ProjectStatus::from_visibility(after.visibility)).unwrap(), + requested_status.as_str(), + ); + assert_eq!(after.review_outcome, labrinth::models::projects::ProjectReviewOutcome::Approved); + assert!(!after.in_review); let queued = sqlx::query_scalar!( r#" SELECT EXISTS ( @@ -2802,7 +3134,7 @@ async fn test_safe_technical_review_exit_auto_approves_resolved_issues() { }) })); - if old_status != ProjectStatus::Processing { + if old_status != LegacyProjectStatus::Processing { return; } let response = api @@ -2870,7 +3202,7 @@ async fn test_safe_technical_review_submit_requires_valid_project_and_exit() { .description; queue_project_for_technical_review( &test_env, - json!({ "status": "processing", "description": "" }), + json!({ "in_review": true, "description": "" }), vec![vec![ json!({ "type": "remove_tags", "value": { "tags": ["magic"] } }), ]], @@ -2910,7 +3242,7 @@ async fn test_safe_technical_review_submit_requires_valid_project_and_exit() { assert_status!(&response, StatusCode::NO_CONTENT); assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Processing, + LegacyProjectStatus::Processing, &["resolved"], ) .await; @@ -2946,7 +3278,7 @@ async fn test_safe_technical_review_submit_requires_valid_project_and_exit() { ); assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Processing, + LegacyProjectStatus::Processing, &["resolved"], ) .await; @@ -2972,7 +3304,7 @@ async fn test_safe_technical_review_submit_requires_valid_project_and_exit() { assert_status!(&response, StatusCode::NO_CONTENT); assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Processing, + LegacyProjectStatus::Processing, &["resolved"], ) .await; @@ -3006,7 +3338,7 @@ async fn test_safe_technical_review_exit_requires_every_facet_resolved() { }; queue_project_for_technical_review( &test_env, - json!({ "status": "processing" }), + json!({ "in_review": true }), issues, ) .await; @@ -3030,7 +3362,7 @@ async fn test_safe_technical_review_exit_requires_every_facet_resolved() { }; assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Processing, + LegacyProjectStatus::Processing, verdicts, ) .await; @@ -3047,7 +3379,7 @@ async fn test_safe_technical_review_exit_requires_at_least_one_issue() { |test_env: TestEnvironment| async move { queue_project_for_technical_review( &test_env, - json!({ "status": "processing" }), + json!({ "in_review": true }), vec![], ) .await; @@ -3067,7 +3399,7 @@ async fn test_safe_technical_review_exit_requires_at_least_one_issue() { assert_status!(&response, StatusCode::NO_CONTENT); assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Processing, + LegacyProjectStatus::Processing, &[], ) .await; @@ -3079,16 +3411,19 @@ async fn test_safe_technical_review_exit_requires_at_least_one_issue() { #[actix_rt::test] async fn test_safe_technical_review_exit_requires_processing_status() { for status in [ - ProjectStatus::Draft, - ProjectStatus::Rejected, - ProjectStatus::Withheld, + LegacyProjectStatus::Draft, + LegacyProjectStatus::Rejected, + LegacyProjectStatus::Withheld, ] { with_test_environment( None, move |test_env: TestEnvironment| async move { queue_project_for_technical_review( &test_env, - json!({ "status": status }), + json!({ + "in_review": false, + "review_outcome": if status == LegacyProjectStatus::Draft { "never_reviewed" } else { status.as_str() }, + }), vec![vec![ json!({ "type": "remove_tags", "value": { "tags": ["magic"] } }), ]], @@ -3127,7 +3462,7 @@ async fn test_unsafe_technical_review_exit_rejects_resolved_project() { |test_env: TestEnvironment| async move { queue_project_for_technical_review( &test_env, - json!({ "status": "processing", "requested_status": "unlisted" }), + json!({ "in_review": true, "visibility": "unlisted" }), vec![vec![ json!({ "type": "remove_tags", "value": { "tags": ["magic"] } }), ]], @@ -3149,7 +3484,7 @@ async fn test_unsafe_technical_review_exit_rejects_resolved_project() { assert_status!(&response, StatusCode::NO_CONTENT); assert_no_technical_review_auto_approval( &test_env, - ProjectStatus::Rejected, + LegacyProjectStatus::Rejected, &["resolved"], ) .await; diff --git a/apps/labrinth/tests/scopes.rs b/apps/labrinth/tests/scopes.rs index ac02fb08c34..6323f63182a 100644 --- a/apps/labrinth/tests/scopes.rs +++ b/apps/labrinth/tests/scopes.rs @@ -385,14 +385,14 @@ pub async fn project_version_reads_scopes() { .as_array() .unwrap() .iter() - .any(|x| x["status"] == "processing") + .any(|x| x["status"] == "processing" || x["in_review"] == true) ); assert!( success .as_array() .unwrap() .iter() - .any(|x| x["status"] == "processing") + .any(|x| x["status"] == "processing" || x["in_review"] == true) ); // Project metadata reading diff --git a/apps/labrinth/tests/v2/version.rs b/apps/labrinth/tests/v2/version.rs index a4d6c70f1fb..4f8501554f6 100644 --- a/apps/labrinth/tests/v2/version.rs +++ b/apps/labrinth/tests/v2/version.rs @@ -149,6 +149,24 @@ async fn update_files_respects_processing_project_visibility() { let api = &test_env.api; let project = &test_env.dummy.project_alpha; + for pat in [ENEMY_USER_PAT, None] { + let versions = api + .update_files_deserialized_common( + "sha1", + vec![project.file_hash.clone()], + None, + None, + None, + pat, + ) + .await; + assert_eq!(versions.len(), 1); + assert_eq!( + versions[&project.file_hash].id.to_string(), + project.version_id + ); + } + let response = api .edit_project( &project.project_slug, @@ -157,6 +175,13 @@ async fn update_files_respects_processing_project_visibility() { ) .await; assert_status!(&response, StatusCode::NO_CONTENT); + let processing_project = api + .get_project_deserialized(&project.project_slug, ADMIN_USER_PAT) + .await; + assert_eq!( + processing_project.status, + labrinth::models::v2::projects::ProjectStatus::Processing + ); 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..f939ad5ece1 100644 --- a/apps/labrinth/tests/version.rs +++ b/apps/labrinth/tests/version.rs @@ -102,7 +102,7 @@ async fn deleting_version_in_review_that_fails_validation_rolls_back() { let response = api .edit_project( &project.project_slug, - json!({ "status": "processing" }), + json!({ "in_review": true }), ADMIN_USER_PAT, ) .await; diff --git a/packages/api-client/src/modules/labrinth/types.ts b/packages/api-client/src/modules/labrinth/types.ts index 73f40a36599..59d24f1046a 100644 --- a/packages/api-client/src/modules/labrinth/types.ts +++ b/packages/api-client/src/modules/labrinth/types.ts @@ -1069,17 +1069,16 @@ export namespace Labrinth { | 'unknown' export type AutoApprovalCause = - | { type: 'resubmission'; user_id: string } - | { type: 'technical_review_no_details' } - | { type: 'scan_completed'; report_id: number; scan_id: string } - | { type: 'rules_changed'; revision: number; user_id: string } - | { type: 'moderator_technical_review_pass'; user_id: string } - | { type: 'local_verdicts_updated'; user_id: string } - | { type: 'global_verdicts_updated'; user_id: string } + | { kind: 'resubmission'; user_id: string } + | { kind: 'technical_review_no_details' } + | { kind: 'scan_completed'; report_id: number; scan_id: string } + | { kind: 'rules_changed'; revision: number; user_id: string } + | { kind: 'moderator_technical_review_pass'; user_id: string } + | { kind: 'local_verdicts_updated'; user_id: string } + | { kind: 'global_verdicts_updated'; user_id: string } export type ApprovalProvenance = { trigger: AutoApprovalCause - previous_status: Projects.v2.ProjectStatus resolved_issue_ids: string[] } @@ -1305,6 +1304,7 @@ export namespace Labrinth { license_id?: string slug?: string status?: v2.ProjectStatus + review_reason?: string requested_status?: v2.ProjectStatus | null moderation_message?: string | null moderation_message_body?: string | null @@ -2491,8 +2491,10 @@ export namespace Labrinth { name: string summary: string icon_url: string | null - status: Projects.v2.ProjectStatus - requested_status: Projects.v2.ProjectStatus | null + visibility: 'public' | 'unlisted' | 'private' + in_review: boolean + review_outcome: 'never_reviewed' | 'approved' | 'rejected' | 'withheld' + effective_visibility: 'public' | 'unlisted' | 'private' queued: string | null initial_queued: string | null published: string