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