-
+
Trace
{{ trace.detail_key }}
+
+ {{ latestLocalTrace.severity }}
+
+
+
+
+ Issue
+ {{ latestLocalTrace.issue_type }}
+
+
+ Path
+ {{ decodeTracePath(latestLocalTrace.file_path) }}
+
-
- {{ pageStart }}-{{ pageEnd }} of {{ trace.local_trace_count }} local traces
-
-
+
-
-
Loading page...
+
+ {{ pageStart }}-{{ pageEnd }} of {{ trace.local_trace_count }} local traces
+ · Loading page...
+
+
@@ -114,6 +135,29 @@ const pageStart = computed(() =>
const pageEnd = computed(() =>
Math.min(currentPage.value * localTracePageSize, trace.value?.local_trace_count ?? 0),
)
+const latestLocalTrace = computed(() => trace.value?.local_traces.at(-1))
+
+function decodeTracePath(path: string): string {
+ try {
+ return decodeURIComponent(path)
+ } catch {
+ return path
+ }
+}
+
+function getSeverityBadgeColor(severity: Labrinth.TechReview.Internal.DelphiSeverity): string {
+ switch (severity) {
+ case 'severe':
+ return 'border-red/60 bg-highlight-red text-red'
+ case 'high':
+ return 'border-orange/60 bg-highlight-orange text-orange'
+ case 'medium':
+ return 'border-green/60 bg-highlight-green text-green'
+ case 'low':
+ default:
+ return 'border-blue/60 bg-highlight-blue text-blue'
+ }
+}
async function fetchTracePage(afterDetailId: string | null) {
return await client.labrinth.tech_review_internal.getGlobalIssueDetail({
diff --git a/apps/labrinth/.sqlx/query-50d087248322373b2d5fc40e1c7b8a855b55d907d7fba0af0738c37366cb93e0.json b/apps/labrinth/.sqlx/query-147e143aaaff82c71b89daddcc8805a0874d1c5ad8469dd83133ac771b86ea4e.json
similarity index 77%
rename from apps/labrinth/.sqlx/query-50d087248322373b2d5fc40e1c7b8a855b55d907d7fba0af0738c37366cb93e0.json
rename to apps/labrinth/.sqlx/query-147e143aaaff82c71b89daddcc8805a0874d1c5ad8469dd83133ac771b86ea4e.json
index a6b04534b8..aed2ace773 100644
--- a/apps/labrinth/.sqlx/query-50d087248322373b2d5fc40e1c7b8a855b55d907d7fba0af0738c37366cb93e0.json
+++ b/apps/labrinth/.sqlx/query-147e143aaaff82c71b89daddcc8805a0874d1c5ad8469dd83133ac771b86ea4e.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "SELECT id FROM versions WHERE mod_id = ANY($1::bigint[])",
+ "query": "SELECT id FROM versions WHERE mod_id = ANY($1::bigint[]) ORDER BY id",
"describe": {
"columns": [
{
@@ -18,5 +18,5 @@
false
]
},
- "hash": "50d087248322373b2d5fc40e1c7b8a855b55d907d7fba0af0738c37366cb93e0"
+ "hash": "147e143aaaff82c71b89daddcc8805a0874d1c5ad8469dd83133ac771b86ea4e"
}
diff --git a/apps/labrinth/.sqlx/query-9070b1b6a5b1e93eb1fd1838c522fa6084ad6a5c86fafbfe8448ea7cc86f38ba.json b/apps/labrinth/.sqlx/query-63a9a89443566baa880ddbe05f741e2a83b50d89f5954ab8d951a090e702de73.json
similarity index 94%
rename from apps/labrinth/.sqlx/query-9070b1b6a5b1e93eb1fd1838c522fa6084ad6a5c86fafbfe8448ea7cc86f38ba.json
rename to apps/labrinth/.sqlx/query-63a9a89443566baa880ddbe05f741e2a83b50d89f5954ab8d951a090e702de73.json
index 5693d97e31..b9c6d3543c 100644
--- a/apps/labrinth/.sqlx/query-9070b1b6a5b1e93eb1fd1838c522fa6084ad6a5c86fafbfe8448ea7cc86f38ba.json
+++ b/apps/labrinth/.sqlx/query-63a9a89443566baa880ddbe05f741e2a83b50d89f5954ab8d951a090e702de73.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n didws.id AS \"id!: DelphiReportIssueDetailsId\",\n didws.issue_id AS \"issue_id!: DelphiReportIssueId\",\n didws.key AS \"key!: String\",\n didws.jar AS \"jar?: String\",\n didws.file_path AS \"file_path!: String\",\n didws.data AS \"data!: sqlx::types::Json
>\",\n didws.severity AS \"severity!: DelphiSeverity\",\n didws.local_status AS \"local_status?: DelphiStatus\",\n didws.global_status AS \"global_status?: DelphiStatus\",\n didws.status AS \"status!: DelphiStatus\"\n FROM delphi_issue_details_with_statuses didws\n WHERE didws.issue_id = ANY($1::bigint[])\n ",
+ "query": "\n SELECT\n didws.id AS \"id!: DelphiReportIssueDetailsId\",\n didws.issue_id AS \"issue_id!: DelphiReportIssueId\",\n didws.key AS \"key!: String\",\n didws.jar AS \"jar?: String\",\n didws.file_path AS \"file_path!: String\",\n didws.data AS \"data!: sqlx::types::Json>\",\n didws.severity AS \"severity!: DelphiSeverity\",\n didws.local_status AS \"local_status?: DelphiStatus\",\n didws.global_status AS \"global_status?: DelphiStatus\",\n didws.status AS \"status!: DelphiStatus\"\n FROM delphi_issue_details_with_statuses didws\n WHERE didws.issue_id = ANY($1::bigint[])\n ORDER BY didws.issue_id, didws.id\n ",
"describe": {
"columns": [
{
@@ -117,5 +117,5 @@
true
]
},
- "hash": "9070b1b6a5b1e93eb1fd1838c522fa6084ad6a5c86fafbfe8448ea7cc86f38ba"
+ "hash": "63a9a89443566baa880ddbe05f741e2a83b50d89f5954ab8d951a090e702de73"
}
diff --git a/apps/labrinth/.sqlx/query-8e38571ffae8bf246973d328c890a45b87c0f71d53cf46f390c4b286677b2b31.json b/apps/labrinth/.sqlx/query-72012eb0655d9130a7c7894f7682015c170b2fb325aaef554f08aac34457a3fa.json
similarity index 89%
rename from apps/labrinth/.sqlx/query-8e38571ffae8bf246973d328c890a45b87c0f71d53cf46f390c4b286677b2b31.json
rename to apps/labrinth/.sqlx/query-72012eb0655d9130a7c7894f7682015c170b2fb325aaef554f08aac34457a3fa.json
index aeb96383c0..3f11083654 100644
--- a/apps/labrinth/.sqlx/query-8e38571ffae8bf246973d328c890a45b87c0f71d53cf46f390c4b286677b2b31.json
+++ b/apps/labrinth/.sqlx/query-72012eb0655d9130a7c7894f7682015c170b2fb325aaef554f08aac34457a3fa.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n id AS \"file_id: DBFileId\",\n version_id AS \"version_id: DBVersionId\",\n url,\n filename,\n size\n FROM files\n WHERE version_id = ANY($1::bigint[])\n ",
+ "query": "\n SELECT\n id AS \"file_id: DBFileId\",\n version_id AS \"version_id: DBVersionId\",\n url,\n filename,\n size\n FROM files\n WHERE version_id = ANY($1::bigint[])\n ORDER BY version_id, id\n ",
"describe": {
"columns": [
{
@@ -42,5 +42,5 @@
false
]
},
- "hash": "8e38571ffae8bf246973d328c890a45b87c0f71d53cf46f390c4b286677b2b31"
+ "hash": "72012eb0655d9130a7c7894f7682015c170b2fb325aaef554f08aac34457a3fa"
}
diff --git a/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json b/apps/labrinth/.sqlx/query-8d37c8c2633b7d601c7ba74d63608ff40af3b6b56f43540ec3798ef30e5c0b9d.json
similarity index 88%
rename from apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json
rename to apps/labrinth/.sqlx/query-8d37c8c2633b7d601c7ba74d63608ff40af3b6b56f43540ec3798ef30e5c0b9d.json
index 53cf350301..475dba1b98 100644
--- a/apps/labrinth/.sqlx/query-10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17.json
+++ b/apps/labrinth/.sqlx/query-8d37c8c2633b7d601c7ba74d63608ff40af3b6b56f43540ec3798ef30e5c0b9d.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n id AS \"report_id!: DelphiReportId\",\n file_id AS \"file_id!: DBFileId\",\n created,\n severity AS \"severity!: DelphiSeverity\"\n FROM delphi_reports\n WHERE file_id = ANY($1::bigint[])\n ",
+ "query": "\n SELECT\n id AS \"report_id!: DelphiReportId\",\n file_id AS \"file_id!: DBFileId\",\n created,\n severity AS \"severity!: DelphiSeverity\"\n FROM delphi_reports\n WHERE file_id = ANY($1::bigint[])\n ORDER BY file_id, created, id\n ",
"describe": {
"columns": [
{
@@ -48,5 +48,5 @@
false
]
},
- "hash": "10e2a3b31ba94b93ed2d6c9753a5aabf13190a0b336089e6521022069813cf17"
+ "hash": "8d37c8c2633b7d601c7ba74d63608ff40af3b6b56f43540ec3798ef30e5c0b9d"
}
diff --git a/apps/labrinth/.sqlx/query-632b79f51dd39a75ebff838ca4beab463f84aa32246288cc251881ec41d207f5.json b/apps/labrinth/.sqlx/query-c69a7a5296941a52f15c3c073e65e8eff6516004d0636357f146047789f8f8c1.json
similarity index 81%
rename from apps/labrinth/.sqlx/query-632b79f51dd39a75ebff838ca4beab463f84aa32246288cc251881ec41d207f5.json
rename to apps/labrinth/.sqlx/query-c69a7a5296941a52f15c3c073e65e8eff6516004d0636357f146047789f8f8c1.json
index a48b3a89a0..06a2b641ef 100644
--- a/apps/labrinth/.sqlx/query-632b79f51dd39a75ebff838ca4beab463f84aa32246288cc251881ec41d207f5.json
+++ b/apps/labrinth/.sqlx/query-c69a7a5296941a52f15c3c073e65e8eff6516004d0636357f146047789f8f8c1.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n id AS \"id: DelphiReportIssueId\",\n report_id AS \"report_id: DelphiReportId\",\n issue_type\n FROM delphi_report_issues\n WHERE report_id = ANY($1::bigint[])\n ",
+ "query": "\n SELECT\n id AS \"id: DelphiReportIssueId\",\n report_id AS \"report_id: DelphiReportId\",\n issue_type\n FROM delphi_report_issues\n WHERE report_id = ANY($1::bigint[])\n ORDER BY report_id, id\n ",
"describe": {
"columns": [
{
@@ -30,5 +30,5 @@
false
]
},
- "hash": "632b79f51dd39a75ebff838ca4beab463f84aa32246288cc251881ec41d207f5"
+ "hash": "c69a7a5296941a52f15c3c073e65e8eff6516004d0636357f146047789f8f8c1"
}
diff --git a/apps/labrinth/src/routes/internal/moderation/tech_review.rs b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
index 745509e834..2bd5097c58 100644
--- a/apps/labrinth/src/routes/internal/moderation/tech_review.rs
+++ b/apps/labrinth/src/routes/internal/moderation/tech_review.rs
@@ -443,7 +443,7 @@ async fn fetch_project_reports(
}
let version_id_rows = sqlx::query!(
- "SELECT id FROM versions WHERE mod_id = ANY($1::bigint[])",
+ "SELECT id FROM versions WHERE mod_id = ANY($1::bigint[]) ORDER BY id",
&project_ids.iter().map(|id| id.0).collect::>()
)
.fetch_all(pool)
@@ -469,6 +469,7 @@ async fn fetch_project_reports(
size
FROM files
WHERE version_id = ANY($1::bigint[])
+ ORDER BY version_id, id
"#,
&version_ids.iter().map(|id| id.0).collect::>()
)
@@ -485,6 +486,7 @@ async fn fetch_project_reports(
severity AS "severity!: DelphiSeverity"
FROM delphi_reports
WHERE file_id = ANY($1::bigint[])
+ ORDER BY file_id, created, id
"#,
&file_rows.iter().map(|f| f.file_id.0).collect::>()
)
@@ -500,6 +502,7 @@ async fn fetch_project_reports(
issue_type
FROM delphi_report_issues
WHERE report_id = ANY($1::bigint[])
+ ORDER BY report_id, id
"#,
&report_rows
.iter()
@@ -528,6 +531,7 @@ async fn fetch_project_reports(
didws.status AS "status!: DelphiStatus"
FROM delphi_issue_details_with_statuses didws
WHERE didws.issue_id = ANY($1::bigint[])
+ ORDER BY didws.issue_id, didws.id
"#,
&issue_ids.iter().map(|i| i.0).collect::>()
)
From 543cb422101e303478ed6d9046bc6904fb7bfdcc Mon Sep 17 00:00:00 2001
From: Sychic <47618543+Sychic@users.noreply.github.com>
Date: Fri, 17 Jul 2026 15:27:38 -0400
Subject: [PATCH 02/43] remove(labrinth): old shared instances impl (#6760)
---
...a2b8edb55d93ada8f2243448865163f555d8d.json | 16 -
...a4bb38acc54e4ea5de020fffef7457000fa6e.json | 46 --
...e2b57e917e9507942d65f40c1b733209cabf0.json | 46 --
...db93631d57be2fe82bc2986dffd878ef1174d.json | 14 -
...6a9158a3ea08f8720f6df5b4902cd8094d3bb.json | 14 -
...ab13ae43d180b8c86cb2a6fab0253dd4eba55.json | 15 -
...8fa4c3641eb2221e522bf50abad4f5e977599.json | 15 -
...4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1.json | 17 -
...79446dd964da4efa49c5464cebde57860f741.json | 15 -
...9d227d95f2a8f2eb9852833e14c723903988b.json | 22 -
...8d84842152b82c9a0032d1db587d7099b8550.json | 46 --
...9405e28c265bef6121b457c4f39cacf00683f.json | 15 -
...1b8c709645ef29f3b5fb6e8e07fc212b36798.json | 34 -
...47be2a18275f33f8991d910f693fbcc1ff731.json | 46 --
...eb2231578aff18c93d02ead97c3c07f0b27ea.json | 23 -
...0bd34c3893e8b55bbd126a988137ec7bf1ff9.json | 14 -
...e6826f46c27ab3a21520e9e169fd1491521c4.json | 22 -
...ec405531e4270be85087122245991ec88473e.json | 18 -
...d3e7416723ff95fcd83587f113621a9887420.json | 14 -
...ed48aaedab5db381f4efc389b852d9020a0e6.json | 14 -
.../20260714120000_drop-shared-instances.sql | 5 +
apps/labrinth/src/database/models/ids.rs | 13 +-
apps/labrinth/src/database/models/mod.rs | 1 -
.../database/models/shared_instance_item.rs | 336 ----------
.../labrinth/src/database/models/user_item.rs | 35 -
apps/labrinth/src/models/mod.rs | 1 -
apps/labrinth/src/models/v3/ids.rs | 2 -
apps/labrinth/src/models/v3/mod.rs | 1 -
.../src/models/v3/shared_instances.rs | 89 ---
apps/labrinth/src/routes/v3/mod.rs | 14 -
.../v3/shared_instance_version_creation.rs | 219 ------
.../src/routes/v3/shared_instances.rs | 628 ------------------
32 files changed, 7 insertions(+), 1803 deletions(-)
delete mode 100644 apps/labrinth/.sqlx/query-09ebec1a568edf1959f20b33d8ba2b8edb55d93ada8f2243448865163f555d8d.json
delete mode 100644 apps/labrinth/.sqlx/query-1ebe19b7b4f10039065967a0b1ca4bb38acc54e4ea5de020fffef7457000fa6e.json
delete mode 100644 apps/labrinth/.sqlx/query-265c4d6f33714c8a5cf3137c429e2b57e917e9507942d65f40c1b733209cabf0.json
delete mode 100644 apps/labrinth/.sqlx/query-3a2a1962875e5164d3d20802886db93631d57be2fe82bc2986dffd878ef1174d.json
delete mode 100644 apps/labrinth/.sqlx/query-47130ef29ce5914528e5424fe516a9158a3ea08f8720f6df5b4902cd8094d3bb.json
delete mode 100644 apps/labrinth/.sqlx/query-47ec9f179f1c52213bd32b37621ab13ae43d180b8c86cb2a6fab0253dd4eba55.json
delete mode 100644 apps/labrinth/.sqlx/query-6b166d129b0ee028898620054a58fa4c3641eb2221e522bf50abad4f5e977599.json
delete mode 100644 apps/labrinth/.sqlx/query-6f72c853e139f23322fe6f1f02e4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1.json
delete mode 100644 apps/labrinth/.sqlx/query-72ae0e8debd06067894a2f7bea279446dd964da4efa49c5464cebde57860f741.json
delete mode 100644 apps/labrinth/.sqlx/query-7c445073f61e30723416a9690aa9d227d95f2a8f2eb9852833e14c723903988b.json
delete mode 100644 apps/labrinth/.sqlx/query-9c6e18cb19251e54b3b96446ab88d84842152b82c9a0032d1db587d7099b8550.json
delete mode 100644 apps/labrinth/.sqlx/query-9ccaf8ea52b1b6f0880d34cdb4a9405e28c265bef6121b457c4f39cacf00683f.json
delete mode 100644 apps/labrinth/.sqlx/query-aec58041cf5e5e68501652336581b8c709645ef29f3b5fb6e8e07fc212b36798.json
delete mode 100644 apps/labrinth/.sqlx/query-b93253bbc35b24974d13bc8ee0447be2a18275f33f8991d910f693fbcc1ff731.json
delete mode 100644 apps/labrinth/.sqlx/query-c3869a595693757ccf81085d0c8eb2231578aff18c93d02ead97c3c07f0b27ea.json
delete mode 100644 apps/labrinth/.sqlx/query-cef730c02bb67b0536d35e5aaca0bd34c3893e8b55bbd126a988137ec7bf1ff9.json
delete mode 100644 apps/labrinth/.sqlx/query-d8558a8039ade3b383db4f0e095e6826f46c27ab3a21520e9e169fd1491521c4.json
delete mode 100644 apps/labrinth/.sqlx/query-d8a1d710f86b3df4d99c2d2ec26ec405531e4270be85087122245991ec88473e.json
delete mode 100644 apps/labrinth/.sqlx/query-d926d015cece307da567ac44b84d3e7416723ff95fcd83587f113621a9887420.json
delete mode 100644 apps/labrinth/.sqlx/query-f6388b5026e25191840d1a157a9ed48aaedab5db381f4efc389b852d9020a0e6.json
create mode 100644 apps/labrinth/migrations/20260714120000_drop-shared-instances.sql
delete mode 100644 apps/labrinth/src/database/models/shared_instance_item.rs
delete mode 100644 apps/labrinth/src/models/v3/shared_instances.rs
delete mode 100644 apps/labrinth/src/routes/v3/shared_instance_version_creation.rs
delete mode 100644 apps/labrinth/src/routes/v3/shared_instances.rs
diff --git a/apps/labrinth/.sqlx/query-09ebec1a568edf1959f20b33d8ba2b8edb55d93ada8f2243448865163f555d8d.json b/apps/labrinth/.sqlx/query-09ebec1a568edf1959f20b33d8ba2b8edb55d93ada8f2243448865163f555d8d.json
deleted file mode 100644
index 03bf9d951a..0000000000
--- a/apps/labrinth/.sqlx/query-09ebec1a568edf1959f20b33d8ba2b8edb55d93ada8f2243448865163f555d8d.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n INSERT INTO shared_instance_users (user_id, shared_instance_id, permissions)\n VALUES ($1, $2, $3)\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Int8",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "09ebec1a568edf1959f20b33d8ba2b8edb55d93ada8f2243448865163f555d8d"
-}
diff --git a/apps/labrinth/.sqlx/query-1ebe19b7b4f10039065967a0b1ca4bb38acc54e4ea5de020fffef7457000fa6e.json b/apps/labrinth/.sqlx/query-1ebe19b7b4f10039065967a0b1ca4bb38acc54e4ea5de020fffef7457000fa6e.json
deleted file mode 100644
index c584ce9645..0000000000
--- a/apps/labrinth/.sqlx/query-1ebe19b7b4f10039065967a0b1ca4bb38acc54e4ea5de020fffef7457000fa6e.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT id, title, owner_id, public, current_version_id\n FROM shared_instances\n WHERE id = $1\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "title",
- "type_info": "Varchar"
- },
- {
- "ordinal": 2,
- "name": "owner_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 3,
- "name": "public",
- "type_info": "Bool"
- },
- {
- "ordinal": 4,
- "name": "current_version_id",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- false,
- false,
- false,
- true
- ]
- },
- "hash": "1ebe19b7b4f10039065967a0b1ca4bb38acc54e4ea5de020fffef7457000fa6e"
-}
diff --git a/apps/labrinth/.sqlx/query-265c4d6f33714c8a5cf3137c429e2b57e917e9507942d65f40c1b733209cabf0.json b/apps/labrinth/.sqlx/query-265c4d6f33714c8a5cf3137c429e2b57e917e9507942d65f40c1b733209cabf0.json
deleted file mode 100644
index 7902fc25e2..0000000000
--- a/apps/labrinth/.sqlx/query-265c4d6f33714c8a5cf3137c429e2b57e917e9507942d65f40c1b733209cabf0.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT id, shared_instance_id, size, sha512, created\n FROM shared_instance_versions\n WHERE shared_instance_id = $1\n ORDER BY created DESC\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "shared_instance_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "size",
- "type_info": "Int8"
- },
- {
- "ordinal": 3,
- "name": "sha512",
- "type_info": "Bytea"
- },
- {
- "ordinal": 4,
- "name": "created",
- "type_info": "Timestamptz"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- false,
- false,
- false,
- false
- ]
- },
- "hash": "265c4d6f33714c8a5cf3137c429e2b57e917e9507942d65f40c1b733209cabf0"
-}
diff --git a/apps/labrinth/.sqlx/query-3a2a1962875e5164d3d20802886db93631d57be2fe82bc2986dffd878ef1174d.json b/apps/labrinth/.sqlx/query-3a2a1962875e5164d3d20802886db93631d57be2fe82bc2986dffd878ef1174d.json
deleted file mode 100644
index 3fe43f0adf..0000000000
--- a/apps/labrinth/.sqlx/query-3a2a1962875e5164d3d20802886db93631d57be2fe82bc2986dffd878ef1174d.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n\t\t\t\tDELETE FROM shared_instance_invited_users\n\t\t\t\tWHERE invited_user_id = $1\n\t\t\t\t",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "3a2a1962875e5164d3d20802886db93631d57be2fe82bc2986dffd878ef1174d"
-}
diff --git a/apps/labrinth/.sqlx/query-47130ef29ce5914528e5424fe516a9158a3ea08f8720f6df5b4902cd8094d3bb.json b/apps/labrinth/.sqlx/query-47130ef29ce5914528e5424fe516a9158a3ea08f8720f6df5b4902cd8094d3bb.json
deleted file mode 100644
index 24e1d953b9..0000000000
--- a/apps/labrinth/.sqlx/query-47130ef29ce5914528e5424fe516a9158a3ea08f8720f6df5b4902cd8094d3bb.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n DELETE FROM shared_instance_versions\n WHERE id = $1\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "47130ef29ce5914528e5424fe516a9158a3ea08f8720f6df5b4902cd8094d3bb"
-}
diff --git a/apps/labrinth/.sqlx/query-47ec9f179f1c52213bd32b37621ab13ae43d180b8c86cb2a6fab0253dd4eba55.json b/apps/labrinth/.sqlx/query-47ec9f179f1c52213bd32b37621ab13ae43d180b8c86cb2a6fab0253dd4eba55.json
deleted file mode 100644
index 2d0db80682..0000000000
--- a/apps/labrinth/.sqlx/query-47ec9f179f1c52213bd32b37621ab13ae43d180b8c86cb2a6fab0253dd4eba55.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "UPDATE shared_instances SET current_version_id = $1 WHERE id = $2",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "47ec9f179f1c52213bd32b37621ab13ae43d180b8c86cb2a6fab0253dd4eba55"
-}
diff --git a/apps/labrinth/.sqlx/query-6b166d129b0ee028898620054a58fa4c3641eb2221e522bf50abad4f5e977599.json b/apps/labrinth/.sqlx/query-6b166d129b0ee028898620054a58fa4c3641eb2221e522bf50abad4f5e977599.json
deleted file mode 100644
index 910adbc363..0000000000
--- a/apps/labrinth/.sqlx/query-6b166d129b0ee028898620054a58fa4c3641eb2221e522bf50abad4f5e977599.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n UPDATE shared_instances\n SET public = $1\n WHERE id = $2\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Bool",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "6b166d129b0ee028898620054a58fa4c3641eb2221e522bf50abad4f5e977599"
-}
diff --git a/apps/labrinth/.sqlx/query-6f72c853e139f23322fe6f1f02e4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1.json b/apps/labrinth/.sqlx/query-6f72c853e139f23322fe6f1f02e4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1.json
deleted file mode 100644
index 35b0640083..0000000000
--- a/apps/labrinth/.sqlx/query-6f72c853e139f23322fe6f1f02e4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n INSERT INTO shared_instances (id, title, owner_id, current_version_id)\n VALUES ($1, $2, $3, $4)\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Varchar",
- "Int8",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "6f72c853e139f23322fe6f1f02e4e07e5ae80b5dfca6dc041a03c0c7a30a5cf1"
-}
diff --git a/apps/labrinth/.sqlx/query-72ae0e8debd06067894a2f7bea279446dd964da4efa49c5464cebde57860f741.json b/apps/labrinth/.sqlx/query-72ae0e8debd06067894a2f7bea279446dd964da4efa49c5464cebde57860f741.json
deleted file mode 100644
index e0787e3bbe..0000000000
--- a/apps/labrinth/.sqlx/query-72ae0e8debd06067894a2f7bea279446dd964da4efa49c5464cebde57860f741.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n UPDATE shared_instances\n SET owner_id = $1\n WHERE owner_id = $2\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "72ae0e8debd06067894a2f7bea279446dd964da4efa49c5464cebde57860f741"
-}
diff --git a/apps/labrinth/.sqlx/query-7c445073f61e30723416a9690aa9d227d95f2a8f2eb9852833e14c723903988b.json b/apps/labrinth/.sqlx/query-7c445073f61e30723416a9690aa9d227d95f2a8f2eb9852833e14c723903988b.json
deleted file mode 100644
index 7897b45d3e..0000000000
--- a/apps/labrinth/.sqlx/query-7c445073f61e30723416a9690aa9d227d95f2a8f2eb9852833e14c723903988b.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "SELECT EXISTS(SELECT 1 FROM shared_instance_versions WHERE id=$1)",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "exists",
- "type_info": "Bool"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- null
- ]
- },
- "hash": "7c445073f61e30723416a9690aa9d227d95f2a8f2eb9852833e14c723903988b"
-}
diff --git a/apps/labrinth/.sqlx/query-9c6e18cb19251e54b3b96446ab88d84842152b82c9a0032d1db587d7099b8550.json b/apps/labrinth/.sqlx/query-9c6e18cb19251e54b3b96446ab88d84842152b82c9a0032d1db587d7099b8550.json
deleted file mode 100644
index 92c3b45f81..0000000000
--- a/apps/labrinth/.sqlx/query-9c6e18cb19251e54b3b96446ab88d84842152b82c9a0032d1db587d7099b8550.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n -- See https://github.com/launchbadge/sqlx/issues/1266 for why we need all the \"as\"\n SELECT\n id as \"id!\",\n title as \"title!\",\n public as \"public!\",\n owner_id as \"owner_id!\",\n current_version_id\n FROM shared_instances\n WHERE owner_id = $1\n UNION\n SELECT\n id as \"id!\",\n title as \"title!\",\n public as \"public!\",\n owner_id as \"owner_id!\",\n current_version_id\n FROM shared_instances\n JOIN shared_instance_users ON id = shared_instance_id\n WHERE user_id = $1\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id!",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "title!",
- "type_info": "Varchar"
- },
- {
- "ordinal": 2,
- "name": "public!",
- "type_info": "Bool"
- },
- {
- "ordinal": 3,
- "name": "owner_id!",
- "type_info": "Int8"
- },
- {
- "ordinal": 4,
- "name": "current_version_id",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- null,
- null,
- null,
- null,
- null
- ]
- },
- "hash": "9c6e18cb19251e54b3b96446ab88d84842152b82c9a0032d1db587d7099b8550"
-}
diff --git a/apps/labrinth/.sqlx/query-9ccaf8ea52b1b6f0880d34cdb4a9405e28c265bef6121b457c4f39cacf00683f.json b/apps/labrinth/.sqlx/query-9ccaf8ea52b1b6f0880d34cdb4a9405e28c265bef6121b457c4f39cacf00683f.json
deleted file mode 100644
index 1a5097375b..0000000000
--- a/apps/labrinth/.sqlx/query-9ccaf8ea52b1b6f0880d34cdb4a9405e28c265bef6121b457c4f39cacf00683f.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n UPDATE shared_instances\n SET title = $1\n WHERE id = $2\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Varchar",
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "9ccaf8ea52b1b6f0880d34cdb4a9405e28c265bef6121b457c4f39cacf00683f"
-}
diff --git a/apps/labrinth/.sqlx/query-aec58041cf5e5e68501652336581b8c709645ef29f3b5fb6e8e07fc212b36798.json b/apps/labrinth/.sqlx/query-aec58041cf5e5e68501652336581b8c709645ef29f3b5fb6e8e07fc212b36798.json
deleted file mode 100644
index 2c517f367f..0000000000
--- a/apps/labrinth/.sqlx/query-aec58041cf5e5e68501652336581b8c709645ef29f3b5fb6e8e07fc212b36798.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT shared_instance_id, user_id, permissions\n FROM shared_instance_users\n WHERE shared_instance_id = ANY($1)\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "shared_instance_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "user_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "permissions",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8Array"
- ]
- },
- "nullable": [
- false,
- false,
- false
- ]
- },
- "hash": "aec58041cf5e5e68501652336581b8c709645ef29f3b5fb6e8e07fc212b36798"
-}
diff --git a/apps/labrinth/.sqlx/query-b93253bbc35b24974d13bc8ee0447be2a18275f33f8991d910f693fbcc1ff731.json b/apps/labrinth/.sqlx/query-b93253bbc35b24974d13bc8ee0447be2a18275f33f8991d910f693fbcc1ff731.json
deleted file mode 100644
index a997130261..0000000000
--- a/apps/labrinth/.sqlx/query-b93253bbc35b24974d13bc8ee0447be2a18275f33f8991d910f693fbcc1ff731.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT id, shared_instance_id, size, sha512, created\n FROM shared_instance_versions\n WHERE id = $1\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "id",
- "type_info": "Int8"
- },
- {
- "ordinal": 1,
- "name": "shared_instance_id",
- "type_info": "Int8"
- },
- {
- "ordinal": 2,
- "name": "size",
- "type_info": "Int8"
- },
- {
- "ordinal": 3,
- "name": "sha512",
- "type_info": "Bytea"
- },
- {
- "ordinal": 4,
- "name": "created",
- "type_info": "Timestamptz"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- false,
- false,
- false,
- false,
- false
- ]
- },
- "hash": "b93253bbc35b24974d13bc8ee0447be2a18275f33f8991d910f693fbcc1ff731"
-}
diff --git a/apps/labrinth/.sqlx/query-c3869a595693757ccf81085d0c8eb2231578aff18c93d02ead97c3c07f0b27ea.json b/apps/labrinth/.sqlx/query-c3869a595693757ccf81085d0c8eb2231578aff18c93d02ead97c3c07f0b27ea.json
deleted file mode 100644
index b710ec2d4d..0000000000
--- a/apps/labrinth/.sqlx/query-c3869a595693757ccf81085d0c8eb2231578aff18c93d02ead97c3c07f0b27ea.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT permissions\n FROM shared_instance_users\n WHERE shared_instance_id = $1 AND user_id = $2\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "permissions",
- "type_info": "Int8"
- }
- ],
- "parameters": {
- "Left": [
- "Int8",
- "Int8"
- ]
- },
- "nullable": [
- false
- ]
- },
- "hash": "c3869a595693757ccf81085d0c8eb2231578aff18c93d02ead97c3c07f0b27ea"
-}
diff --git a/apps/labrinth/.sqlx/query-cef730c02bb67b0536d35e5aaca0bd34c3893e8b55bbd126a988137ec7bf1ff9.json b/apps/labrinth/.sqlx/query-cef730c02bb67b0536d35e5aaca0bd34c3893e8b55bbd126a988137ec7bf1ff9.json
deleted file mode 100644
index d48180d910..0000000000
--- a/apps/labrinth/.sqlx/query-cef730c02bb67b0536d35e5aaca0bd34c3893e8b55bbd126a988137ec7bf1ff9.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n DELETE FROM shared_instances\n WHERE id = $1\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "cef730c02bb67b0536d35e5aaca0bd34c3893e8b55bbd126a988137ec7bf1ff9"
-}
diff --git a/apps/labrinth/.sqlx/query-d8558a8039ade3b383db4f0e095e6826f46c27ab3a21520e9e169fd1491521c4.json b/apps/labrinth/.sqlx/query-d8558a8039ade3b383db4f0e095e6826f46c27ab3a21520e9e169fd1491521c4.json
deleted file mode 100644
index 81eef99323..0000000000
--- a/apps/labrinth/.sqlx/query-d8558a8039ade3b383db4f0e095e6826f46c27ab3a21520e9e169fd1491521c4.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "SELECT EXISTS(SELECT 1 FROM shared_instances WHERE id=$1)",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "exists",
- "type_info": "Bool"
- }
- ],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": [
- null
- ]
- },
- "hash": "d8558a8039ade3b383db4f0e095e6826f46c27ab3a21520e9e169fd1491521c4"
-}
diff --git a/apps/labrinth/.sqlx/query-d8a1d710f86b3df4d99c2d2ec26ec405531e4270be85087122245991ec88473e.json b/apps/labrinth/.sqlx/query-d8a1d710f86b3df4d99c2d2ec26ec405531e4270be85087122245991ec88473e.json
deleted file mode 100644
index 0e0bb268f5..0000000000
--- a/apps/labrinth/.sqlx/query-d8a1d710f86b3df4d99c2d2ec26ec405531e4270be85087122245991ec88473e.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n INSERT INTO shared_instance_versions (id, shared_instance_id, size, sha512, created)\n VALUES ($1, $2, $3, $4, $5)\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8",
- "Int8",
- "Int8",
- "Bytea",
- "Timestamptz"
- ]
- },
- "nullable": []
- },
- "hash": "d8a1d710f86b3df4d99c2d2ec26ec405531e4270be85087122245991ec88473e"
-}
diff --git a/apps/labrinth/.sqlx/query-d926d015cece307da567ac44b84d3e7416723ff95fcd83587f113621a9887420.json b/apps/labrinth/.sqlx/query-d926d015cece307da567ac44b84d3e7416723ff95fcd83587f113621a9887420.json
deleted file mode 100644
index f53ab8e175..0000000000
--- a/apps/labrinth/.sqlx/query-d926d015cece307da567ac44b84d3e7416723ff95fcd83587f113621a9887420.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n\t\t\t\tDELETE FROM shared_instance_users\n\t\t\t\tWHERE user_id = $1\n\t\t\t\t",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "d926d015cece307da567ac44b84d3e7416723ff95fcd83587f113621a9887420"
-}
diff --git a/apps/labrinth/.sqlx/query-f6388b5026e25191840d1a157a9ed48aaedab5db381f4efc389b852d9020a0e6.json b/apps/labrinth/.sqlx/query-f6388b5026e25191840d1a157a9ed48aaedab5db381f4efc389b852d9020a0e6.json
deleted file mode 100644
index c8514e0a30..0000000000
--- a/apps/labrinth/.sqlx/query-f6388b5026e25191840d1a157a9ed48aaedab5db381f4efc389b852d9020a0e6.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n UPDATE shared_instances\n SET current_version_id = (\n SELECT id FROM shared_instance_versions\n WHERE shared_instance_id = $1\n ORDER BY created DESC\n LIMIT 1\n )\n WHERE id = $1\n ",
- "describe": {
- "columns": [],
- "parameters": {
- "Left": [
- "Int8"
- ]
- },
- "nullable": []
- },
- "hash": "f6388b5026e25191840d1a157a9ed48aaedab5db381f4efc389b852d9020a0e6"
-}
diff --git a/apps/labrinth/migrations/20260714120000_drop-shared-instances.sql b/apps/labrinth/migrations/20260714120000_drop-shared-instances.sql
new file mode 100644
index 0000000000..173785d26f
--- /dev/null
+++ b/apps/labrinth/migrations/20260714120000_drop-shared-instances.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS shared_instance_versions CASCADE;
+DROP TABLE IF EXISTS shared_instance_invite_links CASCADE;
+DROP TABLE IF EXISTS shared_instance_invited_users CASCADE;
+DROP TABLE IF EXISTS shared_instance_users CASCADE;
+DROP TABLE IF EXISTS shared_instances CASCADE;
diff --git a/apps/labrinth/src/database/models/ids.rs b/apps/labrinth/src/database/models/ids.rs
index 6a6f5936b3..2a638326c6 100644
--- a/apps/labrinth/src/database/models/ids.rs
+++ b/apps/labrinth/src/database/models/ids.rs
@@ -5,9 +5,8 @@ use crate::models::ids::{
ChargeId, CollectionId, FileId, ImageId, NotificationId,
OAuthAccessTokenId, OAuthClientAuthorizationId, OAuthClientId,
OAuthRedirectUriId, OrganizationId, PasskeyId, PatId, PayoutId, ProductId,
- ProductPriceId, ProjectId, ReportId, SessionId, SharedInstanceId,
- SharedInstanceVersionId, TeamId, TeamMemberId, ThreadId, ThreadMessageId,
- UserSubscriptionId, VersionId,
+ ProductPriceId, ProjectId, ReportId, SessionId, TeamId, TeamMemberId,
+ ThreadId, ThreadMessageId, UserSubscriptionId, VersionId,
};
use ariadne::ids::base62_impl::to_base62;
use ariadne::ids::{UserId, random_base62_rng, random_base62_rng_range};
@@ -238,14 +237,6 @@ db_id_interface!(
SessionId,
generator: generate_session_id @ "sessions",
);
-db_id_interface!(
- SharedInstanceId,
- generator: generate_shared_instance_id @ "shared_instances",
-);
-db_id_interface!(
- SharedInstanceVersionId,
- generator: generate_shared_instance_version_id @ "shared_instance_versions",
-);
db_id_interface!(
TeamId,
generator: generate_team_id @ "teams",
diff --git a/apps/labrinth/src/database/models/mod.rs b/apps/labrinth/src/database/models/mod.rs
index a499f33d2f..a96b96d820 100644
--- a/apps/labrinth/src/database/models/mod.rs
+++ b/apps/labrinth/src/database/models/mod.rs
@@ -32,7 +32,6 @@ pub mod products_tax_identifier_item;
pub mod project_item;
pub mod report_item;
pub mod session_item;
-pub mod shared_instance_item;
pub mod team_item;
pub mod thread_item;
pub mod user_item;
diff --git a/apps/labrinth/src/database/models/shared_instance_item.rs b/apps/labrinth/src/database/models/shared_instance_item.rs
deleted file mode 100644
index 896297fbe7..0000000000
--- a/apps/labrinth/src/database/models/shared_instance_item.rs
+++ /dev/null
@@ -1,336 +0,0 @@
-use crate::database::PgTransaction;
-use crate::database::models::{
- DBSharedInstanceId, DBSharedInstanceVersionId, DBUserId,
-};
-use crate::database::redis::RedisPool;
-use crate::models::shared_instances::SharedInstanceUserPermissions;
-use chrono::{DateTime, Utc};
-use dashmap::DashMap;
-use futures_util::TryStreamExt;
-use serde::{Deserialize, Serialize};
-
-//region shared_instances
-pub struct DBSharedInstance {
- pub id: DBSharedInstanceId,
- pub title: String,
- pub owner_id: DBUserId,
- pub public: bool,
- pub current_version_id: Option,
-}
-
-struct SharedInstanceQueryResult {
- id: i64,
- title: String,
- owner_id: i64,
- public: bool,
- current_version_id: Option,
-}
-
-impl From for DBSharedInstance {
- fn from(val: SharedInstanceQueryResult) -> Self {
- DBSharedInstance {
- id: DBSharedInstanceId(val.id),
- title: val.title,
- owner_id: DBUserId(val.owner_id),
- public: val.public,
- current_version_id: val
- .current_version_id
- .map(DBSharedInstanceVersionId),
- }
- }
-}
-
-impl DBSharedInstance {
- pub async fn insert(
- &self,
- transaction: &mut PgTransaction<'_>,
- ) -> Result<(), sqlx::Error> {
- sqlx::query!(
- "
- INSERT INTO shared_instances (id, title, owner_id, current_version_id)
- VALUES ($1, $2, $3, $4)
- ",
- self.id as DBSharedInstanceId,
- self.title,
- self.owner_id as DBUserId,
- self.current_version_id.map(|x| x.0),
- )
- .execute(&mut *transaction)
- .await?;
-
- Ok(())
- }
-
- pub async fn get(
- id: DBSharedInstanceId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- ) -> Result, sqlx::Error> {
- let result = sqlx::query_as!(
- SharedInstanceQueryResult,
- "
- SELECT id, title, owner_id, public, current_version_id
- FROM shared_instances
- WHERE id = $1
- ",
- id.0,
- )
- .fetch_optional(exec)
- .await?;
-
- Ok(result.map(Into::into))
- }
-
- pub async fn list_for_user(
- user: DBUserId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- ) -> Result, sqlx::Error> {
- let results = sqlx::query_as!(
- SharedInstanceQueryResult,
- r#"
- -- See https://github.com/launchbadge/sqlx/issues/1266 for why we need all the "as"
- SELECT
- id as "id!",
- title as "title!",
- public as "public!",
- owner_id as "owner_id!",
- current_version_id
- FROM shared_instances
- WHERE owner_id = $1
- UNION
- SELECT
- id as "id!",
- title as "title!",
- public as "public!",
- owner_id as "owner_id!",
- current_version_id
- FROM shared_instances
- JOIN shared_instance_users ON id = shared_instance_id
- WHERE user_id = $1
- "#,
- user.0,
- )
- .fetch_all(exec)
- .await?;
-
- Ok(results.into_iter().map(Into::into).collect())
- }
-}
-//endregion
-
-//region shared_instance_users
-const USERS_NAMESPACE: &str = "shared_instance_users";
-
-#[derive(Deserialize, Serialize, Clone, Debug)]
-pub struct DBSharedInstanceUser {
- pub user_id: DBUserId,
- pub shared_instance_id: DBSharedInstanceId,
- pub permissions: SharedInstanceUserPermissions,
-}
-
-impl DBSharedInstanceUser {
- pub async fn insert(
- &self,
- transaction: &mut PgTransaction<'_>,
- ) -> Result<(), sqlx::Error> {
- sqlx::query!(
- "
- INSERT INTO shared_instance_users (user_id, shared_instance_id, permissions)
- VALUES ($1, $2, $3)
- ",
- self.user_id as DBUserId,
- self.shared_instance_id as DBSharedInstanceId,
- self.permissions.bits() as i64,
- )
- .execute(&mut *transaction)
- .await?;
-
- Ok(())
- }
-
- pub async fn get_user_permissions(
- instance_id: DBSharedInstanceId,
- user_id: DBUserId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- ) -> Result, super::DatabaseError>
- {
- let permissions = sqlx::query!(
- "
- SELECT permissions
- FROM shared_instance_users
- WHERE shared_instance_id = $1 AND user_id = $2
- ",
- instance_id as DBSharedInstanceId,
- user_id as DBUserId,
- )
- .fetch_optional(exec)
- .await?
- .map(|x| {
- SharedInstanceUserPermissions::from_bits(x.permissions as u64)
- .unwrap_or(SharedInstanceUserPermissions::empty())
- });
-
- Ok(permissions)
- }
-
- pub async fn get_from_instance(
- instance_id: DBSharedInstanceId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- redis: &RedisPool,
- ) -> Result, super::DatabaseError> {
- Self::get_from_instance_many(&[instance_id], exec, redis).await
- }
-
- pub async fn get_from_instance_many(
- instance_ids: &[DBSharedInstanceId],
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- redis: &RedisPool,
- ) -> Result, super::DatabaseError> {
- if instance_ids.is_empty() {
- return Ok(vec![]);
- }
-
- let users = redis
- .get_cached_keys(
- USERS_NAMESPACE,
- &instance_ids.iter().map(|id| id.0).collect::>(),
- async |user_ids| {
- let users = sqlx::query!(
- "
- SELECT shared_instance_id, user_id, permissions
- FROM shared_instance_users
- WHERE shared_instance_id = ANY($1)
- ",
- &user_ids
- )
- .fetch(exec)
- .try_fold(DashMap::new(), |acc: DashMap<_, Vec<_>>, m| {
- acc.entry(m.shared_instance_id).or_default().push(
- DBSharedInstanceUser {
- user_id: DBUserId(m.user_id),
- shared_instance_id: DBSharedInstanceId(
- m.shared_instance_id,
- ),
- permissions:
- SharedInstanceUserPermissions::from_bits(
- m.permissions as u64,
- )
- .unwrap_or(
- SharedInstanceUserPermissions::empty(),
- ),
- },
- );
-
- async move { Ok(acc) }
- })
- .await?;
-
- Ok(users)
- },
- )
- .await?;
-
- Ok(users.into_iter().flatten().collect())
- }
-
- pub async fn clear_cache(
- instance_id: DBSharedInstanceId,
- redis: &RedisPool,
- ) -> Result<(), super::DatabaseError> {
- let mut redis = redis.connect().await?;
- redis.delete(USERS_NAMESPACE, instance_id.0).await?;
- Ok(())
- }
-}
-//endregion
-
-//region shared_instance_versions
-pub struct DBSharedInstanceVersion {
- pub id: DBSharedInstanceVersionId,
- pub shared_instance_id: DBSharedInstanceId,
- pub size: u64,
- pub sha512: Vec,
- pub created: DateTime,
-}
-
-struct SharedInstanceVersionQueryResult {
- id: i64,
- shared_instance_id: i64,
- size: i64,
- sha512: Vec,
- created: DateTime,
-}
-
-impl From for DBSharedInstanceVersion {
- fn from(val: SharedInstanceVersionQueryResult) -> Self {
- DBSharedInstanceVersion {
- id: DBSharedInstanceVersionId(val.id),
- shared_instance_id: DBSharedInstanceId(val.shared_instance_id),
- size: val.size as u64,
- sha512: val.sha512,
- created: val.created,
- }
- }
-}
-
-impl DBSharedInstanceVersion {
- pub async fn insert(
- &self,
- transaction: &mut PgTransaction<'_>,
- ) -> Result<(), sqlx::Error> {
- sqlx::query!(
- "
- INSERT INTO shared_instance_versions (id, shared_instance_id, size, sha512, created)
- VALUES ($1, $2, $3, $4, $5)
- ",
- self.id as DBSharedInstanceVersionId,
- self.shared_instance_id as DBSharedInstanceId,
- self.size as i64,
- self.sha512,
- self.created,
- )
- .execute(&mut *transaction)
- .await?;
-
- Ok(())
- }
-
- pub async fn get(
- id: DBSharedInstanceVersionId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- ) -> Result, sqlx::Error> {
- let result = sqlx::query_as!(
- SharedInstanceVersionQueryResult,
- "
- SELECT id, shared_instance_id, size, sha512, created
- FROM shared_instance_versions
- WHERE id = $1
- ",
- id as DBSharedInstanceVersionId,
- )
- .fetch_optional(exec)
- .await?;
-
- Ok(result.map(Into::into))
- }
-
- pub async fn get_for_instance(
- instance_id: DBSharedInstanceId,
- exec: impl crate::database::Executor<'_, Database = sqlx::Postgres>,
- ) -> Result, sqlx::Error> {
- let results = sqlx::query_as!(
- SharedInstanceVersionQueryResult,
- "
- SELECT id, shared_instance_id, size, sha512, created
- FROM shared_instance_versions
- WHERE shared_instance_id = $1
- ORDER BY created DESC
- ",
- instance_id as DBSharedInstanceId,
- )
- .fetch_all(exec)
- .await?;
-
- Ok(results.into_iter().map(Into::into).collect())
- }
-}
-//endregion
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 3c45787e31..bd66a9e4ad 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -631,19 +631,6 @@ impl DBUser {
.await
.wrap_err("failed to update versions author_id")?;
- sqlx::query!(
- "
- UPDATE shared_instances
- SET owner_id = $1
- WHERE owner_id = $2
- ",
- deleted_user as DBUserId,
- id as DBUserId,
- )
- .execute(&mut *transaction)
- .await
- .wrap_err("failed to update shared_instances owner_id")?;
-
use futures::TryStreamExt;
let notifications: Vec = sqlx::query!(
"
@@ -1009,28 +996,6 @@ impl DBUser {
.await
.wrap_err("failed to delete oauth_client_authorizations")?;
- sqlx::query!(
- "
- DELETE FROM shared_instance_users
- WHERE user_id = $1
- ",
- id as DBUserId,
- )
- .execute(&mut *transaction)
- .await
- .wrap_err("failed to delete shared_instance_users")?;
-
- sqlx::query!(
- "
- DELETE FROM shared_instance_invited_users
- WHERE invited_user_id = $1
- ",
- id as DBUserId,
- )
- .execute(&mut *transaction)
- .await
- .wrap_err("failed to delete shared_instance_invited_users")?;
-
sqlx::query!(
"
UPDATE users_redeemals
diff --git a/apps/labrinth/src/models/mod.rs b/apps/labrinth/src/models/mod.rs
index f80f4de9ee..c39de80557 100644
--- a/apps/labrinth/src/models/mod.rs
+++ b/apps/labrinth/src/models/mod.rs
@@ -18,7 +18,6 @@ pub use v3::payouts;
pub use v3::projects;
pub use v3::reports;
pub use v3::sessions;
-pub use v3::shared_instances;
pub use v3::teams;
pub use v3::threads;
pub use v3::users;
diff --git a/apps/labrinth/src/models/v3/ids.rs b/apps/labrinth/src/models/v3/ids.rs
index 6a5a1ac7fa..292c253b7f 100644
--- a/apps/labrinth/src/models/v3/ids.rs
+++ b/apps/labrinth/src/models/v3/ids.rs
@@ -19,8 +19,6 @@ base62_id!(ProductPriceId);
base62_id!(ProjectId);
base62_id!(ReportId);
base62_id!(SessionId);
-base62_id!(SharedInstanceId);
-base62_id!(SharedInstanceVersionId);
base62_id!(TeamId);
base62_id!(TeamMemberId);
base62_id!(ThreadId);
diff --git a/apps/labrinth/src/models/v3/mod.rs b/apps/labrinth/src/models/v3/mod.rs
index 9e6abbd063..8925b7caec 100644
--- a/apps/labrinth/src/models/v3/mod.rs
+++ b/apps/labrinth/src/models/v3/mod.rs
@@ -15,7 +15,6 @@ pub mod payouts;
pub mod projects;
pub mod reports;
pub mod sessions;
-pub mod shared_instances;
pub mod teams;
pub mod threads;
pub mod user_limits;
diff --git a/apps/labrinth/src/models/v3/shared_instances.rs b/apps/labrinth/src/models/v3/shared_instances.rs
deleted file mode 100644
index a97003ad1e..0000000000
--- a/apps/labrinth/src/models/v3/shared_instances.rs
+++ /dev/null
@@ -1,89 +0,0 @@
-use crate::bitflags_serde_impl;
-use crate::database::models::shared_instance_item::{
- DBSharedInstance, DBSharedInstanceUser, DBSharedInstanceVersion,
-};
-use crate::models::ids::{SharedInstanceId, SharedInstanceVersionId};
-use ariadne::ids::UserId;
-use bitflags::bitflags;
-use chrono::{DateTime, Utc};
-use hex::ToHex;
-use serde::{Deserialize, Serialize};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SharedInstance {
- pub id: SharedInstanceId,
- pub title: String,
- pub owner: UserId,
- pub public: bool,
- pub current_version: Option,
- #[serde(skip_serializing_if = "Option::is_none")]
- pub additional_users: Option>,
-}
-
-impl SharedInstance {
- pub fn from_db(
- instance: DBSharedInstance,
- users: Option>,
- current_version: Option,
- ) -> Self {
- SharedInstance {
- id: instance.id.into(),
- title: instance.title,
- owner: instance.owner_id.into(),
- public: instance.public,
- current_version: current_version.map(Into::into),
- additional_users: users
- .map(|x| x.into_iter().map(Into::into).collect()),
- }
- }
-}
-
-#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
-pub struct SharedInstanceVersion {
- pub id: SharedInstanceVersionId,
- pub shared_instance: SharedInstanceId,
- pub size: u64,
- pub sha512: String,
- pub created: DateTime,
-}
-
-impl From for SharedInstanceVersion {
- fn from(value: DBSharedInstanceVersion) -> Self {
- let version_id = value.id.into();
- let shared_instance_id = value.shared_instance_id.into();
- SharedInstanceVersion {
- id: version_id,
- shared_instance: shared_instance_id,
- size: value.size,
- sha512: value.sha512.encode_hex(),
- created: value.created,
- }
- }
-}
-
-bitflags! {
- #[derive(Copy, Clone, Debug)]
- pub struct SharedInstanceUserPermissions: u64 {
- const EDIT = 1 << 0;
- const DELETE = 1 << 1;
- const UPLOAD_VERSION = 1 << 2;
- const DELETE_VERSION = 1 << 3;
- }
-}
-
-bitflags_serde_impl!(SharedInstanceUserPermissions, u64);
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct SharedInstanceUser {
- pub user: UserId,
- pub permissions: SharedInstanceUserPermissions,
-}
-
-impl From for SharedInstanceUser {
- fn from(user: DBSharedInstanceUser) -> Self {
- SharedInstanceUser {
- user: user.user_id.into(),
- permissions: user.permissions,
- }
- }
-}
diff --git a/apps/labrinth/src/routes/v3/mod.rs b/apps/labrinth/src/routes/v3/mod.rs
index b859510c24..e16172a0a9 100644
--- a/apps/labrinth/src/routes/v3/mod.rs
+++ b/apps/labrinth/src/routes/v3/mod.rs
@@ -17,8 +17,6 @@ pub mod payouts;
pub mod project_creation;
pub mod projects;
pub mod reports;
-pub mod shared_instance_version_creation;
-pub mod shared_instances;
pub mod statistics;
pub mod tags;
pub mod teams;
@@ -60,8 +58,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
.service(payouts::tremendous_webhook)
.configure(projects::config)
.configure(reports::config)
- .configure(shared_instance_version_creation::config)
- .configure(shared_instances::config)
.configure(statistics::config)
.configure(tags::config)
.configure(teams::config)
@@ -175,16 +171,6 @@ pub fn config(cfg: &mut web::ServiceConfig) {
reports::report_get_route,
reports::report_edit_route,
reports::report_delete_route,
- shared_instance_version_creation::shared_instance_version_create,
- shared_instances::shared_instance_create,
- shared_instances::shared_instance_list,
- shared_instances::shared_instance_get,
- shared_instances::shared_instance_edit,
- shared_instances::shared_instance_delete,
- shared_instances::shared_instance_version_list,
- shared_instances::shared_instance_version_get,
- shared_instances::shared_instance_version_delete,
- shared_instances::shared_instance_version_download,
statistics::get_stats_route,
tags::games_list_route,
tags::category_list_route,
diff --git a/apps/labrinth/src/routes/v3/shared_instance_version_creation.rs b/apps/labrinth/src/routes/v3/shared_instance_version_creation.rs
deleted file mode 100644
index 6e9d57b834..0000000000
--- a/apps/labrinth/src/routes/v3/shared_instance_version_creation.rs
+++ /dev/null
@@ -1,219 +0,0 @@
-use crate::auth::get_user_from_headers;
-use crate::database::models::shared_instance_item::{
- DBSharedInstance, DBSharedInstanceUser, DBSharedInstanceVersion,
-};
-use crate::database::models::{
- DBSharedInstanceId, DBSharedInstanceVersionId,
- generate_shared_instance_version_id,
-};
-use crate::database::redis::RedisPool;
-use crate::database::{PgPool, PgTransaction};
-use crate::file_hosting::{FileHost, FileHostPublicity};
-use crate::models::ids::{SharedInstanceId, SharedInstanceVersionId};
-use crate::models::pats::Scopes;
-use crate::models::shared_instances::{
- SharedInstanceUserPermissions, SharedInstanceVersion,
-};
-use crate::queue::session::AuthQueue;
-use crate::routes::ApiError;
-use crate::routes::v3::project_creation::UploadedFile;
-use crate::util::ext::MRPACK_MIME_TYPE;
-use actix_web::http::header::ContentLength;
-use actix_web::web::Data;
-use actix_web::{HttpRequest, HttpResponse, post, web};
-use bytes::BytesMut;
-use chrono::Utc;
-use futures_util::StreamExt;
-use hex::FromHex;
-
-const MAX_FILE_SIZE: usize = 500 * 1024 * 1024;
-const MAX_FILE_SIZE_TEXT: &str = "500 MB";
-
-pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
- cfg.service(shared_instance_version_create);
-}
-
-/// Create a shared instance version.
-#[utoipa::path(
- tag = "versions",
- post,
- params(
- ("id" = SharedInstanceId, Path, description = "The ID of the shared instance")
- ),
- request_body(content = Vec, content_type = "application/octet-stream"),
- responses(
- (status = 201, description = "Expected response to a valid request", body = SharedInstanceVersion),
- (status = 400, description = "Request was invalid, see given error"),
- (
- status = 401,
- description = "Incorrect token scopes or no authorization to access the requested item(s)"
- ),
- (
- status = 404,
- description = "The requested item(s) were not found or no authorization to access the requested item(s)"
- )
- ),
- security(("bearer_auth" = ["SHARED_INSTANCE_VERSION_CREATE"]))
-)]
-#[post("/shared-instance/{id}/version")]
-#[allow(clippy::too_many_arguments)]
-pub async fn shared_instance_version_create(
- req: HttpRequest,
- pool: Data,
- payload: web::Payload,
- web::Header(ContentLength(content_length)): web::Header,
- redis: Data,
- file_host: Data,
- info: web::Path<(SharedInstanceId,)>,
- session_queue: Data,
-) -> Result {
- if content_length > MAX_FILE_SIZE {
- return Err(ApiError::InvalidInput(format!(
- "File size exceeds the maximum limit of {MAX_FILE_SIZE_TEXT}"
- )));
- }
-
- let mut transaction = pool.begin().await?;
- let mut uploaded_files = vec![];
-
- let result = shared_instance_version_create_inner(
- req,
- &pool,
- payload,
- content_length,
- &redis,
- &**file_host,
- info.into_inner().0.into(),
- &session_queue,
- &mut transaction,
- &mut uploaded_files,
- )
- .await;
-
- if result.is_err() {
- let undo_result = super::project_creation::undo_uploads(
- &**file_host,
- &uploaded_files,
- )
- .await;
- let rollback_result = transaction.rollback().await;
-
- undo_result?;
- if let Err(e) = rollback_result {
- return Err(e.into());
- }
- } else {
- transaction.commit().await?;
- }
-
- result
-}
-
-#[allow(clippy::too_many_arguments)]
-async fn shared_instance_version_create_inner(
- req: HttpRequest,
- pool: &PgPool,
- mut payload: web::Payload,
- content_length: usize,
- redis: &RedisPool,
- file_host: &dyn FileHost,
- instance_id: DBSharedInstanceId,
- session_queue: &AuthQueue,
- transaction: &mut PgTransaction<'_>,
- uploaded_files: &mut Vec,
-) -> Result {
- let user = get_user_from_headers(
- &req,
- pool,
- redis,
- session_queue,
- Scopes::SHARED_INSTANCE_VERSION_CREATE,
- )
- .await?
- .1;
-
- let Some(instance) = DBSharedInstance::get(instance_id, pool).await? else {
- return Err(ApiError::NotFound);
- };
- if !user.role.is_mod() && instance.owner_id != user.id.into() {
- let permissions = DBSharedInstanceUser::get_user_permissions(
- instance_id,
- user.id.into(),
- pool,
- )
- .await?;
- if let Some(permissions) = permissions {
- if !permissions
- .contains(SharedInstanceUserPermissions::UPLOAD_VERSION)
- {
- return Err(ApiError::CustomAuthentication(
- "You do not have permission to upload a version for this shared instance.".to_string()
- ));
- }
- } else {
- return Err(ApiError::NotFound);
- }
- }
-
- let version_id =
- generate_shared_instance_version_id(&mut *transaction).await?;
-
- let mut file_data = BytesMut::new();
- while let Some(chunk) = payload.next().await {
- let chunk = chunk.map_err(|_| {
- ApiError::InvalidInput(
- "Unable to parse bytes in payload sent!".to_string(),
- )
- })?;
-
- if file_data.len() + chunk.len() <= MAX_FILE_SIZE {
- file_data.extend_from_slice(&chunk);
- } else {
- file_data
- .extend_from_slice(&chunk[..MAX_FILE_SIZE - file_data.len()]);
- break;
- }
- }
-
- let file_data = file_data.freeze();
- let file_path = format!(
- "shared_instance/{}.mrpack",
- SharedInstanceVersionId::from(version_id),
- );
-
- let upload_data = file_host
- .upload_file(
- MRPACK_MIME_TYPE,
- &file_path,
- FileHostPublicity::Private,
- file_data,
- )
- .await?;
-
- uploaded_files.push(UploadedFile {
- name: file_path,
- publicity: upload_data.file_publicity,
- });
-
- let sha512 = Vec::::from_hex(upload_data.content_sha512).unwrap();
-
- let new_version = DBSharedInstanceVersion {
- id: version_id,
- shared_instance_id: instance_id,
- size: content_length as u64,
- sha512,
- created: Utc::now(),
- };
- new_version.insert(transaction).await?;
-
- sqlx::query!(
- "UPDATE shared_instances SET current_version_id = $1 WHERE id = $2",
- new_version.id as DBSharedInstanceVersionId,
- instance_id as DBSharedInstanceId,
- )
- .execute(&mut *transaction)
- .await?;
-
- let version: SharedInstanceVersion = new_version.into();
- Ok(HttpResponse::Created().json(version))
-}
diff --git a/apps/labrinth/src/routes/v3/shared_instances.rs b/apps/labrinth/src/routes/v3/shared_instances.rs
deleted file mode 100644
index 4c3debc126..0000000000
--- a/apps/labrinth/src/routes/v3/shared_instances.rs
+++ /dev/null
@@ -1,628 +0,0 @@
-use crate::auth::get_user_from_headers;
-use crate::auth::validate::get_maybe_user_from_headers;
-use crate::database::PgPool;
-use crate::database::models::shared_instance_item::{
- DBSharedInstance, DBSharedInstanceUser, DBSharedInstanceVersion,
-};
-use crate::database::models::{
- DBSharedInstanceId, DBSharedInstanceVersionId, generate_shared_instance_id,
-};
-use crate::database::redis::RedisPool;
-use crate::file_hosting::FileHost;
-use crate::models::ids::{SharedInstanceId, SharedInstanceVersionId};
-use crate::models::pats::Scopes;
-use crate::models::shared_instances::{
- SharedInstance, SharedInstanceUserPermissions, SharedInstanceVersion,
-};
-use crate::models::users::User;
-use crate::queue::session::AuthQueue;
-use crate::routes::ApiError;
-use crate::util::routes::read_typed_from_payload;
-use actix_web::web::{Data, Redirect};
-use actix_web::{HttpRequest, HttpResponse, delete, get, patch, post, web};
-use futures_util::future::try_join_all;
-use serde::Deserialize;
-use validator::Validate;
-
-pub fn config(cfg: &mut actix_web::web::ServiceConfig) {
- cfg.service(shared_instance_create)
- .service(shared_instance_list)
- .service(shared_instance_get)
- .service(shared_instance_edit)
- .service(shared_instance_delete)
- .service(shared_instance_version_list)
- .service(shared_instance_version_get)
- .service(shared_instance_version_delete)
- .service(shared_instance_version_download);
-}
-
-#[derive(Deserialize, Validate, utoipa::ToSchema)]
-pub struct CreateSharedInstance {
- #[validate(
- length(min = 3, max = 64),
- custom(function = "crate::util::validate::validate_name")
- )]
- pub title: String,
- #[serde(default)]
- pub public: bool,
-}
-
-#[utoipa::path(
- tag = "shared instances",
- request_body = CreateSharedInstance,
- responses((status = OK))
-)]
-#[post("/shared-instance")]
-pub async fn shared_instance_create(
- req: HttpRequest,
- pool: Data,
- mut body: web::Payload,
- redis: Data,
- session_queue: Data,
-) -> Result {
- let new_instance: CreateSharedInstance =
- read_typed_from_payload(&mut body).await?;
-
- let mut transaction = pool.begin().await?;
-
- let user = get_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_CREATE,
- )
- .await?
- .1;
-
- let id = generate_shared_instance_id(&mut transaction).await?;
-
- let instance = DBSharedInstance {
- id,
- title: new_instance.title,
- owner_id: user.id.into(),
- public: new_instance.public,
- current_version_id: None,
- };
- instance.insert(&mut transaction).await?;
-
- transaction.commit().await?;
-
- Ok(HttpResponse::Created().json(SharedInstance {
- id: id.into(),
- title: instance.title,
- owner: user.id,
- public: instance.public,
- current_version: None,
- additional_users: Some(vec![]),
- }))
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = OK)))]
-#[get("/shared-instance")]
-pub async fn shared_instance_list(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- session_queue: Data,
-) -> Result {
- let user = get_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_READ,
- )
- .await?
- .1;
-
- // TODO: Something for moderators to be able to see all instances?
- let instances =
- DBSharedInstance::list_for_user(user.id.into(), &**pool).await?;
- let instances = try_join_all(instances.into_iter().map(
- async |instance| -> Result {
- let version = if let Some(version_id) = instance.current_version_id
- {
- DBSharedInstanceVersion::get(version_id, &**pool).await?
- } else {
- None
- };
- let instance_id = instance.id;
- Ok(SharedInstance::from_db(
- instance,
- Some(
- DBSharedInstanceUser::get_from_instance(
- instance_id,
- &**pool,
- &redis,
- )
- .await?,
- ),
- version,
- ))
- },
- ))
- .await?;
-
- Ok(HttpResponse::Ok().json(instances))
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = OK)))]
-#[get("/shared-instance/{id}")]
-pub async fn shared_instance_get(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- info: web::Path<(SharedInstanceId,)>,
- session_queue: Data,
-) -> Result {
- let id = info.into_inner().0.into();
-
- let user = get_maybe_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_READ,
- )
- .await?
- .map(|(_, user)| user);
-
- let shared_instance = DBSharedInstance::get(id, &**pool).await?;
-
- if let Some(shared_instance) = shared_instance {
- let users =
- DBSharedInstanceUser::get_from_instance(id, &**pool, &redis)
- .await?;
-
- let privately_accessible = user.is_some_and(|user| {
- can_access_instance_privately(&shared_instance, &users, &user)
- });
- if !shared_instance.public && !privately_accessible {
- return Err(ApiError::NotFound);
- }
-
- let current_version =
- if let Some(version_id) = shared_instance.current_version_id {
- DBSharedInstanceVersion::get(version_id, &**pool).await?
- } else {
- None
- };
- let shared_instance = SharedInstance::from_db(
- shared_instance,
- privately_accessible.then_some(users),
- current_version,
- );
-
- Ok(HttpResponse::Ok().json(shared_instance))
- } else {
- Err(ApiError::NotFound)
- }
-}
-
-fn can_access_instance_privately(
- instance: &DBSharedInstance,
- users: &[DBSharedInstanceUser],
- user: &User,
-) -> bool {
- user.role.is_mod()
- || instance.owner_id == user.id.into()
- || users.iter().any(|x| x.user_id == user.id.into())
-}
-
-#[derive(Deserialize, Validate, utoipa::ToSchema)]
-pub struct EditSharedInstance {
- #[validate(
- length(min = 3, max = 64),
- custom(function = "crate::util::validate::validate_name")
- )]
- pub title: Option,
- pub public: Option,
-}
-
-#[utoipa::path(
- tag = "shared instances",
- request_body = EditSharedInstance,
- responses((status = NO_CONTENT))
-)]
-#[patch("/shared-instance/{id}")]
-pub async fn shared_instance_edit(
- req: HttpRequest,
- pool: Data,
- mut body: web::Payload,
- redis: Data,
- info: web::Path<(SharedInstanceId,)>,
- session_queue: Data,
-) -> Result {
- let id = info.into_inner().0.into();
- let edit_instance: EditSharedInstance =
- read_typed_from_payload(&mut body).await?;
-
- let mut transaction = pool.begin().await?;
-
- let user = get_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_WRITE,
- )
- .await?
- .1;
-
- let Some(instance) = DBSharedInstance::get(id, &**pool).await? else {
- return Err(ApiError::NotFound);
- };
-
- if !user.role.is_mod() && instance.owner_id != user.id.into() {
- let permissions = DBSharedInstanceUser::get_user_permissions(
- id,
- user.id.into(),
- &**pool,
- )
- .await?;
- if let Some(permissions) = permissions {
- if !permissions.contains(SharedInstanceUserPermissions::EDIT) {
- return Err(ApiError::CustomAuthentication(
- "You do not have permission to edit this shared instance."
- .to_string(),
- ));
- }
- } else {
- return Err(ApiError::NotFound);
- }
- }
-
- if let Some(title) = edit_instance.title {
- sqlx::query!(
- "
- UPDATE shared_instances
- SET title = $1
- WHERE id = $2
- ",
- title,
- id as DBSharedInstanceId,
- )
- .execute(&mut transaction)
- .await?;
- }
-
- if let Some(public) = edit_instance.public {
- sqlx::query!(
- "
- UPDATE shared_instances
- SET public = $1
- WHERE id = $2
- ",
- public,
- id as DBSharedInstanceId,
- )
- .execute(&mut transaction)
- .await?;
- }
-
- transaction.commit().await?;
-
- Ok(HttpResponse::NoContent().body(""))
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = NO_CONTENT)))]
-#[delete("/shared-instance/{id}")]
-pub async fn shared_instance_delete(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- info: web::Path<(SharedInstanceId,)>,
- session_queue: Data,
-) -> Result {
- let id: DBSharedInstanceId = info.into_inner().0.into();
-
- let user = get_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_DELETE,
- )
- .await?
- .1;
-
- let Some(instance) = DBSharedInstance::get(id, &**pool).await? else {
- return Err(ApiError::NotFound);
- };
-
- if !user.role.is_mod() && instance.owner_id != user.id.into() {
- let permissions = DBSharedInstanceUser::get_user_permissions(
- id,
- user.id.into(),
- &**pool,
- )
- .await?;
- if let Some(permissions) = permissions {
- if !permissions.contains(SharedInstanceUserPermissions::DELETE) {
- return Err(ApiError::CustomAuthentication(
- "You do not have permission to delete this shared instance.".to_string()
- ));
- }
- } else {
- return Err(ApiError::NotFound);
- }
- }
-
- sqlx::query!(
- "
- DELETE FROM shared_instances
- WHERE id = $1
- ",
- id as DBSharedInstanceId,
- )
- .execute(&**pool)
- .await?;
-
- DBSharedInstanceUser::clear_cache(id, &redis).await?;
-
- Ok(HttpResponse::NoContent().body(""))
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = OK)))]
-#[get("/shared-instance/{id}/version")]
-pub async fn shared_instance_version_list(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- info: web::Path<(SharedInstanceId,)>,
- session_queue: Data,
-) -> Result {
- let id = info.into_inner().0.into();
-
- let user = get_maybe_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_READ,
- )
- .await?
- .map(|(_, user)| user);
-
- let shared_instance = DBSharedInstance::get(id, &**pool).await?;
-
- if let Some(shared_instance) = shared_instance {
- if !can_access_instance_as_maybe_user(
- &pool,
- &redis,
- &shared_instance,
- user,
- )
- .await?
- {
- return Err(ApiError::NotFound);
- }
-
- let versions =
- DBSharedInstanceVersion::get_for_instance(id, &**pool).await?;
- let versions = versions
- .into_iter()
- .map(Into::into)
- .collect::>();
-
- Ok(HttpResponse::Ok().json(versions))
- } else {
- Err(ApiError::NotFound)
- }
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = OK)))]
-#[get("/shared-instance-version/{id}")]
-pub async fn shared_instance_version_get(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- info: web::Path<(SharedInstanceVersionId,)>,
- session_queue: Data,
-) -> Result {
- let version_id = info.into_inner().0.into();
-
- let user = get_maybe_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_READ,
- )
- .await?
- .map(|(_, user)| user);
-
- let version = DBSharedInstanceVersion::get(version_id, &**pool).await?;
-
- if let Some(version) = version {
- let instance =
- DBSharedInstance::get(version.shared_instance_id, &**pool).await?;
- if let Some(instance) = instance {
- if !can_access_instance_as_maybe_user(
- &pool, &redis, &instance, user,
- )
- .await?
- {
- return Err(ApiError::NotFound);
- }
-
- let version: SharedInstanceVersion = version.into();
- Ok(HttpResponse::Ok().json(version))
- } else {
- Err(ApiError::NotFound)
- }
- } else {
- Err(ApiError::NotFound)
- }
-}
-
-async fn can_access_instance_as_maybe_user(
- pool: &PgPool,
- redis: &RedisPool,
- instance: &DBSharedInstance,
- user: Option,
-) -> Result {
- if instance.public {
- return Ok(true);
- }
- let users =
- DBSharedInstanceUser::get_from_instance(instance.id, pool, redis)
- .await?;
- Ok(user.is_some_and(|user| {
- can_access_instance_privately(instance, &users, &user)
- }))
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = NO_CONTENT)))]
-#[delete("/shared-instance-version/{id}")]
-pub async fn shared_instance_version_delete(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- info: web::Path<(SharedInstanceVersionId,)>,
- session_queue: Data,
-) -> Result {
- let version_id = info.into_inner().0.into();
-
- let user = get_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_VERSION_DELETE,
- )
- .await?
- .1;
-
- let shared_instance_version =
- DBSharedInstanceVersion::get(version_id, &**pool).await?;
-
- if let Some(shared_instance_version) = shared_instance_version {
- let shared_instance = DBSharedInstance::get(
- shared_instance_version.shared_instance_id,
- &**pool,
- )
- .await?;
- if let Some(shared_instance) = shared_instance {
- if !user.role.is_mod() && shared_instance.owner_id != user.id.into()
- {
- let permissions = DBSharedInstanceUser::get_user_permissions(
- shared_instance.id,
- user.id.into(),
- &**pool,
- )
- .await?;
- if let Some(permissions) = permissions {
- if !permissions
- .contains(SharedInstanceUserPermissions::DELETE)
- {
- return Err(ApiError::CustomAuthentication(
- "You do not have permission to delete this shared instance version.".to_string()
- ));
- }
- } else {
- return Err(ApiError::NotFound);
- }
- }
-
- delete_instance_version(shared_instance.id, version_id, &pool)
- .await?;
-
- Ok(HttpResponse::NoContent().body(""))
- } else {
- Err(ApiError::NotFound)
- }
- } else {
- Err(ApiError::NotFound)
- }
-}
-
-async fn delete_instance_version(
- instance_id: DBSharedInstanceId,
- version_id: DBSharedInstanceVersionId,
- pool: &PgPool,
-) -> Result<(), ApiError> {
- let mut transaction = pool.begin().await?;
-
- sqlx::query!(
- "
- DELETE FROM shared_instance_versions
- WHERE id = $1
- ",
- version_id as DBSharedInstanceVersionId,
- )
- .execute(&mut transaction)
- .await?;
-
- sqlx::query!(
- "
- UPDATE shared_instances
- SET current_version_id = (
- SELECT id FROM shared_instance_versions
- WHERE shared_instance_id = $1
- ORDER BY created DESC
- LIMIT 1
- )
- WHERE id = $1
- ",
- instance_id as DBSharedInstanceId,
- )
- .execute(&mut transaction)
- .await?;
-
- transaction.commit().await?;
- Ok(())
-}
-
-#[utoipa::path(tag = "shared instances", responses((status = TEMPORARY_REDIRECT)))]
-#[get("/shared-instance-version/{id}/download")]
-pub async fn shared_instance_version_download(
- req: HttpRequest,
- pool: Data,
- redis: Data,
- file_host: Data,
- info: web::Path<(SharedInstanceVersionId,)>,
- session_queue: Data,
-) -> Result {
- let version_id = info.into_inner().0.into();
-
- let user = get_maybe_user_from_headers(
- &req,
- &**pool,
- &redis,
- &session_queue,
- Scopes::SHARED_INSTANCE_VERSION_READ,
- )
- .await?
- .map(|(_, user)| user);
-
- let version = DBSharedInstanceVersion::get(version_id, &**pool).await?;
-
- if let Some(version) = version {
- let instance =
- DBSharedInstance::get(version.shared_instance_id, &**pool).await?;
- if let Some(instance) = instance {
- if !can_access_instance_as_maybe_user(
- &pool, &redis, &instance, user,
- )
- .await?
- {
- return Err(ApiError::NotFound);
- }
-
- let file_name = format!(
- "shared_instance/{}.mrpack",
- SharedInstanceVersionId::from(version_id)
- );
- let url =
- file_host.get_url_for_private_file(&file_name, 180).await?;
-
- Ok(Redirect::to(url).see_other())
- } else {
- Err(ApiError::NotFound)
- }
- } else {
- Err(ApiError::NotFound)
- }
-}
From 6b62e3b480fcf7890ecbbd06f375b5f7cfd8c891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
<108630700+fetchfern@users.noreply.github.com>
Date: Sat, 18 Jul 2026 19:24:52 -0400
Subject: [PATCH 03/43] fix(labrinth): register debug routes (#6766)
---
apps/labrinth/src/main.rs | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/apps/labrinth/src/main.rs b/apps/labrinth/src/main.rs
index b2ae3c5cac..9cb158bdab 100644
--- a/apps/labrinth/src/main.rs
+++ b/apps/labrinth/src/main.rs
@@ -15,10 +15,7 @@ use labrinth::search;
use labrinth::util::anrok;
use labrinth::util::gotenberg::GotenbergClient;
use labrinth::util::ratelimit::rate_limit_middleware;
-use labrinth::{app_data_config, app_fallback_config, env};
-use labrinth::{
- app_routes_config_internal, app_routes_config_v2, app_routes_config_v3,
-};
+use labrinth::{app_data_config, app_fallback_config, app_routes_config, env};
use labrinth::{clickhouse, database, file_hosting};
use scalar_api_reference::actix_web::config as scalar_config;
use serde_json::json;
@@ -275,11 +272,7 @@ async fn app() -> std::io::Result<()> {
// own - See `sentry::SentryErrorReporting` for why.
.wrap(labrinth::util::sentry::SentryErrorReporting)
.configure(|cfg| app_data_config(cfg, labrinth_config.clone()))
- .configure(|cfg| app_routes_config_v2(cfg, labrinth_config.clone()))
- .configure(|cfg| app_routes_config_v3(cfg, labrinth_config.clone()))
- .configure(|cfg| {
- app_routes_config_internal(cfg, labrinth_config.clone())
- });
+ .configure(|cfg| app_routes_config(cfg, labrinth_config.clone()));
let scalar_configuration = json!({
"sources": [
From 6b569e4ee480de639d80cf2d18079755ec89b95c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
<108630700+fetchfern@users.noreply.github.com>
Date: Sat, 18 Jul 2026 19:25:00 -0400
Subject: [PATCH 04/43] redis compression (#6769)
* feat(labrinth): encode/decode redis values with postcard, add version in namespaces
* chore(labrinth): split cache ex special cases without version
* chore(labrinth): simplify get_many
* fix: tombi
* feat(labrinth): compression support
* chore(labrinth): cleanup redis ser/de
* fix(labrinth): use get_deserialized in tests
---
Cargo.lock | 35 ++++
Cargo.toml | 7 +
apps/labrinth/Cargo.toml | 2 +
.../database/models/analytics_event_item.rs | 6 +-
.../src/database/models/categories.rs | 36 +---
.../src/database/models/collection_item.rs | 2 +-
.../labrinth/src/database/models/flow_item.rs | 7 +-
.../src/database/models/image_item.rs | 2 +-
.../src/database/models/loader_fields.rs | 58 ++----
apps/labrinth/src/database/models/mod.rs | 2 +
.../database/models/moderation_note_item.rs | 12 +-
.../src/database/models/notification_item.rs | 6 +-
.../models/notifications_template_item.rs | 25 +--
.../models/notifications_type_item.rs | 11 +-
.../src/database/models/organization_item.rs | 4 +-
apps/labrinth/src/database/models/pat_item.rs | 15 +-
.../src/database/models/product_item.rs | 9 +-
.../src/database/models/project_item.rs | 10 +-
.../src/database/models/session_item.rs | 10 +-
.../labrinth/src/database/models/team_item.rs | 2 +-
.../labrinth/src/database/models/user_item.rs | 10 +-
.../src/database/models/version_item.rs | 4 +-
apps/labrinth/src/database/redis/mod.rs | 182 ++++++++++++++----
apps/labrinth/src/env.rs | 5 +
apps/labrinth/src/models/exp/project.rs | 4 +-
apps/labrinth/src/queue/analytics/cache.rs | 4 +-
apps/labrinth/src/queue/analytics/mod.rs | 6 +-
apps/labrinth/src/queue/server_ping.rs | 16 +-
apps/labrinth/src/routes/internal/campaign.rs | 6 +-
.../routes/internal/external_notifications.rs | 2 +-
apps/labrinth/src/routes/internal/flows.rs | 2 +-
.../labrinth/src/routes/internal/gotenberg.rs | 8 +-
apps/labrinth/src/routes/v3/content/mod.rs | 8 +-
apps/labrinth/src/search/mod.rs | 2 +-
apps/labrinth/src/sync/friends.rs | 29 +--
apps/labrinth/src/sync/status.rs | 12 +-
apps/labrinth/src/util/gotenberg.rs | 4 +-
apps/labrinth/src/util/ratelimit.rs | 2 +-
apps/labrinth/tests/project.rs | 18 +-
apps/labrinth/tests/version.rs | 18 +-
40 files changed, 361 insertions(+), 242 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index ad23da4124..1c3493e8e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2133,6 +2133,15 @@ dependencies = [
"cc",
]
+[[package]]
+name = "cobs"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa961b519f0b462e3a3b4a34b64d119eeaca1d59af726fe450bbba07a9fc0a1"
+dependencies = [
+ "thiserror 2.0.17",
+]
+
[[package]]
name = "color-eyre"
version = "0.6.5"
@@ -3259,6 +3268,18 @@ version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
+[[package]]
+name = "embedded-io"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef1a6892d9eef45c8fa6b9e0086428a2cca8491aca8f787c534a3d6d0bcb3ced"
+
+[[package]]
+name = "embedded-io"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edd0f118536f44f5ccd48bcb8b111bdc3de888b58c74639dfb034a357d0f206d"
+
[[package]]
name = "encode_unicode"
version = "1.0.0"
@@ -5440,6 +5461,7 @@ dependencies = [
"json-patch 4.1.0",
"labrinth",
"lettre",
+ "lz4_flex",
"meilisearch-sdk",
"modrinth-content-management",
"modrinth-util",
@@ -5447,6 +5469,7 @@ dependencies = [
"murmur2",
"paste",
"path-util",
+ "postcard",
"prometheus",
"quick-xml 0.38.3",
"rand 0.8.5",
@@ -7492,6 +7515,18 @@ version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+[[package]]
+name = "postcard"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6764c3b5dd454e283a30e6dfe78e9b31096d9e32036b5d1eaac7a6119ccb9a24"
+dependencies = [
+ "cobs",
+ "embedded-io 0.4.0",
+ "embedded-io 0.6.1",
+ "serde",
+]
+
[[package]]
name = "potential_utf"
version = "0.1.3"
diff --git a/Cargo.toml b/Cargo.toml
index 301bed803f..a5aed6cf76 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -118,6 +118,12 @@ lettre = { version = "0.11.19", default-features = false, features = [
"tokio1",
"tokio1-rustls",
] }
+lz4_flex = { version = "0.11.5", default-features = false, features = [
+ "checked-decode",
+ "safe-decode",
+ "safe-encode",
+ "std",
+] }
maxminddb = "0.26.0"
meilisearch-sdk = { version = "0.30.0", default-features = false }
modrinth-content-management = { path = "packages/modrinth-content-management" }
@@ -135,6 +141,7 @@ paste = "1.0.15"
path-util = { path = "packages/path-util" }
phf = { version = "0.13.1", features = ["macros"] }
png = "0.18.0"
+postcard = { version = "1.1.3", default-features = false, features = ["alloc"] }
proc-macro2 = { version = "1.0" }
prometheus = "0.14.0"
quartz_nbt = "0.2.9"
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index 4f702d6bab..3da97e6fa8 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -73,6 +73,7 @@ image = { workspace = true, features = [
itertools = { workspace = true }
json-patch = { workspace = true }
lettre = { workspace = true }
+lz4_flex = { workspace = true }
meilisearch-sdk = { workspace = true, features = ["reqwest"] }
modrinth-content-management = { workspace = true }
modrinth-util = { workspace = true, features = ["decimal", "sentry", "utoipa"] }
@@ -80,6 +81,7 @@ muralpay = { workspace = true, features = ["client", "mock", "utoipa"] }
murmur2 = { workspace = true }
paste = { workspace = true }
path-util = { workspace = true }
+postcard = { workspace = true }
prometheus = { workspace = true }
quick-xml = { workspace = true }
rand = { workspace = true }
diff --git a/apps/labrinth/src/database/models/analytics_event_item.rs b/apps/labrinth/src/database/models/analytics_event_item.rs
index bcf89aa344..df9555efd5 100644
--- a/apps/labrinth/src/database/models/analytics_event_item.rs
+++ b/apps/labrinth/src/database/models/analytics_event_item.rs
@@ -11,7 +11,7 @@ use crate::{
};
use serde::{Deserialize, Serialize};
-const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events";
+const ANALYTICS_EVENTS_NAMESPACE: &str = "analytics_events:v1";
const ANALYTICS_EVENTS_ALL_KEY: &str = "all";
#[derive(Debug, Clone, Serialize, Deserialize)]
@@ -88,7 +88,7 @@ impl DBAnalyticsEvent {
let mut redis = redis.connect().await?;
if let Some(events) = redis
- .get_deserialized_from_json(
+ .get_deserialized(
ANALYTICS_EVENTS_NAMESPACE,
ANALYTICS_EVENTS_ALL_KEY,
)
@@ -119,7 +119,7 @@ impl DBAnalyticsEvent {
.await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
ANALYTICS_EVENTS_NAMESPACE,
ANALYTICS_EVENTS_ALL_KEY,
&events,
diff --git a/apps/labrinth/src/database/models/categories.rs b/apps/labrinth/src/database/models/categories.rs
index 44650d76d4..3b4a98dca4 100644
--- a/apps/labrinth/src/database/models/categories.rs
+++ b/apps/labrinth/src/database/models/categories.rs
@@ -7,7 +7,7 @@ use super::ids::*;
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
-const TAGS_NAMESPACE: &str = "tags";
+const TAGS_NAMESPACE: &str = "tags:v1";
pub struct ProjectType {
pub id: ProjectTypeId,
@@ -96,9 +96,8 @@ impl Category {
{
let mut redis = redis.connect().await?;
- let res: Option> = redis
- .get_deserialized_from_json(TAGS_NAMESPACE, "category")
- .await?;
+ let res: Option> =
+ redis.get_deserialized(TAGS_NAMESPACE, "category").await?;
if let Some(res) = res {
return Ok(res);
@@ -127,7 +126,7 @@ impl Category {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(TAGS_NAMESPACE, "category", &result, None)
+ .set_serialized(TAGS_NAMESPACE, "category", &result, None)
.await?;
Ok(result)
@@ -166,7 +165,7 @@ impl LinkPlatform {
let mut redis = redis.connect().await?;
let res: Option> = redis
- .get_deserialized_from_json(TAGS_NAMESPACE, "link_platform")
+ .get_deserialized(TAGS_NAMESPACE, "link_platform")
.await?;
if let Some(res) = res {
@@ -191,12 +190,7 @@ impl LinkPlatform {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- TAGS_NAMESPACE,
- "link_platform",
- &result,
- None,
- )
+ .set_serialized(TAGS_NAMESPACE, "link_platform", &result, None)
.await?;
Ok(result)
@@ -235,7 +229,7 @@ impl ReportType {
let mut redis = redis.connect().await?;
let res: Option> = redis
- .get_deserialized_from_json(TAGS_NAMESPACE, "report_type")
+ .get_deserialized(TAGS_NAMESPACE, "report_type")
.await?;
if let Some(res) = res {
@@ -256,12 +250,7 @@ impl ReportType {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- TAGS_NAMESPACE,
- "report_type",
- &result,
- None,
- )
+ .set_serialized(TAGS_NAMESPACE, "report_type", &result, None)
.await?;
Ok(result)
@@ -300,7 +289,7 @@ impl ProjectType {
let mut redis = redis.connect().await?;
let res: Option> = redis
- .get_deserialized_from_json(TAGS_NAMESPACE, "project_type")
+ .get_deserialized(TAGS_NAMESPACE, "project_type")
.await?;
if let Some(res) = res {
@@ -321,12 +310,7 @@ impl ProjectType {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- TAGS_NAMESPACE,
- "project_type",
- &result,
- None,
- )
+ .set_serialized(TAGS_NAMESPACE, "project_type", &result, None)
.await?;
Ok(result)
diff --git a/apps/labrinth/src/database/models/collection_item.rs b/apps/labrinth/src/database/models/collection_item.rs
index 5ca827a834..43070397d1 100644
--- a/apps/labrinth/src/database/models/collection_item.rs
+++ b/apps/labrinth/src/database/models/collection_item.rs
@@ -8,7 +8,7 @@ use dashmap::DashMap;
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
-const COLLECTIONS_NAMESPACE: &str = "collections";
+const COLLECTIONS_NAMESPACE: &str = "collections:v1";
#[derive(Clone)]
pub struct CollectionBuilder {
diff --git a/apps/labrinth/src/database/models/flow_item.rs b/apps/labrinth/src/database/models/flow_item.rs
index 2bc8dd864d..b85f64bdd7 100644
--- a/apps/labrinth/src/database/models/flow_item.rs
+++ b/apps/labrinth/src/database/models/flow_item.rs
@@ -13,10 +13,9 @@ use serde::{Deserialize, Serialize};
use url::Url;
use webauthn_rs::prelude::{DiscoverableAuthentication, PasskeyRegistration};
-const FLOWS_NAMESPACE: &str = "flows";
+const FLOWS_NAMESPACE: &str = "flows:v1";
#[derive(Deserialize, Serialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
pub enum DBFlow {
OAuth {
user_id: Option,
@@ -78,7 +77,7 @@ impl DBFlow {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
FLOWS_NAMESPACE,
&state,
&self,
@@ -109,7 +108,7 @@ impl DBFlow {
) -> Result, DatabaseError> {
let mut redis = redis.connect().await?;
- redis.get_deserialized_from_json(FLOWS_NAMESPACE, id).await
+ redis.get_deserialized(FLOWS_NAMESPACE, id).await
}
/// Gets the flow and removes it from the cache, but only removes if the flow was present and the predicate returned true
diff --git a/apps/labrinth/src/database/models/image_item.rs b/apps/labrinth/src/database/models/image_item.rs
index a65736dcf5..7f72f82bb1 100644
--- a/apps/labrinth/src/database/models/image_item.rs
+++ b/apps/labrinth/src/database/models/image_item.rs
@@ -6,7 +6,7 @@ use chrono::{DateTime, Utc};
use dashmap::DashMap;
use serde::{Deserialize, Serialize};
-const IMAGES_NAMESPACE: &str = "images";
+const IMAGES_NAMESPACE: &str = "images:v1";
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct DBImage {
diff --git a/apps/labrinth/src/database/models/loader_fields.rs b/apps/labrinth/src/database/models/loader_fields.rs
index e47735910e..38f3befd55 100644
--- a/apps/labrinth/src/database/models/loader_fields.rs
+++ b/apps/labrinth/src/database/models/loader_fields.rs
@@ -12,13 +12,14 @@ use futures::TryStreamExt;
use itertools::Itertools;
use serde::{Deserialize, Serialize};
-const GAMES_LIST_NAMESPACE: &str = "games";
-const LOADER_ID: &str = "loader_id";
-const LOADERS_LIST_NAMESPACE: &str = "loaders";
-const LOADER_FIELDS_NAMESPACE: &str = "loader_fields";
-const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all";
-const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums";
-pub const LOADER_FIELD_ENUM_VALUES_NAMESPACE: &str = "loader_field_enum_values";
+const GAMES_LIST_NAMESPACE: &str = "games:v1";
+const LOADER_ID: &str = "loader_id:v1";
+const LOADERS_LIST_NAMESPACE: &str = "loaders:v1";
+const LOADER_FIELDS_NAMESPACE: &str = "loader_fields:v1";
+const LOADER_FIELDS_NAMESPACE_ALL: &str = "loader_fields_all:v1";
+const LOADER_FIELD_ENUMS_ID_NAMESPACE: &str = "loader_field_enums:v1";
+pub const LOADER_FIELD_ENUM_VALUES_NAMESPACE: &str =
+ "loader_field_enum_values:v1";
#[derive(Clone, Serialize, Deserialize, Debug)]
pub struct Game {
@@ -54,7 +55,7 @@ impl Game {
{
let mut redis = redis.connect().await?;
let cached_games: Option> = redis
- .get_deserialized_from_json(GAMES_LIST_NAMESPACE, "games")
+ .get_deserialized(GAMES_LIST_NAMESPACE, "games")
.await?;
if let Some(cached_games) = cached_games {
return Ok(cached_games);
@@ -80,12 +81,7 @@ impl Game {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- GAMES_LIST_NAMESPACE,
- "games",
- &result,
- None,
- )
+ .set_serialized(GAMES_LIST_NAMESPACE, "games", &result, None)
.await?;
Ok(result)
@@ -114,7 +110,7 @@ impl Loader {
{
let mut redis = redis.connect().await?;
let cached_id: Option =
- redis.get_deserialized_from_json(LOADER_ID, name).await?;
+ redis.get_deserialized(LOADER_ID, name).await?;
if let Some(cached_id) = cached_id {
return Ok(Some(LoaderId(cached_id)));
}
@@ -134,7 +130,7 @@ impl Loader {
if let Some(result) = result {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(LOADER_ID, name, &result.0, None)
+ .set_serialized(LOADER_ID, name, &result.0, None)
.await?;
}
@@ -151,7 +147,7 @@ impl Loader {
{
let mut redis = redis.connect().await?;
let cached_loaders: Option> = redis
- .get_deserialized_from_json(LOADERS_LIST_NAMESPACE, "all")
+ .get_deserialized(LOADERS_LIST_NAMESPACE, "all")
.await?;
if let Some(cached_loaders) = cached_loaders {
return Ok(cached_loaders);
@@ -193,12 +189,7 @@ impl Loader {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- LOADERS_LIST_NAMESPACE,
- "all",
- &result,
- None,
- )
+ .set_serialized(LOADERS_LIST_NAMESPACE, "all", &result, None)
.await?;
Ok(result)
@@ -470,10 +461,9 @@ impl LoaderField {
{
let mut redis = redis.connect().await?;
- let cached_fields: Option> =
- redis.get(LOADER_FIELDS_NAMESPACE_ALL, "").await?.and_then(
- |x| serde_json::from_str::>(&x).ok(),
- );
+ let cached_fields: Option> = redis
+ .get_deserialized(LOADER_FIELDS_NAMESPACE_ALL, "")
+ .await?;
if let Some(cached_fields) = cached_fields {
return Ok(cached_fields);
@@ -506,12 +496,7 @@ impl LoaderField {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- LOADER_FIELDS_NAMESPACE_ALL,
- "",
- &result,
- None,
- )
+ .set_serialized(LOADER_FIELDS_NAMESPACE_ALL, "", &result, None)
.await?;
Ok(result)
@@ -530,10 +515,7 @@ impl LoaderFieldEnum {
let mut redis = redis.connect().await?;
let cached_enum = redis
- .get_deserialized_from_json(
- LOADER_FIELD_ENUMS_ID_NAMESPACE,
- enum_name,
- )
+ .get_deserialized(LOADER_FIELD_ENUMS_ID_NAMESPACE, enum_name)
.await?;
if let Some(cached_enum) = cached_enum {
return Ok(cached_enum);
@@ -561,7 +543,7 @@ impl LoaderFieldEnum {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
LOADER_FIELD_ENUMS_ID_NAMESPACE,
enum_name,
&result,
diff --git a/apps/labrinth/src/database/models/mod.rs b/apps/labrinth/src/database/models/mod.rs
index a96b96d820..2ca113b42c 100644
--- a/apps/labrinth/src/database/models/mod.rs
+++ b/apps/labrinth/src/database/models/mod.rs
@@ -76,6 +76,8 @@ pub enum DatabaseError {
RedisPool(#[from] deadpool_redis::PoolError),
#[error("Error while serializing with the cache: {0}")]
SerdeCacheError(#[from] serde_json::Error),
+ #[error("error while encoding or decoding the cache: {0}")]
+ PostcardCacheError(#[from] postcard::Error),
#[error("Schema error: {0}")]
SchemaError(String),
#[error(
diff --git a/apps/labrinth/src/database/models/moderation_note_item.rs b/apps/labrinth/src/database/models/moderation_note_item.rs
index 3df5c8c855..d20d7327e7 100644
--- a/apps/labrinth/src/database/models/moderation_note_item.rs
+++ b/apps/labrinth/src/database/models/moderation_note_item.rs
@@ -7,9 +7,9 @@ use crate::database::redis::RedisPool;
use super::{DBOrganizationId, DBUserId, DatabaseError};
-const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users";
+const MODERATION_NOTES_USERS_NAMESPACE: &str = "moderation_notes_users:v1";
const MODERATION_NOTES_ORGANIZATIONS_NAMESPACE: &str =
- "moderation_notes_organizations";
+ "moderation_notes_organizations:v1";
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct DBModerationNote {
@@ -40,7 +40,7 @@ impl DBModerationNote {
let cached = {
let mut redis = redis.connect().await?;
redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
MODERATION_NOTES_USERS_NAMESPACE,
&ids,
)
@@ -87,7 +87,7 @@ impl DBModerationNote {
if let Some(user_id) = note.user_id {
redis
- .set_serialized_to_json(
+ .set_serialized(
MODERATION_NOTES_USERS_NAMESPACE,
user_id.0,
¬e,
@@ -130,7 +130,7 @@ impl DBModerationNote {
let cached = {
let mut redis = redis.connect().await?;
redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
MODERATION_NOTES_ORGANIZATIONS_NAMESPACE,
&ids,
)
@@ -177,7 +177,7 @@ impl DBModerationNote {
if let Some(organization_id) = note.organization_id {
redis
- .set_serialized_to_json(
+ .set_serialized(
MODERATION_NOTES_ORGANIZATIONS_NAMESPACE,
organization_id.0,
¬e,
diff --git a/apps/labrinth/src/database/models/notification_item.rs b/apps/labrinth/src/database/models/notification_item.rs
index dda5b230f7..90891de843 100644
--- a/apps/labrinth/src/database/models/notification_item.rs
+++ b/apps/labrinth/src/database/models/notification_item.rs
@@ -9,7 +9,7 @@ use chrono::{DateTime, Utc};
use futures::TryStreamExt;
use serde::{Deserialize, Serialize};
-const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications";
+const USER_NOTIFICATIONS_NAMESPACE: &str = "user_notifications:v1";
pub struct NotificationBuilder {
pub body: NotificationBody,
@@ -435,7 +435,7 @@ impl DBNotification {
let mut redis = redis.connect().await?;
let cached_notifications: Option> = redis
- .get_deserialized_from_json(
+ .get_deserialized(
USER_NOTIFICATIONS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -493,7 +493,7 @@ impl DBNotification {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
USER_NOTIFICATIONS_NAMESPACE,
user_id.0,
&db_notifications,
diff --git a/apps/labrinth/src/database/models/notifications_template_item.rs b/apps/labrinth/src/database/models/notifications_template_item.rs
index 607e0d60d0..ee53bb93c5 100644
--- a/apps/labrinth/src/database/models/notifications_template_item.rs
+++ b/apps/labrinth/src/database/models/notifications_template_item.rs
@@ -4,10 +4,11 @@ use crate::models::v3::notifications::{NotificationChannel, NotificationType};
use crate::routes::ApiError;
use serde::{Deserialize, Serialize};
-const TEMPLATES_NAMESPACE: &str = "notifications_templates";
-const TEMPLATES_HTML_DATA_NAMESPACE: &str = "notifications_templates_html_data";
+const TEMPLATES_NAMESPACE: &str = "notifications_templates:v1";
+const TEMPLATES_HTML_DATA_NAMESPACE: &str =
+ "notifications_templates_html_data:v1";
const TEMPLATES_DYNAMIC_HTML_NAMESPACE: &str =
- "notifications_templates_dynamic_html";
+ "notifications_templates_dynamic_html:v1";
const HTML_DATA_CACHE_EXPIRY: i64 = 60 * 15; // 15 minutes
const TEMPLATES_CACHE_EXPIRY: i64 = 60 * 30; // 30 minutes
@@ -56,10 +57,7 @@ impl NotificationTemplate {
let mut redis = redis.connect().await?;
let maybe_cached_templates = redis
- .get_deserialized_from_json(
- TEMPLATES_NAMESPACE,
- channel.as_str(),
- )
+ .get_deserialized(TEMPLATES_NAMESPACE, channel.as_str())
.await?;
if let Some(cached) = maybe_cached_templates {
@@ -82,7 +80,7 @@ impl NotificationTemplate {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
TEMPLATES_NAMESPACE,
channel.as_str(),
&templates,
@@ -99,7 +97,7 @@ impl NotificationTemplate {
) -> Result, DatabaseError> {
let mut redis = redis.connect().await?;
redis
- .get_deserialized_from_json(
+ .get_deserialized(
TEMPLATES_HTML_DATA_NAMESPACE,
&self.id.to_string(),
)
@@ -113,7 +111,7 @@ impl NotificationTemplate {
) -> Result<(), DatabaseError> {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
TEMPLATES_HTML_DATA_NAMESPACE,
&self.id.to_string(),
&data,
@@ -138,10 +136,7 @@ where
let mut redis_conn = redis.connect().await?;
if let Some(body) = redis_conn
- .get_deserialized_from_json::(
- TEMPLATES_DYNAMIC_HTML_NAMESPACE,
- key,
- )
+ .get_deserialized::(TEMPLATES_DYNAMIC_HTML_NAMESPACE, key)
.await?
{
return Ok(body.html);
@@ -153,7 +148,7 @@ where
let mut redis_conn = redis.connect().await?;
redis_conn
- .set_serialized_to_json(
+ .set_serialized(
TEMPLATES_DYNAMIC_HTML_NAMESPACE,
key,
&cached,
diff --git a/apps/labrinth/src/database/models/notifications_type_item.rs b/apps/labrinth/src/database/models/notifications_type_item.rs
index 0179dbf7d5..482c78564b 100644
--- a/apps/labrinth/src/database/models/notifications_type_item.rs
+++ b/apps/labrinth/src/database/models/notifications_type_item.rs
@@ -3,7 +3,7 @@ use crate::database::redis::RedisPool;
use crate::models::v3::notifications::NotificationType;
use serde::{Deserialize, Serialize};
-const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types";
+const NOTIFICATION_TYPES_NAMESPACE: &str = "notification_types:v1";
#[derive(Serialize, Deserialize)]
pub struct NotificationTypeItem {
@@ -43,7 +43,7 @@ impl NotificationTypeItem {
let mut redis = redis.connect().await?;
let cached_types = redis
- .get_deserialized_from_json(NOTIFICATION_TYPES_NAMESPACE, "all")
+ .get_deserialized(NOTIFICATION_TYPES_NAMESPACE, "all")
.await?;
if let Some(types) = cached_types {
@@ -63,12 +63,7 @@ impl NotificationTypeItem {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
- NOTIFICATION_TYPES_NAMESPACE,
- "all",
- &types,
- None,
- )
+ .set_serialized(NOTIFICATION_TYPES_NAMESPACE, "all", &types, None)
.await?;
Ok(types)
diff --git a/apps/labrinth/src/database/models/organization_item.rs b/apps/labrinth/src/database/models/organization_item.rs
index bdef0009bf..9e87af6e6f 100644
--- a/apps/labrinth/src/database/models/organization_item.rs
+++ b/apps/labrinth/src/database/models/organization_item.rs
@@ -9,8 +9,8 @@ use std::hash::Hash;
use super::{DBTeamMember, ids::*};
use serde::{Deserialize, Serialize};
-const ORGANIZATIONS_NAMESPACE: &str = "organizations";
-const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles";
+const ORGANIZATIONS_NAMESPACE: &str = "organizations:v1";
+const ORGANIZATIONS_TITLES_NAMESPACE: &str = "organizations_titles:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
/// An organization of users who together control one or more projects and organizations.
diff --git a/apps/labrinth/src/database/models/pat_item.rs b/apps/labrinth/src/database/models/pat_item.rs
index 9a9992f5d7..4ba9bbbd87 100644
--- a/apps/labrinth/src/database/models/pat_item.rs
+++ b/apps/labrinth/src/database/models/pat_item.rs
@@ -11,9 +11,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
-const PATS_NAMESPACE: &str = "pats";
-const PATS_TOKENS_NAMESPACE: &str = "pats_tokens";
-const PATS_USERS_NAMESPACE: &str = "pats_users";
+const PATS_NAMESPACE: &str = "pats:v1";
+const PATS_TOKENS_NAMESPACE: &str = "pats_tokens:v1";
+const PATS_USERS_NAMESPACE: &str = "pats_users:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct DBPersonalAccessToken {
@@ -161,7 +161,7 @@ impl DBPersonalAccessToken {
let mut redis = redis.connect().await?;
let res = redis
- .get_deserialized_from_json::>(
+ .get_deserialized::>(
PATS_USERS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -189,12 +189,7 @@ impl DBPersonalAccessToken {
let mut redis = redis.connect().await?;
redis
- .set(
- PATS_USERS_NAMESPACE,
- &user_id.0.to_string(),
- &serde_json::to_string(&db_pats)?,
- None,
- )
+ .set_serialized(PATS_USERS_NAMESPACE, user_id.0, &db_pats, None)
.await?;
Ok(db_pats)
}
diff --git a/apps/labrinth/src/database/models/product_item.rs b/apps/labrinth/src/database/models/product_item.rs
index e7d48f810b..bbfe4c9fd5 100644
--- a/apps/labrinth/src/database/models/product_item.rs
+++ b/apps/labrinth/src/database/models/product_item.rs
@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
use std::convert::TryFrom;
use std::convert::TryInto;
-const PRODUCTS_NAMESPACE: &str = "products";
+const PRODUCTS_NAMESPACE: &str = "products:v1";
pub struct DBProduct {
pub id: DBProductId,
@@ -153,9 +153,8 @@ impl QueryProductWithPrices {
{
let mut redis = redis.connect().await?;
- let res: Option> = redis
- .get_deserialized_from_json(PRODUCTS_NAMESPACE, "all")
- .await?;
+ let res: Option> =
+ redis.get_deserialized(PRODUCTS_NAMESPACE, "all").await?;
if let Some(res) = res {
return Ok(res);
@@ -196,7 +195,7 @@ impl QueryProductWithPrices {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(PRODUCTS_NAMESPACE, "all", &products, None)
+ .set_serialized(PRODUCTS_NAMESPACE, "all", &products, None)
.await?;
Ok(products)
diff --git a/apps/labrinth/src/database/models/project_item.rs b/apps/labrinth/src/database/models/project_item.rs
index 9fa9091a9b..22034123a0 100644
--- a/apps/labrinth/src/database/models/project_item.rs
+++ b/apps/labrinth/src/database/models/project_item.rs
@@ -23,9 +23,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
-pub const PROJECTS_NAMESPACE: &str = "projects";
-pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs";
-const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies";
+pub const PROJECTS_NAMESPACE: &str = "projects:v1";
+pub const PROJECTS_SLUGS_NAMESPACE: &str = "projects_slugs:v1";
+const PROJECTS_DEPENDENCIES_NAMESPACE: &str = "projects_dependencies:v1";
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct LinkUrl {
@@ -976,7 +976,7 @@ impl DBProject {
let mut redis = redis.connect().await?;
let dependencies = redis
- .get_deserialized_from_json::(
+ .get_deserialized::(
PROJECTS_DEPENDENCIES_NAMESPACE,
&id.0.to_string(),
)
@@ -1014,7 +1014,7 @@ impl DBProject {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
PROJECTS_DEPENDENCIES_NAMESPACE,
id.0,
&dependencies,
diff --git a/apps/labrinth/src/database/models/session_item.rs b/apps/labrinth/src/database/models/session_item.rs
index c3e6025b5b..f5198760bc 100644
--- a/apps/labrinth/src/database/models/session_item.rs
+++ b/apps/labrinth/src/database/models/session_item.rs
@@ -10,9 +10,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
-const SESSIONS_NAMESPACE: &str = "sessions";
-const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids";
-const SESSIONS_USERS_NAMESPACE: &str = "sessions_users";
+const SESSIONS_NAMESPACE: &str = "sessions:v1";
+const SESSIONS_IDS_NAMESPACE: &str = "sessions_ids:v1";
+const SESSIONS_USERS_NAMESPACE: &str = "sessions_users:v1";
pub struct SessionBuilder {
pub session: String,
@@ -226,7 +226,7 @@ impl DBSession {
let mut redis = redis.connect().await?;
let res = redis
- .get_deserialized_from_json::>(
+ .get_deserialized::>(
SESSIONS_USERS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -255,7 +255,7 @@ impl DBSession {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
SESSIONS_USERS_NAMESPACE,
user_id.0,
&db_sessions,
diff --git a/apps/labrinth/src/database/models/team_item.rs b/apps/labrinth/src/database/models/team_item.rs
index 12cb44c02c..da577866f3 100644
--- a/apps/labrinth/src/database/models/team_item.rs
+++ b/apps/labrinth/src/database/models/team_item.rs
@@ -9,7 +9,7 @@ use itertools::Itertools;
use rust_decimal::Decimal;
use serde::{Deserialize, Serialize};
-const TEAMS_NAMESPACE: &str = "teams";
+const TEAMS_NAMESPACE: &str = "teams:v1";
pub struct TeamBuilder {
pub members: Vec,
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index bd66a9e4ad..d8dada9188 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -16,9 +16,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::{Debug, Display};
use std::hash::Hash;
-const USERS_NAMESPACE: &str = "users";
-const USER_USERNAMES_NAMESPACE: &str = "users_usernames";
-const USERS_PROJECTS_NAMESPACE: &str = "users_projects";
+const USERS_NAMESPACE: &str = "users:v1";
+const USER_USERNAMES_NAMESPACE: &str = "users_usernames:v1";
+const USERS_PROJECTS_NAMESPACE: &str = "users_projects:v1";
#[derive(Deserialize, Serialize, Clone, Debug)]
pub struct DBUser {
@@ -391,7 +391,7 @@ impl DBUser {
let mut redis = redis.connect().await?;
let cached_projects = redis
- .get_deserialized_from_json::>(
+ .get_deserialized::>(
USERS_PROJECTS_NAMESPACE,
&user_id.0.to_string(),
)
@@ -419,7 +419,7 @@ impl DBUser {
let mut redis = redis.connect().await?;
redis
- .set_serialized_to_json(
+ .set_serialized(
USERS_PROJECTS_NAMESPACE,
user_id.0,
&db_projects,
diff --git a/apps/labrinth/src/database/models/version_item.rs b/apps/labrinth/src/database/models/version_item.rs
index 9740120bda..1644526b4b 100644
--- a/apps/labrinth/src/database/models/version_item.rs
+++ b/apps/labrinth/src/database/models/version_item.rs
@@ -22,8 +22,8 @@ use std::collections::HashMap;
use std::iter;
use tracing::error;
-pub const VERSIONS_NAMESPACE: &str = "versions";
-const VERSION_FILES_NAMESPACE: &str = "versions_files";
+pub const VERSIONS_NAMESPACE: &str = "versions:v1";
+const VERSION_FILES_NAMESPACE: &str = "versions_files:v1";
pub async fn cleanup_unused_attribution_files_and_groups(
transaction: &mut PgTransaction<'_>,
diff --git a/apps/labrinth/src/database/redis/mod.rs b/apps/labrinth/src/database/redis/mod.rs
index 1c7a786e17..833ed1ac40 100644
--- a/apps/labrinth/src/database/redis/mod.rs
+++ b/apps/labrinth/src/database/redis/mod.rs
@@ -12,12 +12,15 @@ use prometheus::{IntGauge, Registry};
use redis::ToRedisArgs;
use serde::de::DeserializeOwned;
use serde::{Deserialize, Serialize};
+use std::borrow::Cow;
use std::collections::HashMap;
use std::fmt::{Debug, Display};
use std::future::Future;
use std::hash::Hash;
+use std::str::FromStr;
use std::sync::Arc;
use std::time::Duration;
+use thiserror::Error;
use tracing::{Instrument, info, info_span};
use util::{cmd, redis_pipe};
@@ -41,8 +44,112 @@ const MGET_CHUNK_SIZE: usize = 32;
// BytesMut peak capacity that builds up under steady load.
const REDIS_MAX_CONN_AGE: Duration = Duration::from_secs(120);
+#[repr(u8)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Codec {
+ Raw = 0,
+ Lz4 = 1,
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum EncodingFormat {
+ Json,
+ Postcard,
+}
+
+#[derive(Debug, Error)]
+#[error("invalid redis codec")]
+pub struct InvalidCodec;
+
+#[derive(Debug, Error)]
+#[error("invalid redis encoding format")]
+pub struct InvalidEncodingFormat;
+
+impl TryFrom for Codec {
+ type Error = InvalidCodec;
+
+ fn try_from(value: u8) -> Result {
+ match value {
+ 0 => Ok(Self::Raw),
+ 1 => Ok(Self::Lz4),
+ _ => Err(InvalidCodec),
+ }
+ }
+}
+
+impl FromStr for Codec {
+ type Err = InvalidCodec;
+
+ fn from_str(value: &str) -> Result {
+ match value {
+ "lz4" => Ok(Self::Lz4),
+ _ => Err(InvalidCodec),
+ }
+ }
+}
+
+impl FromStr for EncodingFormat {
+ type Err = InvalidEncodingFormat;
+
+ fn from_str(value: &str) -> Result {
+ match value {
+ "json" => Ok(Self::Json),
+ "postcard" => Ok(Self::Postcard),
+ _ => Err(InvalidEncodingFormat),
+ }
+ }
+}
+
+fn encode_value(value: &T) -> Result, DatabaseError> {
+ let mut value = match ENV.REDIS_ENCODING_FORMAT {
+ EncodingFormat::Json => serde_json::to_vec(value)?,
+ EncodingFormat::Postcard => postcard::to_allocvec(value)?,
+ };
+
+ if ENV.REDIS_COMPRESSION_LEVEL > 0
+ && ENV.REDIS_COMPRESSION_ALGORITHM == Codec::Lz4
+ && value.len() >= ENV.REDIS_COMPRESSION_THRESHOLD_BYTES
+ {
+ let compressed = lz4_flex::block::compress_prepend_size(&value);
+ let savings_ratio = value.len().saturating_sub(compressed.len()) as f64
+ / value.len().max(1) as f64
+ * 100.0;
+
+ if savings_ratio >= ENV.REDIS_COMPRESSION_MIN_SAVINGS_RATIO {
+ let mut encoded = Vec::with_capacity(compressed.len() + 1);
+ encoded.push(Codec::Lz4 as u8);
+ encoded.extend(compressed);
+ return Ok(encoded);
+ }
+ }
+
+ let mut encoded = Vec::with_capacity(value.len() + 1);
+ encoded.push(Codec::Raw as u8);
+ encoded.append(&mut value);
+ Ok(encoded)
+}
+
+fn decode_value(value: &[u8]) -> Option
+where
+ T: for<'a> Deserialize<'a>,
+{
+ let (codec, value) = value.split_first()?;
+ let value = match Codec::try_from(*codec).ok()? {
+ Codec::Raw => Cow::Borrowed(value),
+ Codec::Lz4 => {
+ Cow::Owned(lz4_flex::block::decompress_size_prepended(value).ok()?)
+ }
+ };
+
+ match ENV.REDIS_ENCODING_FORMAT {
+ EncodingFormat::Json => serde_json::from_slice(&value).ok(),
+ EncodingFormat::Postcard => postcard::from_bytes(&value).ok(),
+ }
+}
+
fn cache_expiries(namespace: &str) -> (i64, i64) {
- match namespace {
+ // Namespaces may embed a version suffix like `:v1`, so split it out.
+ match namespace.split_once(':').map(|t| t.0).unwrap_or(namespace) {
"versions" | "versions_files" => {
(VERSION_DEFAULT_EXPIRY, VERSION_ACTUAL_EXPIRY)
}
@@ -367,12 +474,11 @@ impl RedisPool {
for chunk in args.chunks(MGET_CHUNK_SIZE) {
let part = cmd("MGET")
.arg(chunk)
- .query_async::>>(&mut connection)
+ .query_async::>>>(&mut connection)
.await?;
cached_values.extend(part.into_iter().filter_map(|x| {
x.and_then(|val| {
- serde_json::from_str::>(&val)
- .ok()
+ decode_value::>(&val)
})
.map(|val| (val.key.clone(), val))
}));
@@ -492,7 +598,7 @@ impl RedisPool {
"{}_{namespace}:{key}",
self.meta_namespace
),
- serde_json::to_string(&value)?,
+ encode_value(&value)?,
default_expiry as u64,
);
pipe_cmds += 1;
@@ -624,30 +730,27 @@ impl<'a> Drop for LockSentinel<'a> {
impl RedisConnection {
#[tracing::instrument(skip(self))]
- pub async fn set(
+ pub async fn set(
&mut self,
namespace: &str,
id: &str,
- data: &str,
+ data: D,
expiry: Option,
- ) -> Result<(), DatabaseError> {
+ ) -> Result<(), DatabaseError>
+ where
+ D: ToRedisArgs + Send + Sync + Debug,
+ {
let mut cmd = cmd("SET");
- redis_args(
- &mut cmd,
- vec![
- format!("{}_{}:{}", self.meta_namespace, namespace, id),
- data.to_string(),
- "EX".to_string(),
- expiry.unwrap_or(DEFAULT_EXPIRY).to_string(),
- ]
- .as_slice(),
- );
+ cmd.arg(format!("{}_{}:{}", self.meta_namespace, namespace, id))
+ .arg(data)
+ .arg("EX")
+ .arg(expiry.unwrap_or(DEFAULT_EXPIRY));
redis_execute::<()>(&mut cmd, &mut self.connection).await?;
Ok(())
}
#[tracing::instrument(skip(self, id, data))]
- pub async fn set_serialized_to_json(
+ pub async fn set_serialized(
&mut self,
namespace: &str,
id: Id,
@@ -658,13 +761,8 @@ impl RedisConnection {
Id: Display,
D: serde::Serialize,
{
- self.set(
- namespace,
- &id.to_string(),
- &serde_json::to_string(&data)?,
- expiry,
- )
- .await
+ self.set(namespace, &id.to_string(), encode_value(&data)?, expiry)
+ .await
}
#[tracing::instrument(skip(self))]
@@ -688,7 +786,7 @@ impl RedisConnection {
&mut self,
namespace: &str,
ids: &[String],
- ) -> Result>, DatabaseError> {
+ ) -> Result>>, DatabaseError> {
let mut cmd = cmd("MGET");
redis_args(
&mut cmd,
@@ -702,7 +800,7 @@ impl RedisConnection {
}
#[tracing::instrument(skip(self))]
- pub async fn get_deserialized_from_json(
+ pub async fn get_deserialized(
&mut self,
namespace: &str,
id: &str,
@@ -710,14 +808,19 @@ impl RedisConnection {
where
R: for<'a> serde::Deserialize<'a>,
{
- Ok(self
- .get(namespace, id)
- .await?
- .and_then(|x| serde_json::from_str(&x).ok()))
+ let mut cmd = cmd("GET");
+ redis_args(
+ &mut cmd,
+ vec![format!("{}_{}:{}", self.meta_namespace, namespace, id)]
+ .as_slice(),
+ );
+ let value: Option> =
+ redis_execute(&mut cmd, &mut self.connection).await?;
+ Ok(value.and_then(|value| decode_value(&value)))
}
#[tracing::instrument(skip(self))]
- pub async fn get_many_deserialized_from_json(
+ pub async fn get_many_deserialized(
&mut self,
namespace: &str,
ids: &[String],
@@ -729,8 +832,8 @@ impl RedisConnection {
.get_many(namespace, ids)
.await?
.into_iter()
- .map(|x| x.and_then(|val| serde_json::from_str::(&val).ok()))
- .collect::>())
+ .map(|value| value.and_then(|value| decode_value::(&value)))
+ .collect())
}
#[tracing::instrument(skip(self, id))]
@@ -799,7 +902,7 @@ impl RedisConnection {
namespace: &str,
key: &str,
timeout: Option,
- ) -> Result, DatabaseError> {
+ ) -> Result; 2]>, DatabaseError> {
let key = format!("{}_{namespace}:{key}", self.meta_namespace);
// a timeout of 0 is infinite
let timeout = timeout.unwrap_or(0.0);
@@ -829,12 +932,17 @@ impl RedisConnection {
#[derive(Serialize, Deserialize)]
pub struct RedisValue {
key: K,
- #[serde(skip_serializing_if = "Option::is_none")]
alias: Option,
iat: i64,
val: T,
}
+impl RedisValue {
+ pub fn value(&self) -> &T {
+ &self.val
+ }
+}
+
pub fn redis_args(cmd: &mut util::InstrumentedCmd, args: &[String]) {
for arg in args {
cmd.arg(arg);
diff --git a/apps/labrinth/src/env.rs b/apps/labrinth/src/env.rs
index 8c8e32b0b7..2fc836e7ce 100644
--- a/apps/labrinth/src/env.rs
+++ b/apps/labrinth/src/env.rs
@@ -289,6 +289,11 @@ vars! {
REDIS_WAIT_TIMEOUT_MS: u64 = 15000u64;
REDIS_MAX_CONNECTIONS: u32 = 10000u32;
REDIS_MIN_CONNECTIONS: usize = 0usize;
+ REDIS_ENCODING_FORMAT: crate::database::redis::EncodingFormat = crate::database::redis::EncodingFormat::Json;
+ REDIS_COMPRESSION_LEVEL: i32 = 0i32;
+ REDIS_COMPRESSION_ALGORITHM: crate::database::redis::Codec = crate::database::redis::Codec::Lz4;
+ REDIS_COMPRESSION_THRESHOLD_BYTES: usize = 1024usize;
+ REDIS_COMPRESSION_MIN_SAVINGS_RATIO: f64 = 12.5f64;
SEARCH_OPERATION_TIMEOUT: u64 = 300000u64;
diff --git a/apps/labrinth/src/models/exp/project.rs b/apps/labrinth/src/models/exp/project.rs
index 3fdaba6257..68d4fbb613 100644
--- a/apps/labrinth/src/models/exp/project.rs
+++ b/apps/labrinth/src/models/exp/project.rs
@@ -258,7 +258,7 @@ pub async fn fetch_query_context(
HashMap::new()
} else {
redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
server_ping::REDIS_NAMESPACE,
&minecraft_java_server_pings
.iter()
@@ -281,7 +281,7 @@ pub async fn fetch_query_context(
HashMap::new()
} else {
redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
MINECRAFT_SERVER_ANALYTICS,
&minecraft_server_analytics
.iter()
diff --git a/apps/labrinth/src/queue/analytics/cache.rs b/apps/labrinth/src/queue/analytics/cache.rs
index d929173812..e4a5a00ad2 100644
--- a/apps/labrinth/src/queue/analytics/cache.rs
+++ b/apps/labrinth/src/queue/analytics/cache.rs
@@ -13,7 +13,7 @@ use crate::{
util::error::Context,
};
-pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics";
+pub const MINECRAFT_SERVER_ANALYTICS: &str = "minecraft_server_analytics:v1";
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct MinecraftServerAnalytics {
@@ -117,7 +117,7 @@ pub async fn cache_analytics(
debug!("Caching analytics for {project_id}: {analytics:?}");
redis
- .set_serialized_to_json(
+ .set_serialized(
MINECRAFT_SERVER_ANALYTICS,
project_id.to_string(),
analytics,
diff --git a/apps/labrinth/src/queue/analytics/mod.rs b/apps/labrinth/src/queue/analytics/mod.rs
index 6d4716c693..79b02b6cd5 100644
--- a/apps/labrinth/src/queue/analytics/mod.rs
+++ b/apps/labrinth/src/queue/analytics/mod.rs
@@ -13,9 +13,9 @@ use tracing::trace;
pub mod cache;
-const DOWNLOADS_NAMESPACE: &str = "downloads";
-const VIEWS_NAMESPACE: &str = "views";
-const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays";
+const DOWNLOADS_NAMESPACE: &str = "downloads:v1";
+const VIEWS_NAMESPACE: &str = "views:v1";
+const MINECRAFT_SERVER_PLAYS_NAMESPACE: &str = "minecraft_server_plays:v1";
const MINECRAFT_SERVER_PLAYS_EXPIRY: u64 = 86_400; // 24 hours
const MINECRAFT_SERVER_PLAYS_LIMIT: u32 = 5;
diff --git a/apps/labrinth/src/queue/server_ping.rs b/apps/labrinth/src/queue/server_ping.rs
index 5b6305961b..46dbd67179 100644
--- a/apps/labrinth/src/queue/server_ping.rs
+++ b/apps/labrinth/src/queue/server_ping.rs
@@ -26,8 +26,9 @@ pub struct ServerPingQueue {
pub incremental_search_queue: IncrementalSearchQueue,
}
-pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping";
-pub const REDIS_FAILURE_NAMESPACE: &str = "minecraft_java_server_ping_failures";
+pub const REDIS_NAMESPACE: &str = "minecraft_java_server_ping:v1";
+pub const REDIS_FAILURE_NAMESPACE: &str =
+ "minecraft_java_server_ping_failures:v1";
pub const CLICKHOUSE_TABLE: &str = "minecraft_java_server_pings";
impl ServerPingQueue {
@@ -133,12 +134,7 @@ impl ServerPingQueue {
// ping succeeded; immediately update its online status in redis
redis
- .set_serialized_to_json(
- REDIS_NAMESPACE,
- project_id,
- ping,
- None,
- )
+ .set_serialized(REDIS_NAMESPACE, project_id, ping, None)
.await
.wrap_err("failed to set redis key")?;
updated_project = true;
@@ -160,7 +156,7 @@ impl ServerPingQueue {
&& count >= ENV.SERVER_PING_MAX_FAIL_COUNT
{
redis
- .set_serialized_to_json(
+ .set_serialized(
REDIS_NAMESPACE,
project_id,
ping,
@@ -254,7 +250,7 @@ impl ServerPingQueue {
.collect::>();
let all_server_last_pings = redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
REDIS_NAMESPACE,
&all_project_ids,
)
diff --git a/apps/labrinth/src/routes/internal/campaign.rs b/apps/labrinth/src/routes/internal/campaign.rs
index e3757b397f..24d629874a 100644
--- a/apps/labrinth/src/routes/internal/campaign.rs
+++ b/apps/labrinth/src/routes/internal/campaign.rs
@@ -68,7 +68,7 @@ pub struct CampaignInfo {
cached_at: DateTime,
}
-const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info";
+const CAMPAIGN_INFO_CACHE_NAMESPACE: &str = "campaign_info:v1";
const CAMPAIGN_INFO_CACHE_STALE_SECONDS: i64 = 15 * 60;
const CAMPAIGN_INFO_CACHE_TTL_SECONDS: i64 = 24 * 60 * 60;
@@ -326,7 +326,7 @@ pub async fn pride_26(
.wrap_internal_err("connecting to redis")?;
let cached = redis_connection
- .get_deserialized_from_json::(
+ .get_deserialized::(
CAMPAIGN_INFO_CACHE_NAMESPACE,
campaign_id,
)
@@ -382,7 +382,7 @@ pub async fn pride_26(
};
redis_connection
- .set_serialized_to_json(
+ .set_serialized(
CAMPAIGN_INFO_CACHE_NAMESPACE,
campaign_id,
&campaign_info,
diff --git a/apps/labrinth/src/routes/internal/external_notifications.rs b/apps/labrinth/src/routes/internal/external_notifications.rs
index 5d9d2997fa..a013c3028b 100644
--- a/apps/labrinth/src/routes/internal/external_notifications.rs
+++ b/apps/labrinth/src/routes/internal/external_notifications.rs
@@ -427,7 +427,7 @@ async fn broadcast_notifications(
redis,
RedisFriendsMessage::Notification {
to_user,
- notification,
+ notification_id,
},
)
.await
diff --git a/apps/labrinth/src/routes/internal/flows.rs b/apps/labrinth/src/routes/internal/flows.rs
index 88d4a9bdb2..c81c66a32c 100644
--- a/apps/labrinth/src/routes/internal/flows.rs
+++ b/apps/labrinth/src/routes/internal/flows.rs
@@ -2126,7 +2126,7 @@ async fn validate_2fa_code(
)
.map_err(|_| AuthenticationError::InvalidCredentials)?;
- const TOTP_NAMESPACE: &str = "used_totp";
+ const TOTP_NAMESPACE: &str = "used_totp:v1";
let mut conn = redis.connect().await?;
// Check if TOTP has already been used
diff --git a/apps/labrinth/src/routes/internal/gotenberg.rs b/apps/labrinth/src/routes/internal/gotenberg.rs
index b5614c3add..71d39dedb4 100644
--- a/apps/labrinth/src/routes/internal/gotenberg.rs
+++ b/apps/labrinth/src/routes/internal/gotenberg.rs
@@ -70,11 +70,11 @@ pub async fn success_callback(
let body = base64::engine::general_purpose::STANDARD.encode(&body);
- let redis_msg = serde_json::to_string(&Ok::<
+ let redis_msg = postcard::to_allocvec(&Ok::<
GotenbergDocument,
GotenbergError,
>(GotenbergDocument { body }))
- .wrap_internal_err("failed to serialize document to JSON")?;
+ .wrap_internal_err("failed to serialize Redis document response")?;
redis
.lpush(
@@ -139,11 +139,11 @@ pub async fn error_callback(
.await
.wrap_internal_err("failed to get Redis connection")?;
- let redis_msg = serde_json::to_string(&Err::<
+ let redis_msg = postcard::to_allocvec(&Err::<
GotenbergDocument,
GotenbergError,
>(error_body))
- .wrap_internal_err("failed to serialize error to JSON")?;
+ .wrap_internal_err("failed to serialize Redis error response")?;
redis
.lpush(
diff --git a/apps/labrinth/src/routes/v3/content/mod.rs b/apps/labrinth/src/routes/v3/content/mod.rs
index 78e3098c2e..297511fd80 100644
--- a/apps/labrinth/src/routes/v3/content/mod.rs
+++ b/apps/labrinth/src/routes/v3/content/mod.rs
@@ -22,8 +22,8 @@ use serde::{Deserialize, Serialize};
use sha2::{Digest, Sha256};
use std::collections::BTreeMap;
-const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve";
-const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat";
+const CONTENT_RESOLVE_CACHE_NAMESPACE: &str = "content_resolve:v1";
+const CONTENT_RESOLVE_CACHE_HEAT_NAMESPACE: &str = "content_resolve_heat:v1";
const CONTENT_RESOLVE_CACHE_SCHEMA_VERSION: &str = "v1";
const CONTENT_RESOLVE_CACHE_HEAT_WINDOW_SECONDS: i64 = 60 * 60 * 24;
@@ -340,7 +340,7 @@ async fn get_cached_resolve_content_plan(
};
match redis
- .get_deserialized_from_json(CONTENT_RESOLVE_CACHE_NAMESPACE, cache_key)
+ .get_deserialized(CONTENT_RESOLVE_CACHE_NAMESPACE, cache_key)
.await
{
Ok(cached) => cached,
@@ -368,7 +368,7 @@ async fn set_cached_resolve_content_plan(
};
if let Err(error) = redis
- .set_serialized_to_json(
+ .set_serialized(
CONTENT_RESOLVE_CACHE_NAMESPACE,
cache_key,
cached,
diff --git a/apps/labrinth/src/search/mod.rs b/apps/labrinth/src/search/mod.rs
index e7b55dd9f3..ac003ed4e5 100644
--- a/apps/labrinth/src/search/mod.rs
+++ b/apps/labrinth/src/search/mod.rs
@@ -151,7 +151,7 @@ async fn hydrate_search_results(
} else {
let mut redis = redis_pool.connect().await?;
let ping_results = redis
- .get_many_deserialized_from_json::(
+ .get_many_deserialized::(
server_ping::REDIS_NAMESPACE,
&project_ids
.iter()
diff --git a/apps/labrinth/src/sync/friends.rs b/apps/labrinth/src/sync/friends.rs
index d14699eeeb..770cb1d6c9 100644
--- a/apps/labrinth/src/sync/friends.rs
+++ b/apps/labrinth/src/sync/friends.rs
@@ -1,4 +1,6 @@
use crate::database::PgPool;
+use crate::database::models::notification_item::DBNotification;
+use crate::models::ids::NotificationId;
use crate::models::notifications::Notification;
use crate::queue::socket::ActiveSockets;
use crate::routes::internal::statuses::{
@@ -13,10 +15,9 @@ use redis::{RedisWrite, ToRedisArgs};
use serde::{Deserialize, Serialize};
use tokio_stream::StreamExt;
-pub const FRIENDS_CHANNEL_NAME: &str = "friends";
+pub const FRIENDS_CHANNEL_NAME: &str = "friends:v1";
#[derive(Serialize, Deserialize)]
-#[serde(tag = "type", rename_all = "snake_case")]
pub enum RedisFriendsMessage {
StatusUpdate {
status: UserStatus,
@@ -30,7 +31,7 @@ pub enum RedisFriendsMessage {
},
Notification {
to_user: UserId,
- notification: Notification,
+ notification_id: NotificationId,
},
}
@@ -39,7 +40,7 @@ impl ToRedisArgs for RedisFriendsMessage {
where
W: ?Sized + RedisWrite,
{
- out.write_arg(&serde_json::to_vec(&self).unwrap())
+ out.write_arg(&postcard::to_allocvec(&self).unwrap())
}
}
@@ -54,7 +55,7 @@ pub async fn handle_pubsub(
if message.get_channel_name() != FRIENDS_CHANNEL_NAME {
continue;
}
- let payload = serde_json::from_slice(message.get_payload_bytes());
+ let payload = postcard::from_bytes(message.get_payload_bytes());
let pool = pool.clone();
let sockets = sockets.clone();
@@ -94,14 +95,18 @@ pub async fn handle_pubsub(
Ok(RedisFriendsMessage::Notification {
to_user,
- notification,
+ notification_id,
}) => {
- let _ = send_notification_to_user(
- &sockets,
- to_user,
- ¬ification,
- )
- .await;
+ if let Ok(Some(notification)) =
+ DBNotification::get(notification_id.into(), &pool).await
+ {
+ let _ = send_notification_to_user(
+ &sockets,
+ to_user,
+ &Notification::from(notification),
+ )
+ .await;
+ }
}
Err(_) => {}
diff --git a/apps/labrinth/src/sync/status.rs b/apps/labrinth/src/sync/status.rs
index 58f4a9602e..f16ed3702b 100644
--- a/apps/labrinth/src/sync/status.rs
+++ b/apps/labrinth/src/sync/status.rs
@@ -17,10 +17,10 @@ pub async fn get_user_status(
if let Ok(mut conn) = redis.pool.get().await
&& let Ok(mut statuses) =
- conn.sscan::<_, String>(get_field_name(user)).await
- && let Some(status_json) = statuses.next_item().await
+ conn.sscan::<_, Vec>(get_field_name(user)).await
+ && let Some(status) = statuses.next_item().await
{
- return serde_json::from_str::(&status_json).ok();
+ return postcard::from_bytes::(&status).ok();
}
None
@@ -40,11 +40,11 @@ pub async fn replace_user_status(
let mut pipe = redis::pipe();
pipe.atomic();
if let Some(status) = old_status {
- pipe.srem(&field_name, serde_json::to_string(&status).unwrap())
+ pipe.srem(&field_name, postcard::to_allocvec(status).unwrap())
.ignore();
}
if let Some(status) = new_status {
- pipe.sadd(&field_name, serde_json::to_string(&status).unwrap())
+ pipe.sadd(&field_name, postcard::to_allocvec(status).unwrap())
.ignore();
pipe.expire(&field_name, EXPIRY_TIME_SECONDS).ignore();
}
@@ -65,5 +65,5 @@ pub async fn push_back_user_expiry(
}
fn get_field_name(user: UserId) -> String {
- format!("user_status:{user}")
+ format!("user_status:v1:{user}")
}
diff --git a/apps/labrinth/src/util/gotenberg.rs b/apps/labrinth/src/util/gotenberg.rs
index 854c27e124..75e74fe65b 100644
--- a/apps/labrinth/src/util/gotenberg.rs
+++ b/apps/labrinth/src/util/gotenberg.rs
@@ -14,7 +14,7 @@ pub const MODRINTH_GENERATED_PDF_TYPE: HeaderName =
HeaderName::from_static("modrinth-generated-pdf-type");
pub const MODRINTH_PAYMENT_ID: HeaderName =
HeaderName::from_static("modrinth-payment-id");
-pub const PAYMENT_STATEMENTS_NAMESPACE: &str = "payment_statements";
+pub const PAYMENT_STATEMENTS_NAMESPACE: &str = "payment_statements:v1";
#[derive(Serialize, Deserialize, Debug, Clone)]
pub struct PaymentStatement {
@@ -203,7 +203,7 @@ impl GotenbergClient {
.wrap_internal_err("failed to get document over Redis")?
.wrap_internal_err("no document was returned from Redis")?;
- let document = serde_json::from_str::<
+ let document = postcard::from_bytes::<
Result,
>(&document)
.wrap_internal_err("failed to deserialize Redis document response")?
diff --git a/apps/labrinth/src/util/ratelimit.rs b/apps/labrinth/src/util/ratelimit.rs
index a2534cd205..067af8b498 100644
--- a/apps/labrinth/src/util/ratelimit.rs
+++ b/apps/labrinth/src/util/ratelimit.rs
@@ -11,7 +11,7 @@ use chrono::Utc;
use std::str::FromStr;
use std::sync::Arc;
-const RATE_LIMIT_NAMESPACE: &str = "rate_limit";
+const RATE_LIMIT_NAMESPACE: &str = "rate_limit:v1";
const RATE_LIMIT_EXPIRY: i64 = 300; // 5 minutes
const MINUTE_IN_NANOS: i64 = 60_000_000_000;
diff --git a/apps/labrinth/tests/project.rs b/apps/labrinth/tests/project.rs
index c337da781c..fd5046cb99 100644
--- a/apps/labrinth/tests/project.rs
+++ b/apps/labrinth/tests/project.rs
@@ -18,9 +18,11 @@ use common::environment::{
use common::permissions::{PermissionsTest, PermissionsTestContext};
use futures::StreamExt;
use hex::ToHex;
+use labrinth::database::models::DBProjectId;
use labrinth::database::models::project_item::{
- PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE,
+ PROJECTS_NAMESPACE, PROJECTS_SLUGS_NAMESPACE, ProjectQueryResult,
};
+use labrinth::database::redis::RedisValue;
use labrinth::models::ids::ProjectId;
use labrinth::models::teams::ProjectPermissions;
use labrinth::util::actix::{MultipartSegment, MultipartSegmentData};
@@ -67,19 +69,21 @@ async fn test_get_project() {
Some(parse_base62(alpha_project_id).unwrap() as i64)
);
- let cached_project = redis_pool
- .get(
+ let cached_project: RedisValue<
+ ProjectQueryResult,
+ DBProjectId,
+ String,
+ > = redis_pool
+ .get_deserialized(
PROJECTS_NAMESPACE,
&parse_base62(alpha_project_id).unwrap().to_string(),
)
.await
.unwrap()
.unwrap();
- let cached_project: serde_json::Value =
- serde_json::from_str(&cached_project).unwrap();
assert_eq!(
- cached_project["val"]["inner"]["slug"],
- json!(alpha_project_slug)
+ cached_project.value().inner.slug.as_ref(),
+ Some(alpha_project_slug)
);
// Make the request again, this time it should be cached
diff --git a/apps/labrinth/tests/version.rs b/apps/labrinth/tests/version.rs
index 5e5a6ecf97..951b408cd6 100644
--- a/apps/labrinth/tests/version.rs
+++ b/apps/labrinth/tests/version.rs
@@ -14,7 +14,11 @@ use common::asserts::assert_common_version_ids;
use common::database::USER_USER_PAT;
use common::environment::{with_test_environment, with_test_environment_all};
use futures::StreamExt;
-use labrinth::database::models::version_item::VERSIONS_NAMESPACE;
+use labrinth::database::models::DBVersionId;
+use labrinth::database::models::version_item::{
+ VERSIONS_NAMESPACE, VersionQueryResult,
+};
+use labrinth::database::redis::RedisValue;
use labrinth::models::ids::VersionId;
use labrinth::models::projects::{
Dependency, DependencyType, VersionStatus, VersionType,
@@ -47,18 +51,20 @@ async fn test_get_version() {
assert_eq!(&version.id.to_string(), alpha_version_id);
let mut redis_conn = test_env.db.redis_pool.connect().await.unwrap();
- let cached_project = redis_conn
- .get(
+ let cached_version: RedisValue<
+ VersionQueryResult,
+ DBVersionId,
+ String,
+ > = redis_conn
+ .get_deserialized(
VERSIONS_NAMESPACE,
&parse_base62(alpha_version_id).unwrap().to_string(),
)
.await
.unwrap()
.unwrap();
- let cached_project: serde_json::Value =
- serde_json::from_str(&cached_project).unwrap();
assert_eq!(
- cached_project["val"]["inner"]["project_id"],
+ cached_version.value().inner.project_id.0,
json!(parse_base62(alpha_project_id).unwrap())
);
From c579925f038949ee9b7ccd174cc56ae3b42d0abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Talbot?=
<108630700+fetchfern@users.noreply.github.com>
Date: Sun, 19 Jul 2026 17:54:23 -0400
Subject: [PATCH 05/43] feat: honeypot signup field (#6776)
feat: account consent
---
.../src/components/ui/auth/CreateAccount.vue | 19 ++++++++++++++++---
apps/frontend/src/pages/auth/create/oauth.vue | 3 ++-
apps/frontend/src/pages/auth/sign-up.vue | 3 ++-
apps/labrinth/src/routes/internal/flows.rs | 19 +++++++++++++++++++
.../api-client/src/modules/labrinth/types.ts | 2 ++
5 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/apps/frontend/src/components/ui/auth/CreateAccount.vue b/apps/frontend/src/components/ui/auth/CreateAccount.vue
index a529e2a05f..412883acea 100644
--- a/apps/frontend/src/components/ui/auth/CreateAccount.vue
+++ b/apps/frontend/src/components/ui/auth/CreateAccount.vue
@@ -72,6 +72,18 @@
/>
+
+
+
+
+
@@ -1147,6 +1284,51 @@ await loadSkins()
diff --git a/apps/frontend/src/components/ui/UserPageHeader.vue b/apps/frontend/src/components/ui/UserPageHeader.vue
new file mode 100644
index 0000000000..dfa94c475d
--- /dev/null
+++ b/apps/frontend/src/components/ui/UserPageHeader.vue
@@ -0,0 +1,294 @@
+
+
+
+
+
+
+
+
+ {{ formatMessage(messages.officialAccount) }}
+
+
+ {{ formatMessage(messages.affiliateLabel) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatMessage(commonMessages.editButton) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/frontend/src/locales/cs-CZ/index.json b/apps/frontend/src/locales/cs-CZ/index.json
index 22ac79adbd..b5ce1c1bbe 100644
--- a/apps/frontend/src/locales/cs-CZ/index.json
+++ b/apps/frontend/src/locales/cs-CZ/index.json
@@ -2171,9 +2171,6 @@
"profile.label.collection": {
"message": "Kolekce"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {stažení} few {stažení} other {stažení}}"
- },
"profile.label.joined": {
"message": "Členem od"
},
@@ -2192,9 +2189,6 @@
"profile.label.organizations": {
"message": "Organizace"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {projekt} few {projekty} other {projektů}}"
- },
"profile.label.saving": {
"message": "Ukládání..."
},
@@ -2528,12 +2522,6 @@
"project.settings.visit-dashboard": {
"message": "Přejít na přehled projektů"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {stažení} few {stažení} other {stažení}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {# sledující} few {# sledující} other {# sledujících}}"
- },
"project.versions.title": {
"message": "Verze"
},
diff --git a/apps/frontend/src/locales/de-CH/index.json b/apps/frontend/src/locales/de-CH/index.json
index b289277e1d..c53e40ec1c 100644
--- a/apps/frontend/src/locales/de-CH/index.json
+++ b/apps/frontend/src/locales/de-CH/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Kollektion"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {Download} other {Downloads}}"
- },
"profile.label.joined": {
"message": "Beigetreten"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organisationen"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {Projekt} other {Projekte}}"
- },
"profile.label.saving": {
"message": "Speichert..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Projekt-Dashboard besuchen"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {Download} other {Downloads}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {Follower} other {Follower}}"
- },
"project.status.archived.message": {
"message": "{title} wurde archiviert. {title} wird keine weiteren Updates erhalten, es sei denn, der Autor entscheided sich, das Projekt zu Dearchivieren."
},
diff --git a/apps/frontend/src/locales/de-DE/index.json b/apps/frontend/src/locales/de-DE/index.json
index 68d1d09e5b..3a09588749 100644
--- a/apps/frontend/src/locales/de-DE/index.json
+++ b/apps/frontend/src/locales/de-DE/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Kollektion"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {Download} other {Downloads}}"
- },
"profile.label.joined": {
"message": "Beigetreten"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organisationen"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {Projekt} other {Projekte}}"
- },
"profile.label.saving": {
"message": "Speichert..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Projekt-Dashboard besuchen"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {Download} other {Downloads}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {Follower} other {Follower}}"
- },
"project.status.archived.message": {
"message": "{title} wurde archiviert. {title} wird keine weiteren Updates erhalten, es sei denn, der Autor entscheidet sich das Projekt zu dearchivieren."
},
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index a299b8195b..ed8db64755 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -3005,6 +3005,24 @@
"muralpay.warning.wallet-address": {
"message": "Double-check your wallet address. Funds sent to an incorrect address cannot be recovered."
},
+ "organization.button.manage": {
+ "message": "Manage"
+ },
+ "organization.button.manage-projects": {
+ "message": "Manage projects"
+ },
+ "organization.label.downloads": {
+ "message": "downloads"
+ },
+ "organization.label.members": {
+ "message": "members"
+ },
+ "organization.label.organization": {
+ "message": "Organization"
+ },
+ "organization.label.projects": {
+ "message": "projects"
+ },
"organization.settings.projects.edit-links.affected-projects": {
"message": "Changes will be applied to {count, plural, one {# project} other {# projects}}."
},
@@ -3074,8 +3092,8 @@
"profile.label.collection": {
"message": "Collection"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {download} other {downloads}}"
+ "profile.label.download-count": {
+ "message": "{count, plural, one {download} other {downloads}}"
},
"profile.label.joined": {
"message": "Joined"
@@ -3095,8 +3113,8 @@
"profile.label.organizations": {
"message": "Organizations"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {project} other {projects}}"
+ "profile.label.project-count": {
+ "message": "{count, plural, one {project} other {projects}}"
},
"profile.label.saving": {
"message": "Saving..."
@@ -3260,6 +3278,12 @@
"project.actions.dont-show-again": {
"message": "Don't show again"
},
+ "project.actions.edit-project": {
+ "message": "Edit project"
+ },
+ "project.actions.rescan-modpack": {
+ "message": "Rescan modpack"
+ },
"project.actions.review-project": {
"message": "Review project"
},
@@ -3662,12 +3686,6 @@
"project.settings.visit-dashboard": {
"message": "Visit projects dashboard"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {download} other {downloads}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {follower} other {followers}}"
- },
"project.status.archived.message": {
"message": "{title} has been archived. {title} will not receive any further updates unless the author decides to unarchive the project."
},
diff --git a/apps/frontend/src/locales/es-419/index.json b/apps/frontend/src/locales/es-419/index.json
index 8d8eed405b..d211245ac2 100644
--- a/apps/frontend/src/locales/es-419/index.json
+++ b/apps/frontend/src/locales/es-419/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Colección"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {descarga} other {descargas}}"
- },
"profile.label.joined": {
"message": "Se unió"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organizaciones"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {proyecto} other {proyectos}}"
- },
"profile.label.saving": {
"message": "Guardando..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "Ver el panel de control de proyectos"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {descarga} other {descargas}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {seguidor} other {seguidores}}"
- },
"project.status.archived.message": {
"message": "{title} se ha archivado. {title} no recibirá más actualizaciones hasta que el autor decida desarchivar el proyecto."
},
diff --git a/apps/frontend/src/locales/es-ES/index.json b/apps/frontend/src/locales/es-ES/index.json
index cbbf5c2a44..81d4b0a722 100644
--- a/apps/frontend/src/locales/es-ES/index.json
+++ b/apps/frontend/src/locales/es-ES/index.json
@@ -2891,9 +2891,6 @@
"profile.label.collection": {
"message": "Colección"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {descarga} other {descargas}}"
- },
"profile.label.joined": {
"message": "Se unió hace"
},
@@ -2912,9 +2909,6 @@
"profile.label.organizations": {
"message": "Organizaciones"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {proyecto} other {proyectos}}"
- },
"profile.label.saving": {
"message": "Guardando..."
},
@@ -3377,12 +3371,6 @@
"project.settings.visit-dashboard": {
"message": "Visita el panel de proyectos"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {descarga} other {descargas}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {seguidor} other {seguidores}}"
- },
"project.status.archived.message": {
"message": "{title} ha sido archivado. {title} no recibirá ninguna futura actualización excepto que el autor decida desarchivar el proyecto."
},
diff --git a/apps/frontend/src/locales/fil-PH/index.json b/apps/frontend/src/locales/fil-PH/index.json
index b7ac746fbf..7f6debba6b 100644
--- a/apps/frontend/src/locales/fil-PH/index.json
+++ b/apps/frontend/src/locales/fil-PH/index.json
@@ -2213,9 +2213,6 @@
"profile.label.collection": {
"message": "Koleksiyon"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {download} other {na download}}"
- },
"profile.label.joined": {
"message": "Sumali"
},
@@ -2234,9 +2231,6 @@
"profile.label.organizations": {
"message": "Mga organisasyon"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {proyekto} other {na proyekto}}"
- },
"profile.label.saving": {
"message": "Sine-save..."
},
diff --git a/apps/frontend/src/locales/fr-FR/index.json b/apps/frontend/src/locales/fr-FR/index.json
index 7e396f6e10..16be96be46 100644
--- a/apps/frontend/src/locales/fr-FR/index.json
+++ b/apps/frontend/src/locales/fr-FR/index.json
@@ -3074,9 +3074,6 @@
"profile.label.collection": {
"message": "Collection"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {téléchargement} other {téléchargements}}"
- },
"profile.label.joined": {
"message": "Rejoint"
},
@@ -3095,9 +3092,6 @@
"profile.label.organizations": {
"message": "Organisations"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {projet} other {projets}}"
- },
"profile.label.saving": {
"message": "Sauvegarde en cours..."
},
@@ -3662,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "Visiter le tableau de contrôle des projets"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {# téléchargement} other {# téléchargements}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {# suivi} other {# suivis}}"
- },
"project.status.archived.message": {
"message": "{title} a été archivé. {title} ne recevra plus de mises à jour jusqu'à ce que l'auteur du projet décide de désarchiver le projet."
},
diff --git a/apps/frontend/src/locales/he-IL/index.json b/apps/frontend/src/locales/he-IL/index.json
index 7c34f73752..e8910f1d86 100644
--- a/apps/frontend/src/locales/he-IL/index.json
+++ b/apps/frontend/src/locales/he-IL/index.json
@@ -1838,9 +1838,6 @@
"profile.label.collection": {
"message": "אוסף"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {download} other {downloads}}"
- },
"profile.label.joined": {
"message": "הצטרף ב-"
},
@@ -1859,9 +1856,6 @@
"profile.label.organizations": {
"message": "ארגונים"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {project} other {projects}}"
- },
"profile.label.saving": {
"message": "שומר..."
},
diff --git a/apps/frontend/src/locales/hu-HU/index.json b/apps/frontend/src/locales/hu-HU/index.json
index e835b7bb7c..52c45132d1 100644
--- a/apps/frontend/src/locales/hu-HU/index.json
+++ b/apps/frontend/src/locales/hu-HU/index.json
@@ -2966,9 +2966,6 @@
"profile.label.collection": {
"message": "Gyűjtemény"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {letöltés} other {letöltések}}"
- },
"profile.label.joined": {
"message": "Csatlakozott"
},
@@ -2987,9 +2984,6 @@
"profile.label.organizations": {
"message": "Szervezetek"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {projekt} other {projektek}}"
- },
"profile.label.saving": {
"message": "Mentés..."
},
@@ -3476,12 +3470,6 @@
"project.settings.visit-dashboard": {
"message": "Projektek irányítópult megnyitása"
},
- "project.stats.downloads-label": {
- "message": "{count} letöltés"
- },
- "project.stats.followers-label": {
- "message": "{count} követő"
- },
"project.status.archived.message": {
"message": "A(z) {title} archiválásra került. A(z) {title} nem kap további frissítéseket, kivéve, ha a fejlesztő úgy dönt, hogy visszavonja a projekt archiválását."
},
diff --git a/apps/frontend/src/locales/id-ID/index.json b/apps/frontend/src/locales/id-ID/index.json
index 165a65df58..bf545088ae 100644
--- a/apps/frontend/src/locales/id-ID/index.json
+++ b/apps/frontend/src/locales/id-ID/index.json
@@ -2219,9 +2219,6 @@
"profile.label.collection": {
"message": "Koleksi"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, other {pengunduhan}}"
- },
"profile.label.joined": {
"message": "Telah bergabung"
},
@@ -2240,9 +2237,6 @@
"profile.label.organizations": {
"message": "Organisasi"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, other {proyek}}"
- },
"profile.label.saving": {
"message": "Menyimpan..."
},
diff --git a/apps/frontend/src/locales/it-IT/index.json b/apps/frontend/src/locales/it-IT/index.json
index 9ecb1092ea..fda04f9565 100644
--- a/apps/frontend/src/locales/it-IT/index.json
+++ b/apps/frontend/src/locales/it-IT/index.json
@@ -3059,9 +3059,6 @@
"profile.label.collection": {
"message": "Raccolta"
},
- "profile.label.downloads": {
- "message": "{count} download"
- },
"profile.label.joined": {
"message": "Iscrizione"
},
@@ -3080,9 +3077,6 @@
"profile.label.organizations": {
"message": "Organizzazioni"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {progetto} other {progetti}}"
- },
"profile.label.saving": {
"message": "Salvando..."
},
@@ -3647,12 +3641,6 @@
"project.settings.visit-dashboard": {
"message": "Visita bacheca del progetto"
},
- "project.stats.downloads-label": {
- "message": "{count} download"
- },
- "project.stats.followers-label": {
- "message": "{count} follower"
- },
"project.status.archived.message": {
"message": "{title} è stato archiviato. {title} non riceverà più aggiornamenti a meno che l'autore decida di rimuoverlo dall'archivio."
},
diff --git a/apps/frontend/src/locales/ja-JP/index.json b/apps/frontend/src/locales/ja-JP/index.json
index 5d975367f2..e012802c56 100644
--- a/apps/frontend/src/locales/ja-JP/index.json
+++ b/apps/frontend/src/locales/ja-JP/index.json
@@ -2597,9 +2597,6 @@
"profile.label.collection": {
"message": "コレクション"
},
- "profile.label.downloads": {
- "message": "{count}件のダウンロード"
- },
"profile.label.joined": {
"message": "参加: "
},
@@ -2618,9 +2615,6 @@
"profile.label.organizations": {
"message": "組織"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {プロジェクト} other {プロジェクト}}"
- },
"profile.label.saving": {
"message": "保存中…"
},
diff --git a/apps/frontend/src/locales/ko-KR/index.json b/apps/frontend/src/locales/ko-KR/index.json
index e9e150cdc4..f32f26aeef 100644
--- a/apps/frontend/src/locales/ko-KR/index.json
+++ b/apps/frontend/src/locales/ko-KR/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "컬렉션"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {다운로드} other {다운로드}}"
- },
"profile.label.joined": {
"message": "가입"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "조직"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {프로젝트} other {프로젝트}}"
- },
"profile.label.saving": {
"message": "저장..."
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "프로젝트 대시보드 방문"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {{count}회 다운로드} other {{count}회 다운로드}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {팔로워} other {팔로워}}"
- },
"project.status.archived.message": {
"message": "{title} 은(는) 보관되었습니다. 작성자가 프로젝트 보관 해제를 결정하지 않는 한 더 이상 업데이트가 제공되지 않습니다."
},
diff --git a/apps/frontend/src/locales/ms-MY/index.json b/apps/frontend/src/locales/ms-MY/index.json
index 32e40ee72a..efcbf9d35a 100644
--- a/apps/frontend/src/locales/ms-MY/index.json
+++ b/apps/frontend/src/locales/ms-MY/index.json
@@ -2750,9 +2750,6 @@
"profile.label.collection": {
"message": "Koleksi"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, other {muat turun}}"
- },
"profile.label.joined": {
"message": "Telah menyertai"
},
@@ -2771,9 +2768,6 @@
"profile.label.organizations": {
"message": "Organisasi"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, other {projek}}"
- },
"profile.label.saving": {
"message": "Sedang menyimpan..."
},
@@ -3188,9 +3182,6 @@
"project.settings.visit-dashboard": {
"message": "Kunjungi papan pemuka projek"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, other {muat turun}}"
- },
"project.status.archived.message": {
"message": "{title} telah diarkibkan. {title} tidak akan menerima sebarang kemas kini lanjut melainkan pengarang memutuskan untuk menyaharkibkan projek."
},
diff --git a/apps/frontend/src/locales/nl-NL/index.json b/apps/frontend/src/locales/nl-NL/index.json
index 97667d87c6..1e7ca31992 100644
--- a/apps/frontend/src/locales/nl-NL/index.json
+++ b/apps/frontend/src/locales/nl-NL/index.json
@@ -3065,9 +3065,6 @@
"profile.label.collection": {
"message": "Collectie"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {download} other {downloads}}"
- },
"profile.label.joined": {
"message": "Lid geworden"
},
@@ -3086,9 +3083,6 @@
"profile.label.organizations": {
"message": "Organisaties"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {project} other {projecten}}"
- },
"profile.label.saving": {
"message": "Opslaan..."
},
diff --git a/apps/frontend/src/locales/no-NO/index.json b/apps/frontend/src/locales/no-NO/index.json
index 49c35c6ae4..3ed6bb01dd 100644
--- a/apps/frontend/src/locales/no-NO/index.json
+++ b/apps/frontend/src/locales/no-NO/index.json
@@ -2678,9 +2678,6 @@
"profile.label.collection": {
"message": "Samling"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {nedlasting} other {nedlastinger}}"
- },
"profile.label.joined": {
"message": "Blei med"
},
@@ -2699,9 +2696,6 @@
"profile.label.organizations": {
"message": "Organisasjoner"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {projekt} other {projekt}}"
- },
"profile.label.saving": {
"message": "Lagrer..."
},
@@ -3038,12 +3032,6 @@
"project.settings.visit-dashboard": {
"message": "Besøk prosjekt-dashbordet"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {nedlasting} other {nedlastinger}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {følger} other {følgere}}"
- },
"project.status.archived.message": {
"message": "{title} har blitt arkivert. {title} kommer ikke til å få noen nye oppdateringer, hvis ikke forfatteren bestemmer seg for å dearkivere prosjektet."
},
diff --git a/apps/frontend/src/locales/pl-PL/index.json b/apps/frontend/src/locales/pl-PL/index.json
index 1bca82dca8..ee1e748a80 100644
--- a/apps/frontend/src/locales/pl-PL/index.json
+++ b/apps/frontend/src/locales/pl-PL/index.json
@@ -3062,9 +3062,6 @@
"profile.label.collection": {
"message": "Kolekcja"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {pobranie} few {pobrania} other {pobrań}}"
- },
"profile.label.joined": {
"message": "Dołączył(-a)"
},
@@ -3083,9 +3080,6 @@
"profile.label.organizations": {
"message": "Organizacje"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {projekt} few {projekty} other {projektów}}"
- },
"profile.label.saving": {
"message": "Zapisywanie..."
},
@@ -3647,12 +3641,6 @@
"project.settings.visit-dashboard": {
"message": "Odwiedź pulpit projektów"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {pobranie} few {pobrania} other {pobrań}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {obserwujący} other {obserwujących}}"
- },
"project.status.archived.message": {
"message": "{title} zostało zarchiwizowane. {title} nie będzie otrzymywać żadnych dalszych aktualizacji, chyba że autor zdecyduje się przywrócić projekt."
},
diff --git a/apps/frontend/src/locales/pt-BR/index.json b/apps/frontend/src/locales/pt-BR/index.json
index 1f5deace85..1f6b1b63ab 100644
--- a/apps/frontend/src/locales/pt-BR/index.json
+++ b/apps/frontend/src/locales/pt-BR/index.json
@@ -3656,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "Visitar painel de projetos"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, =0 {Nenhum download} one {# download} other {# downloads}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, =0 {Nenhum seguidor} one {# seguidor} other {# seguidores}}"
- },
"project.status.archived.message": {
"message": "{title} foi arquivado. {title} não receberá atualizações a menos que o autor decida desarquivar o projeto."
},
diff --git a/apps/frontend/src/locales/pt-PT/index.json b/apps/frontend/src/locales/pt-PT/index.json
index bc04f4977e..0ca09b38c6 100644
--- a/apps/frontend/src/locales/pt-PT/index.json
+++ b/apps/frontend/src/locales/pt-PT/index.json
@@ -2561,9 +2561,6 @@
"profile.label.collection": {
"message": "Coleção"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {transferência} other {transferências}}"
- },
"profile.label.joined": {
"message": "Entrou"
},
@@ -2582,9 +2579,6 @@
"profile.label.organizations": {
"message": "Organizações"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural,one {projeto} other {projetos}}"
- },
"profile.label.saving": {
"message": "A guardar..."
},
diff --git a/apps/frontend/src/locales/ru-RU/index.json b/apps/frontend/src/locales/ru-RU/index.json
index 00627e8860..721556361b 100644
--- a/apps/frontend/src/locales/ru-RU/index.json
+++ b/apps/frontend/src/locales/ru-RU/index.json
@@ -3065,9 +3065,6 @@
"profile.label.collection": {
"message": "Коллекция"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {скачивание} few {скачивания} other {скачиваний}}"
- },
"profile.label.joined": {
"message": "Регистрация:"
},
@@ -3086,9 +3083,6 @@
"profile.label.organizations": {
"message": "Организации"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {проект} few {проекта} other {проектов}}"
- },
"profile.label.saving": {
"message": "Сохранение..."
},
@@ -3653,12 +3647,6 @@
"project.settings.visit-dashboard": {
"message": "Управление проектами"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {загрузка} few {загрузки} other {загрузок}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {подписчик} few {подписчика} other {подписчиков}}"
- },
"project.status.archived.message": {
"message": "{title} помещён в архив. {title} больше не будет получать обновления, если только автор не решит разархивировать проект."
},
diff --git a/apps/frontend/src/locales/sv-SE/index.json b/apps/frontend/src/locales/sv-SE/index.json
index 4145156f90..01263d5c40 100644
--- a/apps/frontend/src/locales/sv-SE/index.json
+++ b/apps/frontend/src/locales/sv-SE/index.json
@@ -2738,9 +2738,6 @@
"profile.label.collection": {
"message": "Samling"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {nedladdning} other {nedladdningar}}"
- },
"profile.label.joined": {
"message": "Gick med"
},
diff --git a/apps/frontend/src/locales/tr-TR/index.json b/apps/frontend/src/locales/tr-TR/index.json
index 383ffec611..2b3d501e57 100644
--- a/apps/frontend/src/locales/tr-TR/index.json
+++ b/apps/frontend/src/locales/tr-TR/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "Koleksiyon"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {indirme} other {indirmeler}}"
- },
"profile.label.joined": {
"message": "Katılma:"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "Organizasyonlar"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {proje} other {projeler}}"
- },
"profile.label.saving": {
"message": "Kaydediliyor..."
},
@@ -3602,12 +3596,6 @@
"project.settings.visit-dashboard": {
"message": "Projeler panelini ziyaret et"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {download} other {downloads}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {follower} other {followers}}"
- },
"project.status.archived.message": {
"message": "{title} arşivlenmiş. {title}, yapımcı fikrini değiştirmediği sürece daha fazla güncelleme almayacak."
},
diff --git a/apps/frontend/src/locales/uk-UA/index.json b/apps/frontend/src/locales/uk-UA/index.json
index ffa2ce50f9..c2bb55b981 100644
--- a/apps/frontend/src/locales/uk-UA/index.json
+++ b/apps/frontend/src/locales/uk-UA/index.json
@@ -3071,9 +3071,6 @@
"profile.label.collection": {
"message": "Добірка"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {завантаження} few {завантаження} many {завантажень} other {завантажень}}"
- },
"profile.label.joined": {
"message": "Приєднався"
},
@@ -3092,9 +3089,6 @@
"profile.label.organizations": {
"message": "Організації"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {проєкт} few {проєкти} many {проєктів} other {проєктів}}"
- },
"profile.label.saving": {
"message": "Збереження…"
},
@@ -3659,12 +3653,6 @@
"project.settings.visit-dashboard": {
"message": "Панель керування проєктами"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, one {завантаження} few {завантаження} many {завантажень} other {завантаження}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, one {стежить} few {стежать} many {стежать} other {стежать}}"
- },
"project.status.archived.message": {
"message": "«{title}» було архівовано. «{title}» не отримуватиме подальших оновлень допоки автор не вирішить розархівувати проєкт."
},
diff --git a/apps/frontend/src/locales/vi-VN/index.json b/apps/frontend/src/locales/vi-VN/index.json
index 8e3b5e1238..6d4dc9e296 100644
--- a/apps/frontend/src/locales/vi-VN/index.json
+++ b/apps/frontend/src/locales/vi-VN/index.json
@@ -2861,9 +2861,6 @@
"profile.label.collection": {
"message": "Bộ sưu tập"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, one {lượt tải xuống} other {lượt tải xuống}}"
- },
"profile.label.joined": {
"message": "Đã tham gia"
},
@@ -2882,9 +2879,6 @@
"profile.label.organizations": {
"message": "Tổ chức"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, one {dự án} other {dự án}}"
- },
"profile.label.saving": {
"message": "Đang lưu..."
},
@@ -3284,12 +3278,6 @@
"project.settings.visit-dashboard": {
"message": "Truy cập bảng điều khiển dự án"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, other {lượt tải}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, other {lượt theo dõi}}"
- },
"project.status.archived.message": {
"message": "{title} đã được lưu trữ. {title} sẽ không nhận được bất kỳ bản cập nhật nào trong tương lai trừ khi tác giả quyết định hủy lưu trữ dự án."
},
diff --git a/apps/frontend/src/locales/zh-CN/index.json b/apps/frontend/src/locales/zh-CN/index.json
index 3a6a9fc5a9..49716cfce9 100644
--- a/apps/frontend/src/locales/zh-CN/index.json
+++ b/apps/frontend/src/locales/zh-CN/index.json
@@ -3068,9 +3068,6 @@
"profile.label.collection": {
"message": "收藏夹"
},
- "profile.label.downloads": {
- "message": "{count} {countPlural, plural, other {次下载}}"
- },
"profile.label.joined": {
"message": "加入于"
},
@@ -3089,9 +3086,6 @@
"profile.label.organizations": {
"message": "组织"
},
- "profile.label.projects": {
- "message": "{count} {countPlural, plural, other {个项目}}"
- },
"profile.label.saving": {
"message": "正在保存…"
},
@@ -3656,12 +3650,6 @@
"project.settings.visit-dashboard": {
"message": "访问项目的控制面板"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, other {下载}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, other {关注者}}"
- },
"project.status.archived.message": {
"message": "{title} 已归档。除非作者决定取消归档，否则 {title} 将不再更新。"
},
diff --git a/apps/frontend/src/locales/zh-TW/index.json b/apps/frontend/src/locales/zh-TW/index.json
index f2ca1a781c..a79e84c592 100644
--- a/apps/frontend/src/locales/zh-TW/index.json
+++ b/apps/frontend/src/locales/zh-TW/index.json
@@ -3074,9 +3074,6 @@
"profile.label.collection": {
"message": "收藏"
},
- "profile.label.downloads": {
- "message": "下載次數：{count}"
- },
"profile.label.joined": {
"message": "加入時間："
},
@@ -3095,9 +3092,6 @@
"profile.label.organizations": {
"message": "組織"
},
- "profile.label.projects": {
- "message": "{count} 個{countPlural, plural, other {專案}}"
- },
"profile.label.saving": {
"message": "儲存中..."
},
@@ -3662,12 +3656,6 @@
"project.settings.visit-dashboard": {
"message": "前往專案資訊主頁"
},
- "project.stats.downloads-label": {
- "message": "{count, plural, other {下載}}"
- },
- "project.stats.followers-label": {
- "message": "{count, plural, other {追蹤者}}"
- },
"project.status.archived.message": {
"message": "{title} 已封存。{title} 將不會再收到任何後續更新，除非作者決定解除封存該專案。"
},
diff --git a/apps/frontend/src/pages/[type]/[project].vue b/apps/frontend/src/pages/[type]/[project].vue
index b21380e860..7f908b9904 100644
--- a/apps/frontend/src/pages/[type]/[project].vue
+++ b/apps/frontend/src/pages/[type]/[project].vue
@@ -130,29 +130,27 @@
@set-processing="setProcessing"
/>