From 365367dd16f0ca37f9d43f52af020c4dc99b374b Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sun, 6 Apr 2025 16:54:18 -0400
Subject: [PATCH 01/28] Hide collections with no projects from public view
 (#3408)

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
---
 apps/labrinth/src/auth/checks.rs           | 3 ++-
 apps/labrinth/src/routes/v3/collections.rs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/labrinth/src/auth/checks.rs b/apps/labrinth/src/auth/checks.rs
index d347f70a..34a61296 100644
--- a/apps/labrinth/src/auth/checks.rs
+++ b/apps/labrinth/src/auth/checks.rs
@@ -328,7 +328,8 @@ pub async fn is_visible_collection(
     collection_data: &Collection,
     user_option: &Option<User>,
 ) -> Result<bool, ApiError> {
-    let mut authorized = !collection_data.status.is_hidden();
+    let mut authorized = !collection_data.status.is_hidden()
+        && !collection_data.projects.is_empty();
     if let Some(user) = &user_option {
         if !authorized
             && (user.role.is_mod() || user.id == collection_data.user_id.into())
diff --git a/apps/labrinth/src/routes/v3/collections.rs b/apps/labrinth/src/routes/v3/collections.rs
index 0d6a0c31..3e03fd9b 100644
--- a/apps/labrinth/src/routes/v3/collections.rs
+++ b/apps/labrinth/src/routes/v3/collections.rs
@@ -50,7 +50,7 @@ pub struct CollectionCreateData {
     #[validate(length(min = 3, max = 255))]
     /// A short description of the collection.
     pub description: Option<String>,
-    #[validate(length(max = 32))]
+    #[validate(length(max = 1024))]
     #[serde(default = "Vec::new")]
     /// A list of initial projects to use with the created collection
     pub projects: Vec<String>,

From e008b657a5f260ffa052d4a03bdd901277f07e70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?=
 <7822554+AlexTMjugador@users.noreply.github.com>
Date: Sat, 12 Apr 2025 15:45:17 +0200
Subject: [PATCH 02/28] Fix Clippy lints (#3494)

* chore: fix some Clippy lints

* chore(labrinth): more Clippy fixes
---
 apps/daedalus_client/src/forge.rs                  | 2 +-
 apps/labrinth/src/models/v3/billing.rs             | 4 ++--
 apps/labrinth/src/routes/v2/version_creation.rs    | 2 +-
 apps/labrinth/src/routes/v3/version_file.rs        | 6 +++---
 packages/app-lib/src/api/pack/import/curseforge.rs | 2 +-
 packages/app-lib/src/util/io.rs                    | 7 ++-----
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs
index 5591f321..a4f7a33a 100644
--- a/apps/daedalus_client/src/forge.rs
+++ b/apps/daedalus_client/src/forge.rs
@@ -598,7 +598,7 @@ async fn fetch(
                             ))
                                 })?;
 
-                        let file_name = value.split('/').last()
+                        let file_name = value.split('/').next_back()
                             .ok_or_else(|| {
                                 crate::ErrorKind::InvalidInput(format!(
                                     "Unable reading filename for data key {key} at path {value}",
diff --git a/apps/labrinth/src/models/v3/billing.rs b/apps/labrinth/src/models/v3/billing.rs
index ade642d1..b9892a97 100644
--- a/apps/labrinth/src/models/v3/billing.rs
+++ b/apps/labrinth/src/models/v3/billing.rs
@@ -189,8 +189,8 @@ impl ChargeType {
     pub fn as_str(&self) -> &'static str {
         match self {
             ChargeType::OneTime => "one-time",
-            ChargeType::Subscription { .. } => "subscription",
-            ChargeType::Proration { .. } => "proration",
+            ChargeType::Subscription => "subscription",
+            ChargeType::Proration => "proration",
             ChargeType::Refund => "refund",
         }
     }
diff --git a/apps/labrinth/src/routes/v2/version_creation.rs b/apps/labrinth/src/routes/v2/version_creation.rs
index ba8248db..c86b2eb1 100644
--- a/apps/labrinth/src/routes/v2/version_creation.rs
+++ b/apps/labrinth/src/routes/v2/version_creation.rs
@@ -188,7 +188,7 @@ pub async fn version_create(
                 // Handle project type via file extension prediction
                 let mut project_type = None;
                 for file_part in &legacy_create.file_parts {
-                    if let Some(ext) = file_part.split('.').last() {
+                    if let Some(ext) = file_part.split('.').next_back() {
                         match ext {
                             "mrpack" | "mrpack-primary" => {
                                 project_type = Some("modpack");
diff --git a/apps/labrinth/src/routes/v3/version_file.rs b/apps/labrinth/src/routes/v3/version_file.rs
index e34d8ef5..76bcd347 100644
--- a/apps/labrinth/src/routes/v3/version_file.rs
+++ b/apps/labrinth/src/routes/v3/version_file.rs
@@ -155,7 +155,7 @@ pub async fn get_update_from_hash(
             database::models::Project::get_id(file.project_id, &**pool, &redis)
                 .await?
         {
-            let versions = database::models::Version::get_many(
+            let mut versions = database::models::Version::get_many(
                 &project.versions,
                 &**pool,
                 &redis,
@@ -191,7 +191,7 @@ pub async fn get_update_from_hash(
             })
             .sorted();
 
-            if let Some(first) = versions.last() {
+            if let Some(first) = versions.next_back() {
                 if !is_visible_version(
                     &first.inner,
                     &user_option,
@@ -523,7 +523,7 @@ pub async fn update_individual_files(
                             bool
                         })
                         .sorted()
-                        .last();
+                        .next_back();
 
                     if let Some(version) = version {
                         if is_visible_version(
diff --git a/packages/app-lib/src/api/pack/import/curseforge.rs b/packages/app-lib/src/api/pack/import/curseforge.rs
index aee03f80..9aac5992 100644
--- a/packages/app-lib/src/api/pack/import/curseforge.rs
+++ b/packages/app-lib/src/api/pack/import/curseforge.rs
@@ -78,7 +78,7 @@ pub async fn import_curseforge(
         let icon_bytes =
             fetch(&thumbnail_url, None, &state.fetch_semaphore, &state.pool)
                 .await?;
-        let filename = thumbnail_url.rsplit('/').last();
+        let filename = thumbnail_url.rsplit('/').next_back();
         if let Some(filename) = filename {
             icon = Some(
                 write_cached_icon(
diff --git a/packages/app-lib/src/util/io.rs b/packages/app-lib/src/util/io.rs
index 539c0003..684cc2b9 100644
--- a/packages/app-lib/src/util/io.rs
+++ b/packages/app-lib/src/util/io.rs
@@ -139,9 +139,7 @@ pub async fn write(
         })
     })
     .await
-    .map_err(|_| {
-        std::io::Error::new(std::io::ErrorKind::Other, "background task failed")
-    })??;
+    .map_err(|_| std::io::Error::other("background task failed"))??;
 
     Ok(())
 }
@@ -152,8 +150,7 @@ fn sync_write(
 ) -> Result<(), std::io::Error> {
     let mut tempfile =
         NamedTempFile::new_in(path.as_ref().parent().ok_or_else(|| {
-            std::io::Error::new(
-                std::io::ErrorKind::Other,
+            std::io::Error::other(
                 "could not get parent directory for temporary file",
             )
         })?)?;

From 6f43fc272b0fa703e8379a4c61bf6f57058f73e1 Mon Sep 17 00:00:00 2001
From: un_pogaz <46523284+un-pogaz@users.noreply.github.com>
Date: Sat, 12 Apr 2025 17:21:20 +0200
Subject: [PATCH 03/28] fix: use local assets for "apps/labrinth/README.md"
 (#3489)

---
 .github/assets/api_cover.png | Bin 0 -> 22720 bytes
 apps/labrinth/README.md      |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .github/assets/api_cover.png

diff --git a/.github/assets/api_cover.png b/.github/assets/api_cover.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ad8f8b415a57c19db5be9ec77f7d3cd936c4d65
GIT binary patch
literal 22720
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
H&&U4(CTsOD

literal 0
HcmV?d00001

diff --git a/apps/labrinth/README.md b/apps/labrinth/README.md
index de6976a4..6377ee2f 100644
--- a/apps/labrinth/README.md
+++ b/apps/labrinth/README.md
@@ -1,4 +1,4 @@
-![labrinth banner](https://user-images.githubusercontent.com/12068027/100479891-d6bab300-30ac-11eb-8336-b4cad376a03d.png)
+![labrinth banner](/.github/assets/api_cover.png)
 
 ## Modrinth's laboratory for its backend service & API!
 

From 8ad5e011caa7d69ec45bed0cb4fea2c905554e23 Mon Sep 17 00:00:00 2001
From: Tiziano <69322987+T1xx1@users.noreply.github.com>
Date: Sat, 12 Apr 2025 17:22:41 +0200
Subject: [PATCH 04/28] Update 1-app-bug.yml (#3486)

Signed-off-by: Tiziano <69322987+T1xx1@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/1-app-bug.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/1-app-bug.yml b/.github/ISSUE_TEMPLATE/1-app-bug.yml
index 39d7e2e1..201ab4c2 100644
--- a/.github/ISSUE_TEMPLATE/1-app-bug.yml
+++ b/.github/ISSUE_TEMPLATE/1-app-bug.yml
@@ -16,7 +16,7 @@ body:
     id: version
     attributes:
       label: What version of the Modrinth App are you using?
-      description: Find this in ⚙️ Settings (bottom right) -> About -> App version.
+      description: Find this in ⚙️ Settings (bottom right) -> After Modrinth App (bottom left)
     validations:
       required: true
   - type: dropdown

From 487bdd1e48e3e0ecf2c353ac58ff1a24df8c99ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Gonz=C3=A1lez?=
 <7822554+AlexTMjugador@users.noreply.github.com>
Date: Sat, 12 Apr 2025 17:42:45 +0200
Subject: [PATCH 05/28] chore: remove unused Rust dependencies (#3492)

---
 Cargo.lock                      | 947 ++++++++------------------------
 apps/app-playground/Cargo.toml  |  11 -
 apps/app/Cargo.toml             |   6 -
 apps/daedalus_client/Cargo.toml |   2 -
 apps/labrinth/Cargo.toml        |   7 +-
 packages/app-lib/Cargo.toml     |   2 -
 packages/daedalus/Cargo.toml    |   1 -
 7 files changed, 224 insertions(+), 752 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b29561b..2ee6be34 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -9,12 +9,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a"
 dependencies = [
  "bitflags 2.6.0",
- "bytes 1.7.2",
+ "bytes",
  "futures-core",
  "futures-sink",
  "memchr",
  "pin-project-lite",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
  "tracing",
 ]
@@ -31,7 +31,7 @@ dependencies = [
  "futures-util",
  "log",
  "once_cell",
- "smallvec 1.13.2",
+ "smallvec",
 ]
 
 [[package]]
@@ -45,7 +45,7 @@ dependencies = [
  "actix-utils",
  "actix-web",
  "bitflags 2.6.0",
- "bytes 1.7.2",
+ "bytes",
  "derive_more",
  "futures-core",
  "http-range",
@@ -71,7 +71,7 @@ dependencies = [
  "base64 0.22.1",
  "bitflags 2.6.0",
  "brotli 6.0.0",
- "bytes 1.7.2",
+ "bytes",
  "bytestring",
  "derive_more",
  "encoding_rs",
@@ -89,8 +89,8 @@ dependencies = [
  "pin-project-lite",
  "rand 0.8.5",
  "sha1 0.10.6",
- "smallvec 1.13.2",
- "tokio 1.42.0",
+ "smallvec",
+ "tokio",
  "tokio-util",
  "tracing",
  "zstd 0.13.2",
@@ -115,7 +115,7 @@ dependencies = [
  "actix-multipart-derive",
  "actix-utils",
  "actix-web",
- "bytes 1.7.2",
+ "bytes",
  "derive_more",
  "futures-core",
  "futures-util",
@@ -129,7 +129,7 @@ dependencies = [
  "serde_json",
  "serde_plain",
  "tempfile",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -152,7 +152,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8"
 dependencies = [
  "bytestring",
- "cfg-if 1.0.0",
+ "cfg-if",
  "http 0.2.12",
  "regex",
  "regex-lite",
@@ -168,7 +168,7 @@ checksum = "24eda4e2a6e042aa4e55ac438a2ae052d3b5da0ecf83d7411e1a368946925208"
 dependencies = [
  "actix-macros",
  "futures-core",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -184,7 +184,7 @@ dependencies = [
  "futures-util",
  "mio 1.0.2",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
 ]
 
@@ -225,9 +225,9 @@ dependencies = [
  "actix-utils",
  "actix-web-codegen",
  "ahash 0.8.11",
- "bytes 1.7.2",
+ "bytes",
  "bytestring",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cookie 0.16.2",
  "derive_more",
  "encoding_rs",
@@ -245,7 +245,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "smallvec 1.13.2",
+ "smallvec",
  "socket2",
  "time",
  "url",
@@ -289,7 +289,7 @@ dependencies = [
  "actix-web",
  "bytestring",
  "futures-core",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -319,7 +319,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cipher",
  "cpufeatures",
 ]
@@ -341,7 +341,7 @@ version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom 0.2.15",
  "once_cell",
  "version_check",
@@ -515,7 +515,7 @@ dependencies = [
  "raw-window-handle 0.6.2",
  "serde",
  "serde_repr",
- "tokio 1.42.0",
+ "tokio",
  "url",
  "wayland-backend",
  "wayland-client",
@@ -572,7 +572,7 @@ dependencies = [
  "futures-io",
  "memchr",
  "pin-project-lite",
- "tokio 1.42.0",
+ "tokio",
  "xz2",
  "zstd 0.13.2",
  "zstd-safe 7.2.1",
@@ -609,7 +609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
 dependencies = [
  "async-lock",
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite 2.3.0",
@@ -644,7 +644,7 @@ dependencies = [
  "async-signal",
  "async-task",
  "blocking",
- "cfg-if 1.0.0",
+ "cfg-if",
  "event-listener 5.3.1",
  "futures-lite 2.3.0",
  "rustix",
@@ -671,7 +671,7 @@ dependencies = [
  "async-io",
  "async-lock",
  "atomic-waker",
- "cfg-if 1.0.0",
+ "cfg-if",
  "futures-core",
  "futures-io",
  "rustix",
@@ -723,7 +723,7 @@ dependencies = [
  "smart-default",
  "smol_str",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "uuid 0.8.2",
 ]
 
@@ -755,7 +755,7 @@ dependencies = [
  "log",
  "pin-project-lite",
  "rustls-pki-types",
- "tokio 1.42.0",
+ "tokio",
  "tokio-rustls 0.26.0",
  "tungstenite",
  "webpki-roots 0.26.6",
@@ -773,7 +773,7 @@ dependencies = [
  "futures-lite 2.3.0",
  "pin-project",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
 ]
 
@@ -872,7 +872,7 @@ checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
- "bytes 1.7.2",
+ "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -898,7 +898,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
 dependencies = [
  "async-trait",
- "bytes 1.7.2",
+ "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -918,7 +918,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "miniz_oxide 0.8.0",
  "object",
@@ -1187,16 +1187,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
 
-[[package]]
-name = "bytes"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c"
-dependencies = [
- "byteorder",
- "iovec",
-]
-
 [[package]]
 name = "bytes"
 version = "1.7.2"
@@ -1212,7 +1202,7 @@ version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
 ]
 
 [[package]]
@@ -1287,7 +1277,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.23",
+ "semver",
  "serde",
  "serde_json",
  "thiserror 1.0.64",
@@ -1346,16 +1336,10 @@ version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
 dependencies = [
- "smallvec 1.13.2",
+ "smallvec",
  "target-lexicon",
 ]
 
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -1450,10 +1434,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a0875e527e299fc5f4faba42870bf199a39ab0bb2dbba1b8aef0a2151451130f"
 dependencies = [
  "bstr",
- "bytes 1.7.2",
+ "bytes",
  "clickhouse-derive",
  "clickhouse-rs-cityhash-sys",
- "futures 0.3.30",
+ "futures",
  "hyper 0.14.31",
  "hyper-tls 0.5.0",
  "lz4",
@@ -1462,7 +1446,7 @@ dependencies = [
  "static_assertions",
  "thiserror 1.0.64",
  "time",
- "tokio 1.42.0",
+ "tokio",
  "url",
  "uuid 1.12.0",
 ]
@@ -1488,15 +1472,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "cloudabi"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-dependencies = [
- "bitflags 1.3.2",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.25.0"
@@ -1584,11 +1559,11 @@ version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-core",
  "memchr",
  "pin-project-lite",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
 ]
 
@@ -1598,7 +1573,7 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
- "crossbeam-utils 0.8.20",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -1635,7 +1610,7 @@ checksum = "6539aa9c6a4cd31f4b1c040f860a1eac9aa80e7df6b05d506a6e7179936d6a01"
 dependencies = [
  "console-api",
  "crossbeam-channel",
- "crossbeam-utils 0.8.20",
+ "crossbeam-utils",
  "futures-task",
  "hdrhistogram",
  "humantime",
@@ -1645,7 +1620,7 @@ dependencies = [
  "serde",
  "serde_json",
  "thread_local",
- "tokio 1.42.0",
+ "tokio",
  "tokio-stream",
  "tonic",
  "tracing",
@@ -1831,7 +1806,7 @@ version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -1840,18 +1815,7 @@ version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "crossbeam-utils 0.8.20",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20ff29ded3204c5106278a81a38f4b482636ed4fa1e6cfbeef193291beb29ed"
-dependencies = [
- "crossbeam-epoch 0.8.2",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -1860,23 +1824,8 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "crossbeam-epoch 0.9.18",
- "crossbeam-utils 0.8.20",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "lazy_static",
- "maybe-uninit",
- "memoffset 0.5.6",
- "scopeguard",
+ "crossbeam-epoch",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -1885,18 +1834,7 @@ version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "crossbeam-utils 0.8.20",
-]
-
-[[package]]
-name = "crossbeam-queue"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570"
-dependencies = [
- "cfg-if 0.1.10",
- "crossbeam-utils 0.7.2",
- "maybe-uninit",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -1905,18 +1843,7 @@ version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
- "crossbeam-utils 0.8.20",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
-dependencies = [
- "autocfg",
- "cfg-if 0.1.10",
- "lazy_static",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -1976,7 +1903,7 @@ dependencies = [
  "phf 0.8.0",
  "proc-macro2",
  "quote",
- "smallvec 1.13.2",
+ "smallvec",
  "syn 1.0.109",
 ]
 
@@ -2025,7 +1952,6 @@ dependencies = [
 name = "daedalus"
 version = "0.2.3"
 dependencies = [
- "bytes 1.7.2",
  "chrono",
  "serde",
  "serde_json",
@@ -2037,27 +1963,25 @@ name = "daedalus_client"
 version = "0.2.2"
 dependencies = [
  "async_zip",
- "bytes 1.7.2",
+ "bytes",
  "chrono",
  "daedalus",
  "dashmap 5.5.3",
  "dotenvy",
- "futures 0.3.30",
+ "futures",
  "indexmap 2.5.0",
  "itertools 0.13.0",
  "lazy_static",
  "reqwest 0.12.7",
  "rust-s3",
- "semver 1.0.23",
  "serde",
  "serde-xml-rs",
  "serde_json",
  "sha1_smol",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
  "tracing-error",
- "tracing-futures",
  "tracing-subscriber",
 ]
 
@@ -2137,11 +2061,11 @@ version = "5.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "hashbrown 0.14.5",
- "lock_api 0.4.12",
+ "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -2150,12 +2074,12 @@ version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
- "cfg-if 1.0.0",
- "crossbeam-utils 0.8.20",
+ "cfg-if",
+ "crossbeam-utils",
  "hashbrown 0.14.5",
- "lock_api 0.4.12",
+ "lock_api",
  "once_cell",
- "parking_lot_core 0.9.10",
+ "parking_lot_core",
  "serde",
 ]
 
@@ -2173,7 +2097,7 @@ checksum = "1bb21987b9fb1613058ba3843121dd18b163b254d8a6e797e144cbac14d96d1b"
 dependencies = [
  "libc",
  "libdbus-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2184,7 +2108,7 @@ checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed"
 dependencies = [
  "deadpool-runtime",
  "num_cpus",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -2203,7 +2127,7 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
 dependencies = [
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -2305,7 +2229,7 @@ dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.1",
+ "rustc_version",
  "syn 2.0.90",
 ]
 
@@ -2354,7 +2278,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b98cf8ebf19c3d1b223e151f99a4f9f0690dca41414773390fc824184ac833e1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "dirs-sys-next",
 ]
 
@@ -2366,7 +2290,7 @@ checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2389,7 +2313,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d"
 dependencies = [
  "libc",
  "redox_users",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2440,7 +2364,7 @@ dependencies = [
  "dlopen2_derive",
  "libc",
  "once_cell",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2590,7 +2514,7 @@ checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa"
 dependencies = [
  "cc",
  "memchr",
- "rustc_version 0.4.1",
+ "rustc_version",
  "toml 0.8.19",
  "vswhom",
  "winreg 0.52.0",
@@ -2620,7 +2544,7 @@ version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
 ]
 
 [[package]]
@@ -2701,7 +2625,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "home",
  "windows-sys 0.48.0",
 ]
@@ -2745,7 +2669,7 @@ dependencies = [
  "lebe",
  "miniz_oxide 0.7.4",
  "rayon-core",
- "smallvec 1.13.2",
+ "smallvec",
  "zune-inflate",
 ]
 
@@ -2799,8 +2723,8 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f"
 dependencies = [
- "memoffset 0.9.1",
- "rustc_version 0.4.1",
+ "memoffset",
+ "rustc_version",
 ]
 
 [[package]]
@@ -2809,7 +2733,7 @@ version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "libredox",
  "windows-sys 0.59.0",
@@ -2824,7 +2748,7 @@ dependencies = [
  "cc",
  "lazy_static",
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -2914,22 +2838,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "fuchsia-zircon"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
-dependencies = [
- "bitflags 1.3.2",
- "fuchsia-zircon-sys",
-]
-
-[[package]]
-name = "fuchsia-zircon-sys"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2946,12 +2854,6 @@ dependencies = [
  "new_debug_unreachable",
 ]
 
-[[package]]
-name = "futures"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
-
 [[package]]
 name = "futures"
 version = "0.3.30"
@@ -3001,8 +2903,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
- "lock_api 0.4.12",
- "parking_lot 0.12.3",
+ "lock_api",
+ "parking_lot",
 ]
 
 [[package]]
@@ -3062,12 +2964,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
-[[package]]
-name = "futures-timer"
-version = "3.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
-
 [[package]]
 name = "futures-util"
 version = "0.3.30"
@@ -3221,7 +3117,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "wasi 0.9.0+wasi-snapshot-preview1",
 ]
@@ -3232,7 +3128,7 @@ version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
@@ -3270,7 +3166,7 @@ dependencies = [
  "libc",
  "once_cell",
  "pin-project-lite",
- "smallvec 1.13.2",
+ "smallvec",
  "thiserror 1.0.64",
 ]
 
@@ -3284,7 +3180,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "system-deps",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -3306,7 +3202,7 @@ dependencies = [
  "libc",
  "memchr",
  "once_cell",
- "smallvec 1.13.2",
+ "smallvec",
  "thiserror 1.0.64",
 ]
 
@@ -3420,7 +3316,7 @@ version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
@@ -3428,7 +3324,7 @@ dependencies = [
  "http 0.2.12",
  "indexmap 2.5.0",
  "slab",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
  "tracing",
 ]
@@ -3440,14 +3336,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205"
 dependencies = [
  "atomic-waker",
- "bytes 1.7.2",
+ "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
  "http 1.1.0",
  "indexmap 2.5.0",
  "slab",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
  "tracing",
 ]
@@ -3464,7 +3360,7 @@ version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "crunchy",
 ]
 
@@ -3591,7 +3487,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "windows 0.52.0",
 ]
@@ -3616,7 +3512,7 @@ version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "fnv",
  "itoa 1.0.11",
 ]
@@ -3627,7 +3523,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "fnv",
  "itoa 1.0.11",
 ]
@@ -3638,7 +3534,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "http 0.2.12",
  "pin-project-lite",
 ]
@@ -3649,7 +3545,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "http 1.1.0",
 ]
 
@@ -3659,7 +3555,7 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -3717,7 +3613,7 @@ version = "0.14.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c08302e8fa335b151b788c775ff56e7a03ae64ff85c548ee820fecb70356e85"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
@@ -3729,7 +3625,7 @@ dependencies = [
  "itoa 1.0.11",
  "pin-project-lite",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "tower-service",
  "tracing",
  "want",
@@ -3741,7 +3637,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-channel",
  "futures-util",
  "h2 0.4.6",
@@ -3751,8 +3647,8 @@ dependencies = [
  "httpdate",
  "itoa 1.0.11",
  "pin-project-lite",
- "smallvec 1.13.2",
- "tokio 1.42.0",
+ "smallvec",
+ "tokio",
  "want",
 ]
 
@@ -3768,7 +3664,7 @@ dependencies = [
  "log",
  "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
- "tokio 1.42.0",
+ "tokio",
  "tokio-rustls 0.24.1",
 ]
 
@@ -3785,7 +3681,7 @@ dependencies = [
  "rustls 0.23.13",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
- "tokio 1.42.0",
+ "tokio",
  "tokio-rustls 0.26.0",
  "tower-service",
  "webpki-roots 0.26.6",
@@ -3800,7 +3696,7 @@ dependencies = [
  "hyper 1.4.1",
  "hyper-util",
  "pin-project-lite",
- "tokio 1.42.0",
+ "tokio",
  "tower-service",
 ]
 
@@ -3810,10 +3706,10 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "hyper 0.14.31",
  "native-tls",
- "tokio 1.42.0",
+ "tokio",
  "tokio-native-tls",
 ]
 
@@ -3823,12 +3719,12 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "http-body-util",
  "hyper 1.4.1",
  "hyper-util",
  "native-tls",
- "tokio 1.42.0",
+ "tokio",
  "tokio-native-tls",
  "tower-service",
 ]
@@ -3839,7 +3735,7 @@ version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-channel",
  "futures-util",
  "http 1.1.0",
@@ -3847,7 +3743,7 @@ dependencies = [
  "hyper 1.4.1",
  "pin-project-lite",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "tower-service",
  "tracing",
 ]
@@ -3941,7 +3837,7 @@ dependencies = [
  "icu_normalizer_data",
  "icu_properties",
  "icu_provider",
- "smallvec 1.13.2",
+ "smallvec",
  "utf16_iter",
  "utf8_iter",
  "write16",
@@ -4037,7 +3933,7 @@ checksum = "bd69211b9b519e98303c015e21a007e293db403b6c85b9b124e133d25e242cdd"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
- "smallvec 1.13.2",
+ "smallvec",
  "utf8_iter",
 ]
 
@@ -4141,7 +4037,7 @@ dependencies = [
  "ahash 0.8.11",
  "clap",
  "crossbeam-channel",
- "crossbeam-utils 0.8.20",
+ "crossbeam-utils",
  "dashmap 6.1.0",
  "env_logger",
  "indexmap 2.5.0",
@@ -4189,16 +4085,7 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
- "cfg-if 1.0.0",
-]
-
-[[package]]
-name = "iovec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
-dependencies = [
- "libc",
+ "cfg-if",
 ]
 
 [[package]]
@@ -4345,7 +4232,7 @@ dependencies = [
  "pprof_util",
  "tempfile",
  "tikv-jemalloc-ctl",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
 ]
 
@@ -4356,7 +4243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
 dependencies = [
  "cesu8",
- "cfg-if 1.0.0",
+ "cfg-if",
  "combine",
  "jni-sys",
  "log",
@@ -4433,16 +4320,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
 [[package]]
 name = "keyboard-types"
 version = "0.7.0"
@@ -4505,7 +4382,7 @@ dependencies = [
  "async-trait",
  "base64 0.21.7",
  "bitflags 2.6.0",
- "bytes 1.7.2",
+ "bytes",
  "censor",
  "chrono",
  "clap",
@@ -4519,8 +4396,7 @@ dependencies = [
  "dotenvy",
  "either",
  "flate2",
- "futures 0.3.30",
- "futures-timer",
+ "futures",
  "futures-util",
  "hex",
  "hmac 0.11.0",
@@ -4549,8 +4425,6 @@ dependencies = [
  "sentry",
  "sentry-actix",
  "serde",
- "serde_bytes",
- "serde_cbor",
  "serde_json",
  "serde_with",
  "sha1 0.6.1",
@@ -4561,19 +4435,17 @@ dependencies = [
  "thiserror 1.0.64",
  "tikv-jemalloc-ctl",
  "tikv-jemallocator",
- "tokio 1.42.0",
+ "tokio",
  "tokio-stream",
  "totp-rs",
  "tracing",
  "tracing-actix-web",
- "tracing-subscriber",
  "url",
  "urlencoding",
  "uuid 1.12.0",
  "validator",
  "webp",
  "woothee",
- "xml-rs",
  "yaserde",
  "yaserde_derive",
  "zip 0.6.6",
@@ -4622,7 +4494,7 @@ dependencies = [
  "percent-encoding",
  "quoted_printable",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "url",
 ]
 
@@ -4672,8 +4544,8 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
 dependencies = [
- "cfg-if 1.0.0",
- "winapi 0.3.9",
+ "cfg-if",
+ "winapi",
 ]
 
 [[package]]
@@ -4690,7 +4562,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.6",
+ "redox_syscall",
 ]
 
 [[package]]
@@ -4749,15 +4621,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487"
 
-[[package]]
-name = "lock_api"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
-dependencies = [
- "scopeguard",
-]
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -4899,19 +4762,13 @@ dependencies = [
  "syn 2.0.90",
 ]
 
-[[package]]
-name = "maybe-uninit"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
-
 [[package]]
 name = "md-5"
 version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "digest 0.10.7",
 ]
 
@@ -4941,9 +4798,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66958255878d712b4f2dece377a8661b41dc976ff15f564b91bfce8b4a619304"
 dependencies = [
  "async-trait",
- "bytes 1.7.2",
+ "bytes",
  "either",
- "futures 0.3.30",
+ "futures",
  "futures-io",
  "iso8601",
  "jsonwebtoken",
@@ -4967,15 +4824,6 @@ version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
-[[package]]
-name = "memoffset"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
-dependencies = [
- "autocfg",
-]
-
 [[package]]
 name = "memoffset"
 version = "0.9.1"
@@ -5041,25 +4889,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.6.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
-dependencies = [
- "cfg-if 0.1.10",
- "fuchsia-zircon",
- "fuchsia-zircon-sys",
- "iovec",
- "kernel32-sys",
- "libc",
- "log",
- "miow",
- "net2",
- "slab",
- "winapi 0.2.8",
-]
-
 [[package]]
 name = "mio"
 version = "0.8.11"
@@ -5085,29 +4914,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "mio-uds"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0"
-dependencies = [
- "iovec",
- "libc",
- "mio 0.6.23",
-]
-
-[[package]]
-name = "miow"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
-dependencies = [
- "kernel32-sys",
- "net2",
- "winapi 0.2.8",
- "ws2_32-sys",
-]
-
 [[package]]
 name = "muda"
 version = "0.15.1"
@@ -5160,7 +4966,7 @@ dependencies = [
  "versions",
  "wfd",
  "which",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -5210,17 +5016,6 @@ dependencies = [
  "jni-sys",
 ]
 
-[[package]]
-name = "net2"
-version = "0.2.39"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "winapi 0.3.9",
-]
-
 [[package]]
 name = "new_debug_unreachable"
 version = "1.0.6"
@@ -5234,10 +5029,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
  "bitflags 2.6.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cfg_aliases",
  "libc",
- "memoffset 0.9.1",
+ "memoffset",
 ]
 
 [[package]]
@@ -5300,7 +5095,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -5310,7 +5105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
  "overload",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -5350,7 +5145,7 @@ dependencies = [
  "num-iter",
  "num-traits",
  "rand 0.8.5",
- "smallvec 1.13.2",
+ "smallvec",
  "zeroize",
 ]
 
@@ -5766,7 +5561,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
  "bitflags 2.6.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "foreign-types 0.3.2",
  "libc",
  "once_cell",
@@ -5909,40 +5704,14 @@ version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
-[[package]]
-name = "parking_lot"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252"
-dependencies = [
- "lock_api 0.3.4",
- "parking_lot_core 0.6.3",
- "rustc_version 0.2.3",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
- "lock_api 0.4.12",
- "parking_lot_core 0.9.10",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a"
-dependencies = [
- "cfg-if 0.1.10",
- "cloudabi",
- "libc",
- "redox_syscall 0.1.57",
- "rustc_version 0.2.3",
- "smallvec 0.6.14",
- "winapi 0.3.9",
+ "lock_api",
+ "parking_lot_core",
 ]
 
 [[package]]
@@ -5951,10 +5720,10 @@ version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
- "redox_syscall 0.5.6",
- "smallvec 1.13.2",
+ "redox_syscall",
+ "smallvec",
  "windows-targets 0.52.6",
 ]
 
@@ -6282,7 +6051,7 @@ version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
@@ -6452,12 +6221,12 @@ version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fnv",
  "lazy_static",
  "libc",
  "memchr",
- "parking_lot 0.12.3",
+ "parking_lot",
  "procfs",
  "protobuf",
  "thiserror 1.0.64",
@@ -6469,7 +6238,7 @@ version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "prost-derive",
 ]
 
@@ -6597,7 +6366,7 @@ version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
@@ -6605,7 +6374,7 @@ dependencies = [
  "rustls 0.23.13",
  "socket2",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
 ]
 
@@ -6615,7 +6384,7 @@ version = "0.11.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "rand 0.8.5",
  "ring 0.17.8",
  "rustc-hash",
@@ -6661,7 +6430,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
 dependencies = [
  "log",
- "parking_lot 0.12.3",
+ "parking_lot",
  "scheduled-thread-pool",
 ]
 
@@ -6780,8 +6549,8 @@ version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
- "crossbeam-deque 0.8.5",
- "crossbeam-utils 0.8.20",
+ "crossbeam-deque",
+ "crossbeam-utils",
 ]
 
 [[package]]
@@ -6793,7 +6562,7 @@ dependencies = [
  "ahash 0.8.11",
  "arc-swap",
  "async-trait",
- "bytes 1.7.2",
+ "bytes",
  "combine",
  "futures-util",
  "itoa 1.0.11",
@@ -6804,17 +6573,11 @@ dependencies = [
  "ryu",
  "sha1_smol",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
  "url",
 ]
 
-[[package]]
-name = "redox_syscall"
-version = "0.1.57"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
-
 [[package]]
 name = "redox_syscall"
 version = "0.5.6"
@@ -6913,7 +6676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
 dependencies = [
  "base64 0.21.7",
- "bytes 1.7.2",
+ "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
@@ -6939,7 +6702,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 0.1.2",
  "system-configuration 0.5.1",
- "tokio 1.42.0",
+ "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.24.1",
  "tokio-util",
@@ -6961,7 +6724,7 @@ checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63"
 dependencies = [
  "async-compression",
  "base64 0.22.1",
- "bytes 1.7.2",
+ "bytes",
  "encoding_rs",
  "futures-channel",
  "futures-core",
@@ -6992,7 +6755,7 @@ dependencies = [
  "serde_urlencoded",
  "sync_wrapper 1.0.1",
  "system-configuration 0.6.1",
- "tokio 1.42.0",
+ "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.26.0",
  "tokio-util",
@@ -7066,7 +6829,7 @@ dependencies = [
  "spin 0.5.2",
  "untrusted 0.7.1",
  "web-sys",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -7076,7 +6839,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
@@ -7092,7 +6855,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
 dependencies = [
  "bitvec",
  "bytecheck",
- "bytes 1.7.2",
+ "bytes",
  "hashbrown 0.12.3",
  "ptr_meta",
  "rend",
@@ -7139,7 +6902,7 @@ version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "ordered-multimap 0.4.3",
 ]
 
@@ -7149,7 +6912,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "ordered-multimap 0.7.3",
  "trim-in-place",
 ]
@@ -7164,9 +6927,9 @@ dependencies = [
  "aws-creds",
  "aws-region",
  "base64 0.13.1",
- "bytes 1.7.2",
- "cfg-if 1.0.0",
- "futures 0.3.30",
+ "bytes",
+ "cfg-if",
+ "futures",
  "hex",
  "hmac 0.12.1",
  "http 0.2.12",
@@ -7182,7 +6945,7 @@ dependencies = [
  "sha2 0.10.8",
  "thiserror 1.0.64",
  "time",
- "tokio 1.42.0",
+ "tokio",
  "tokio-stream",
  "url",
 ]
@@ -7195,7 +6958,7 @@ checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555"
 dependencies = [
  "arrayvec",
  "borsh",
- "bytes 1.7.2",
+ "bytes",
  "num-traits",
  "rand 0.8.5",
  "rkyv",
@@ -7237,22 +7000,13 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
 
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-dependencies = [
- "semver 0.9.0",
-]
-
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
- "semver 1.0.23",
+ "semver",
 ]
 
 [[package]]
@@ -7427,7 +7181,7 @@ version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a98f186c7a2f3abbffb802984b7f1dfd65dac8be1aafdaabbca4137f53f0dff7"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "rxml_validation",
  "smartstring",
 ]
@@ -7468,7 +7222,7 @@ version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
 dependencies = [
- "parking_lot 0.12.3",
+ "parking_lot",
 ]
 
 [[package]]
@@ -7591,19 +7345,10 @@ dependencies = [
  "phf_codegen 0.8.0",
  "precomputed-hash",
  "servo_arc",
- "smallvec 1.13.2",
+ "smallvec",
  "thin-slice",
 ]
 
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
 [[package]]
 name = "semver"
 version = "1.0.23"
@@ -7613,12 +7358,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
 [[package]]
 name = "sentry"
 version = "0.34.0"
@@ -7634,7 +7373,7 @@ dependencies = [
  "sentry-debug-images",
  "sentry-panic",
  "sentry-tracing",
- "tokio 1.42.0",
+ "tokio",
  "ureq",
  "webpki-roots 0.26.6",
 ]
@@ -7671,7 +7410,7 @@ dependencies = [
  "hostname",
  "libc",
  "os_info",
- "rustc_version 0.4.1",
+ "rustc_version",
  "sentry-core",
  "uname",
 ]
@@ -8008,7 +7747,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -8026,7 +7765,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
 dependencies = [
  "block-buffer 0.9.0",
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.9.0",
  "opaque-debug",
@@ -8038,7 +7777,7 @@ version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "cpufeatures",
  "digest 0.10.7",
 ]
@@ -8104,15 +7843,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "smallvec"
-version = "0.6.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0"
-dependencies = [
- "maybe-uninit",
-]
-
 [[package]]
 name = "smallvec"
 version = "1.13.2"
@@ -8179,7 +7909,7 @@ dependencies = [
  "objc2-foundation",
  "objc2-quartz-core",
  "raw-window-handle 0.6.2",
- "redox_syscall 0.5.6",
+ "redox_syscall",
  "wasm-bindgen",
  "web-sys",
  "windows-sys 0.59.0",
@@ -8217,7 +7947,7 @@ version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47317bbaf63785b53861e1ae2d11b80d6b624211d42cb20efcd210ee6f8a14bc"
 dependencies = [
- "smallvec 1.13.2",
+ "smallvec",
 ]
 
 [[package]]
@@ -8232,7 +7962,7 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 dependencies = [
- "lock_api 0.4.12",
+ "lock_api",
 ]
 
 [[package]]
@@ -8276,10 +8006,10 @@ checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e"
 dependencies = [
  "atoi",
  "byteorder",
- "bytes 1.7.2",
+ "bytes",
  "chrono",
  "crc",
- "crossbeam-queue 0.3.11",
+ "crossbeam-queue",
  "either",
  "event-listener 5.3.1",
  "futures-channel",
@@ -8302,10 +8032,10 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "smallvec 1.13.2",
+ "smallvec",
  "sqlformat",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tokio-stream",
  "tracing",
  "url",
@@ -8347,7 +8077,7 @@ dependencies = [
  "sqlx-sqlite",
  "syn 2.0.90",
  "tempfile",
- "tokio 1.42.0",
+ "tokio",
  "url",
 ]
 
@@ -8361,7 +8091,7 @@ dependencies = [
  "base64 0.22.1",
  "bitflags 2.6.0",
  "byteorder",
- "bytes 1.7.2",
+ "bytes",
  "chrono",
  "crc",
  "digest 0.10.7",
@@ -8387,7 +8117,7 @@ dependencies = [
  "serde",
  "sha1 0.10.6",
  "sha2 0.10.8",
- "smallvec 1.13.2",
+ "smallvec",
  "sqlx-core",
  "stringprep",
  "thiserror 1.0.64",
@@ -8427,7 +8157,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha2 0.10.8",
- "smallvec 1.13.2",
+ "smallvec",
  "sqlx-core",
  "stringprep",
  "thiserror 1.0.64",
@@ -8472,7 +8202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "799c883d55abdb5e98af1a7b3f23b9b6de8ecada0ecac058672d7635eb48ca7b"
 dependencies = [
  "cc",
- "cfg-if 1.0.0",
+ "cfg-if",
  "libc",
  "psm",
  "windows-sys 0.59.0",
@@ -8504,7 +8234,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b"
 dependencies = [
  "new_debug_unreachable",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
  "phf_shared 0.10.0",
  "precomputed-hash",
  "serde",
@@ -8692,7 +8422,7 @@ version = "0.30.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "core-foundation-sys",
  "libc",
  "ntapi",
@@ -8783,7 +8513,7 @@ dependencies = [
  "ndk-sys",
  "objc",
  "once_cell",
- "parking_lot 0.12.3",
+ "parking_lot",
  "raw-window-handle 0.6.2",
  "scopeguard",
  "tao-macros",
@@ -8836,7 +8566,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e545de0a2dfe296fa67db208266cd397c5a55ae782da77973ef4c4fac90e9f2c"
 dependencies = [
  "anyhow",
- "bytes 1.7.2",
+ "bytes",
  "dirs 5.0.1",
  "dunce",
  "embed_plist",
@@ -8870,7 +8600,7 @@ dependencies = [
  "tauri-runtime-wry",
  "tauri-utils",
  "thiserror 2.0.7",
- "tokio 1.42.0",
+ "tokio",
  "tray-icon",
  "url",
  "urlpattern",
@@ -8894,7 +8624,7 @@ dependencies = [
  "json-patch",
  "quote",
  "schemars",
- "semver 1.0.23",
+ "semver",
  "serde",
  "serde_json",
  "tauri-codegen",
@@ -8918,7 +8648,7 @@ dependencies = [
  "png",
  "proc-macro2",
  "quote",
- "semver 1.0.23",
+ "semver",
  "serde",
  "serde_json",
  "sha2 0.10.8",
@@ -9093,7 +8823,7 @@ dependencies = [
  "minisign-verify",
  "percent-encoding",
  "reqwest 0.12.7",
- "semver 1.0.23",
+ "semver",
  "serde",
  "serde_json",
  "tar",
@@ -9102,7 +8832,7 @@ dependencies = [
  "tempfile",
  "thiserror 2.0.7",
  "time",
- "tokio 1.42.0",
+ "tokio",
  "url",
  "windows-sys 0.59.0",
  "zip 2.2.0",
@@ -9191,7 +8921,7 @@ dependencies = [
  "quote",
  "regex",
  "schemars",
- "semver 1.0.23",
+ "semver",
  "serde",
  "serde-untagged",
  "serde_json",
@@ -9221,7 +8951,7 @@ version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "fastrand 2.1.1",
  "once_cell",
  "rustix",
@@ -9247,7 +8977,7 @@ checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f"
 dependencies = [
  "dirs-next",
  "rustversion",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -9260,7 +8990,7 @@ dependencies = [
  "async_zip",
  "base64 0.22.1",
  "byteorder",
- "bytes 1.7.2",
+ "bytes",
  "chrono",
  "daedalus",
  "dashmap 6.1.0",
@@ -9269,7 +8999,7 @@ dependencies = [
  "dunce",
  "either",
  "flate2",
- "futures 0.3.30",
+ "futures",
  "indicatif",
  "lazy_static",
  "notify",
@@ -9290,13 +9020,11 @@ dependencies = [
  "tauri",
  "tempfile",
  "thiserror 1.0.64",
- "tokio 1.42.0",
- "toml 0.8.19",
+ "tokio",
  "tracing",
  "tracing-error",
  "tracing-subscriber",
  "url",
- "urlencoding",
  "uuid 1.12.0",
  "whoami",
  "winreg 0.52.0",
@@ -9311,12 +9039,8 @@ dependencies = [
  "cocoa 0.25.0",
  "daedalus",
  "dashmap 6.1.0",
- "dirs 5.0.1",
- "futures 0.3.30",
- "lazy_static",
  "native-dialog",
  "objc",
- "once_cell",
  "opener",
  "os_info",
  "paste",
@@ -9335,7 +9059,7 @@ dependencies = [
  "tauri-plugin-window-state",
  "theseus",
  "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
  "tracing-error",
  "url",
@@ -9347,18 +9071,9 @@ dependencies = [
 name = "theseus_playground"
 version = "0.0.0"
 dependencies = [
- "dunce",
- "futures 0.3.30",
- "serde",
- "serde_json",
  "theseus",
- "thiserror 1.0.64",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
- "tracing-error",
- "tracing-subscriber",
- "url",
- "uuid 1.12.0",
  "webbrowser",
 ]
 
@@ -9414,7 +9129,7 @@ version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
 ]
 
@@ -9525,30 +9240,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
-[[package]]
-name = "tokio"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "mio 0.6.23",
- "num_cpus",
- "tokio-codec",
- "tokio-current-thread",
- "tokio-executor",
- "tokio-fs",
- "tokio-io",
- "tokio-reactor",
- "tokio-sync",
- "tokio-tcp",
- "tokio-threadpool",
- "tokio-timer",
- "tokio-udp",
- "tokio-uds",
-]
-
 [[package]]
 name = "tokio"
 version = "1.42.0"
@@ -9556,10 +9247,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
 dependencies = [
  "backtrace",
- "bytes 1.7.2",
+ "bytes",
  "libc",
  "mio 1.0.2",
- "parking_lot 0.12.3",
+ "parking_lot",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2",
@@ -9568,59 +9259,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "tokio-codec"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "tokio-io",
-]
-
-[[package]]
-name = "tokio-current-thread"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e"
-dependencies = [
- "futures 0.1.31",
- "tokio-executor",
-]
-
-[[package]]
-name = "tokio-executor"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671"
-dependencies = [
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-fs"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4"
-dependencies = [
- "futures 0.1.31",
- "tokio-io",
- "tokio-threadpool",
-]
-
-[[package]]
-name = "tokio-io"
-version = "0.1.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log",
-]
-
 [[package]]
 name = "tokio-macros"
 version = "2.4.0"
@@ -9639,26 +9277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
 dependencies = [
  "native-tls",
- "tokio 1.42.0",
-]
-
-[[package]]
-name = "tokio-reactor"
-version = "0.1.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351"
-dependencies = [
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
- "lazy_static",
- "log",
- "mio 0.6.23",
- "num_cpus",
- "parking_lot 0.9.0",
- "slab",
- "tokio-executor",
- "tokio-io",
- "tokio-sync",
+ "tokio",
 ]
 
 [[package]]
@@ -9668,7 +9287,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
  "rustls 0.21.12",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -9679,7 +9298,7 @@ checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
  "rustls 0.23.13",
  "rustls-pki-types",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -9690,93 +9309,7 @@ checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
- "tokio 1.42.0",
-]
-
-[[package]]
-name = "tokio-sync"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee"
-dependencies = [
- "fnv",
- "futures 0.1.31",
-]
-
-[[package]]
-name = "tokio-tcp"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "iovec",
- "mio 0.6.23",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-threadpool"
-version = "0.1.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89"
-dependencies = [
- "crossbeam-deque 0.7.4",
- "crossbeam-queue 0.2.3",
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
- "lazy_static",
- "log",
- "num_cpus",
- "slab",
- "tokio-executor",
-]
-
-[[package]]
-name = "tokio-timer"
-version = "0.2.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296"
-dependencies = [
- "crossbeam-utils 0.7.2",
- "futures 0.1.31",
- "slab",
- "tokio-executor",
-]
-
-[[package]]
-name = "tokio-udp"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "log",
- "mio 0.6.23",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
-]
-
-[[package]]
-name = "tokio-uds"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0"
-dependencies = [
- "bytes 0.4.12",
- "futures 0.1.31",
- "iovec",
- "libc",
- "log",
- "mio 0.6.23",
- "mio-uds",
- "tokio-codec",
- "tokio-io",
- "tokio-reactor",
+ "tokio",
 ]
 
 [[package]]
@@ -9785,12 +9318,12 @@ version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
- "bytes 1.7.2",
+ "bytes",
  "futures-core",
  "futures-io",
  "futures-sink",
  "pin-project-lite",
- "tokio 1.42.0",
+ "tokio",
 ]
 
 [[package]]
@@ -9873,7 +9406,7 @@ dependencies = [
  "async-trait",
  "axum",
  "base64 0.22.1",
- "bytes 1.7.2",
+ "bytes",
  "h2 0.4.6",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -9885,7 +9418,7 @@ dependencies = [
  "pin-project",
  "prost",
  "socket2",
- "tokio 1.42.0",
+ "tokio",
  "tokio-stream",
  "tower 0.4.13",
  "tower-layer",
@@ -9920,7 +9453,7 @@ dependencies = [
  "pin-project-lite",
  "rand 0.8.5",
  "slab",
- "tokio 1.42.0",
+ "tokio",
  "tokio-util",
  "tower-layer",
  "tower-service",
@@ -10009,18 +9542,6 @@ dependencies = [
  "tracing-subscriber",
 ]
 
-[[package]]
-name = "tracing-futures"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2"
-dependencies = [
- "futures 0.3.30",
- "pin-project",
- "tokio 0.1.22",
- "tracing",
-]
-
 [[package]]
 name = "tracing-log"
 version = "0.2.0"
@@ -10044,7 +9565,7 @@ dependencies = [
  "once_cell",
  "regex",
  "sharded-slab",
- "smallvec 1.13.2",
+ "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
@@ -10091,7 +9612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e2e2ce1e47ed2994fd43b04c8f618008d4cabdd5ee34027cf14f9d918edd9c8"
 dependencies = [
  "byteorder",
- "bytes 1.7.2",
+ "bytes",
  "data-encoding",
  "http 1.1.0",
  "httparse",
@@ -10122,9 +9643,9 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9"
 dependencies = [
- "memoffset 0.9.1",
+ "memoffset",
  "tempfile",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -10491,7 +10012,7 @@ version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "once_cell",
  "wasm-bindgen-macro",
 ]
@@ -10517,7 +10038,7 @@ version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "js-sys",
  "wasm-bindgen",
  "web-sys",
@@ -10575,7 +10096,7 @@ dependencies = [
  "downcast-rs",
  "rustix",
  "scoped-tls",
- "smallvec 1.13.2",
+ "smallvec",
  "wayland-sys",
 ]
 
@@ -10789,7 +10310,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8"
 dependencies = [
  "libc",
- "winapi 0.3.9",
+ "winapi",
 ]
 
 [[package]]
@@ -10810,17 +10331,11 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.6",
+ "redox_syscall",
  "wasite",
  "web-sys",
 ]
 
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -10831,12 +10346,6 @@ dependencies = [
  "winapi-x86_64-pc-windows-gnu",
 ]
 
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-
 [[package]]
 name = "winapi-i686-pc-windows-gnu"
 version = "0.4.0"
@@ -11245,7 +10754,7 @@ version = "0.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
@@ -11255,7 +10764,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
 dependencies = [
- "cfg-if 1.0.0",
+ "cfg-if",
  "windows-sys 0.48.0",
 ]
 
@@ -11323,16 +10832,6 @@ dependencies = [
  "x11-dl",
 ]
 
-[[package]]
-name = "ws2_32-sys"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
-dependencies = [
- "winapi 0.2.8",
- "winapi-build",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -11517,7 +11016,7 @@ dependencies = [
  "serde",
  "serde_repr",
  "static_assertions",
- "tokio 1.42.0",
+ "tokio",
  "tracing",
  "uds_windows",
  "windows-sys 0.59.0",
@@ -11660,7 +11159,7 @@ dependencies = [
  "bzip2",
  "constant_time_eq 0.1.5",
  "crc32fast",
- "crossbeam-utils 0.8.20",
+ "crossbeam-utils",
  "flate2",
  "hmac 0.12.1",
  "pbkdf2",
@@ -11677,7 +11176,7 @@ checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494"
 dependencies = [
  "arbitrary",
  "crc32fast",
- "crossbeam-utils 0.8.20",
+ "crossbeam-utils",
  "displaydoc",
  "indexmap 2.5.0",
  "memchr",
diff --git a/apps/app-playground/Cargo.toml b/apps/app-playground/Cargo.toml
index a3725161..a90c40e7 100644
--- a/apps/app-playground/Cargo.toml
+++ b/apps/app-playground/Cargo.toml
@@ -7,18 +7,7 @@ edition = "2021"
 
 [dependencies]
 theseus = { path = "../../packages/app-lib", features = ["cli"] }
-
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
 tokio = { version = "1", features = ["full"] }
-thiserror = "1.0"
-url = "2.2"
 webbrowser = "0.8.13"
-dunce = "1.0.3"
-
-futures = "0.3"
-uuid = { version = "1.1", features = ["serde", "v4"] }
 
 tracing = "0.1.37"
-tracing-subscriber = "0.3.18"
-tracing-error = "0.2.0"
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index 0e3bc20b..06f38432 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -28,12 +28,9 @@ tauri-plugin-single-instance = { version = "2.2.0" }
 
 tokio = { version = "1", features = ["full"] }
 thiserror = "1.0"
-futures = "0.3"
 daedalus = { path = "../../packages/daedalus" }
 chrono = "0.4.26"
 
-dirs = "5.0.1"
-
 url = "2.2"
 uuid = { version = "1.1", features = ["serde", "v4"] }
 os_info = "3.7.0"
@@ -41,9 +38,6 @@ os_info = "3.7.0"
 tracing = "0.1.37"
 tracing-error = "0.2.0"
 
-lazy_static = "1"
-once_cell = "1"
-
 dashmap = "6.0.1"
 paste = "1.0.15"
 
diff --git a/apps/daedalus_client/Cargo.toml b/apps/daedalus_client/Cargo.toml
index 30b0f9db..6ddb4c5b 100644
--- a/apps/daedalus_client/Cargo.toml
+++ b/apps/daedalus_client/Cargo.toml
@@ -22,7 +22,6 @@ reqwest = { version = "0.12.5", default-features = false, features = [
     "rustls-tls-native-roots",
 ] }
 async_zip = { version = "0.0.17", features = ["full"] }
-semver = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
 bytes = "1.6.0"
 rust-s3 = { version = "0.33.0", default-features = false, features = [
@@ -39,4 +38,3 @@ tracing-error = "0.2.0"
 
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] }
diff --git a/apps/labrinth/Cargo.toml b/apps/labrinth/Cargo.toml
index bed7b380..663f0ab2 100644
--- a/apps/labrinth/Cargo.toml
+++ b/apps/labrinth/Cargo.toml
@@ -21,7 +21,6 @@ prometheus = "0.13.4"
 actix-web-prom = { version = "0.9.0", features = ["process"] }
 
 tracing = "0.1.41"
-tracing-subscriber = "0.3.19"
 tracing-actix-web = "0.7.16"
 console-subscriber = "0.4.1"
 
@@ -29,7 +28,6 @@ tokio = { version = "1.35.1", features = ["sync", "rt-multi-thread"] }
 tokio-stream = "0.1.14"
 
 futures = "0.3.30"
-futures-timer = "3.0.2"
 futures-util = "0.3.30"
 async-trait = "0.1.70"
 dashmap = "5.4.0"
@@ -42,14 +40,11 @@ hyper = { version = "0.14", features = ["full"] }
 hyper-tls = "0.5.0"
 
 serde = { version = "1.0", features = ["derive"] }
-serde_bytes = "0.11"
 serde_json = "1.0"
-serde_cbor = "0.11"
 serde_with = "3.0.0"
 chrono = { version = "0.4.26", features = ["serde"] }
 yaserde = "0.12.0"
 yaserde_derive = "0.12.0"
-xml-rs = "0.8.15"
 
 rand = "0.8.5"
 rand_chacha = "0.3.1"
@@ -144,4 +139,4 @@ actix-http = "3.4.0"
 [build-dependencies]
 dotenv-build = "0.1.1"
 chrono = "0.4.38"
-iana-time-zone = "0.1.60"
\ No newline at end of file
+iana-time-zone = "0.1.60"
diff --git a/packages/app-lib/Cargo.toml b/packages/app-lib/Cargo.toml
index eb098779..9278509c 100644
--- a/packages/app-lib/Cargo.toml
+++ b/packages/app-lib/Cargo.toml
@@ -9,7 +9,6 @@ bytes = "1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_ini = "0.2.0"
-toml = "0.8.12"
 sha1_smol = { version = "1.0.0", features = ["std"] }
 sha2 = "0.10.8"
 url = "2.2"
@@ -18,7 +17,6 @@ zip = "0.6.5"
 async_zip = { version = "0.0.17", features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] }
 flate2 = "1.0.28"
 tempfile = "3.5.0"
-urlencoding = "2.1.3"
 dashmap = { version = "6.0.1", features = ["serde"] }
 
 chrono = { version = "0.4.19", features = ["serde"] }
diff --git a/packages/daedalus/Cargo.toml b/packages/daedalus/Cargo.toml
index a57f4c61..9fa0f512 100644
--- a/packages/daedalus/Cargo.toml
+++ b/packages/daedalus/Cargo.toml
@@ -17,5 +17,4 @@ readme = "README.md"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 chrono = { version = "0.4", features = ["serde"] }
-bytes = "1"
 thiserror = "1.0"

From 56520572b22499daf0b0a5948d1a21f036847749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aaron=20M=C3=BCller?=
 <160637865+amueller0@users.noreply.github.com>
Date: Sat, 12 Apr 2025 18:22:16 +0200
Subject: [PATCH 06/28] fix: dropdown import (#3459)

Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
Co-authored-by: Emma Alexia <emma@modrinth.com>
---
 apps/frontend/src/components/ui/ProjectMemberHeader.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/frontend/src/components/ui/ProjectMemberHeader.vue b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
index 13d63a60..0680eece 100644
--- a/apps/frontend/src/components/ui/ProjectMemberHeader.vue
+++ b/apps/frontend/src/components/ui/ProjectMemberHeader.vue
@@ -108,7 +108,6 @@
 </template>
 
 <script setup>
-import { formatProjectType } from "~/plugins/shorthands.js";
 import {
   ChevronRightIcon,
   CheckIcon,
@@ -117,7 +116,9 @@ import {
   LightBulbIcon,
   SendIcon,
   ScaleIcon,
+  DropdownIcon,
 } from "@modrinth/assets";
+import { formatProjectType } from "~/plugins/shorthands.js";
 import { acceptTeamInvite, removeTeamMember } from "~/helpers/teams.js";
 
 const props = defineProps({

From 59edc8d618e2ebb587fb7cc8e68c8ac1f3318817 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Sat, 12 Apr 2025 22:00:22 -0700
Subject: [PATCH 07/28] Add notices system to Servers (#3502)

* Servers notices

* Refresh on unassign
---
 .../ui/servers/PanelServerActionButton.vue    |  18 +
 .../ui/servers/notice/AssignNoticeModal.vue   | 201 ++++++++
 .../ui/servers/notice/NoticeDashboardItem.vue | 118 +++++
 apps/frontend/src/composables/pyroServers.ts  |   2 +
 apps/frontend/src/layouts/default.vue         |   9 +
 apps/frontend/src/locales/en-US/index.json    |  27 +
 .../src/pages/admin/servers/notices.vue       | 470 ++++++++++++++++++
 .../src/pages/servers/manage/[id].vue         |  33 +-
 packages/ui/src/components/base/Accordion.vue |   6 +-
 .../ui/src/components/base/Admonition.vue     |   5 +-
 .../src/components/base/ContentPageHeader.vue |   4 +-
 .../ui/src/components/base/ServerNotice.vue   |  73 +++
 packages/ui/src/components/index.ts           |   1 +
 packages/ui/src/locales/en-US/index.json      |  24 +
 packages/ui/src/utils/notices.ts              |  63 +++
 packages/utils/types.ts                       |  18 +
 16 files changed, 1065 insertions(+), 7 deletions(-)
 create mode 100644 apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
 create mode 100644 apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
 create mode 100644 apps/frontend/src/pages/admin/servers/notices.vue
 create mode 100644 packages/ui/src/components/base/ServerNotice.vue
 create mode 100644 packages/ui/src/utils/notices.ts

diff --git a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
index 073909fd..8eb08a86 100644
--- a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
+++ b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
@@ -89,6 +89,10 @@
               <InfoIcon class="h-5 w-5" />
               <span>Details</span>
             </template>
+            <template #copy-id>
+              <ClipboardCopyIcon class="h-5 w-5" aria-hidden="true" />
+              <span>Copy ID</span>
+            </template>
           </UiServersTeleportOverflowMenu>
         </ButtonStyled>
       </template>
@@ -108,6 +112,7 @@ import {
   ServerIcon,
   InfoIcon,
   MoreVerticalIcon,
+  ClipboardCopyIcon,
 } from "@modrinth/assets";
 import { ButtonStyled, NewModal } from "@modrinth/ui";
 import { useRouter } from "vue-router";
@@ -116,6 +121,8 @@ import { useStorage } from "@vueuse/core";
 type ServerAction = "start" | "stop" | "restart" | "kill";
 type ServerState = "stopped" | "starting" | "running" | "stopping" | "restarting";
 
+const flags = useFeatureFlags();
+
 interface PowerAction {
   action: ServerAction;
   nextState: ServerState;
@@ -198,8 +205,19 @@ const menuOptions = computed(() => [
     icon: InfoIcon,
     action: () => detailsModal.value?.show(),
   },
+  {
+    id: "copy-id",
+    label: "Copy ID",
+    icon: ClipboardCopyIcon,
+    action: () => copyId(),
+    shown: flags.value.developerMode,
+  },
 ]);
 
+async function copyId() {
+  await navigator.clipboard.writeText(serverId as string);
+}
+
 function initiateAction(action: ServerAction) {
   if (!canTakeAction.value) return;
 
diff --git a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
new file mode 100644
index 00000000..e57ac27a
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
@@ -0,0 +1,201 @@
+<script setup lang="ts">
+import { Accordion, ButtonStyled, NewModal, ServerNotice, TagItem } from "@modrinth/ui";
+import { PlusIcon, XIcon } from "@modrinth/assets";
+import type { ServerNotice as ServerNoticeType } from "@modrinth/utils";
+import { ref } from "vue";
+import { usePyroFetch } from "~/composables/pyroFetch.ts";
+
+const app = useNuxtApp() as unknown as { $notify: any };
+
+const modal = ref<InstanceType<typeof NewModal>>();
+
+const emit = defineEmits<{
+  (e: "close"): void;
+}>();
+
+const notice = ref<ServerNoticeType>();
+
+const assigned = ref<ServerNoticeType["assigned"]>([]);
+
+const assignedServers = computed(() => assigned.value.filter((n) => n.kind === "server") ?? []);
+const assignedNodes = computed(() => assigned.value.filter((n) => n.kind === "node") ?? []);
+
+const inputField = ref("");
+
+async function refresh() {
+  await usePyroFetch("notices").then((res) => {
+    const notices = res as ServerNoticeType[];
+    assigned.value = notices.find((n) => n.id === notice.value?.id)?.assigned ?? [];
+  });
+}
+
+async function assign(server: boolean = true) {
+  const input = inputField.value.trim();
+
+  if (input !== "" && notice.value) {
+    await usePyroFetch(`notices/${notice.value.id}/assign?${server ? "server" : "node"}=${input}`, {
+      method: "PUT",
+    }).catch((err) => {
+      app.$notify({
+        group: "main",
+        title: "Error assigning notice",
+        text: err,
+        type: "error",
+      });
+    });
+  } else {
+    app.$notify({
+      group: "main",
+      title: "Error assigning notice",
+      text: "No server or node specified",
+      type: "error",
+    });
+  }
+  await refresh();
+}
+
+async function unassignDetect() {
+  const input = inputField.value.trim();
+
+  const server = assignedServers.value.some((assigned) => assigned.id === input);
+  const node = assignedNodes.value.some((assigned) => assigned.id === input);
+
+  if (!server && !node) {
+    app.$notify({
+      group: "main",
+      title: "Error unassigning notice",
+      text: "ID is not an assigned server or node",
+      type: "error",
+    });
+    return;
+  }
+
+  await unassign(input, server);
+}
+
+async function unassign(id: string, server: boolean = true) {
+  if (notice.value) {
+    await usePyroFetch(`notices/${notice.value.id}/unassign?${server ? "server" : "node"}=${id}`, {
+      method: "PUT",
+    }).catch((err) => {
+      app.$notify({
+        group: "main",
+        title: "Error unassigning notice",
+        text: err,
+        type: "error",
+      });
+    });
+  }
+  await refresh();
+}
+
+function show(currentNotice: ServerNoticeType) {
+  notice.value = currentNotice;
+  assigned.value = currentNotice?.assigned ?? [];
+  modal.value?.show();
+}
+
+function hide() {
+  modal.value?.hide();
+}
+
+defineExpose({ show, hide });
+</script>
+<template>
+  <NewModal ref="modal" :on-hide="() => emit('close')">
+    <template #title>
+      <span class="text-lg font-extrabold text-contrast">
+        Editing assignments of notice #{{ notice?.id }}
+      </span>
+    </template>
+    <div class="flex flex-col gap-4">
+      <ServerNotice
+        v-if="notice"
+        :level="notice.level"
+        :message="notice.message"
+        :dismissable="notice.dismissable"
+        preview
+      />
+      <div class="flex flex-col gap-2">
+        <label for="server-assign-field" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Assigned servers </span>
+        </label>
+        <Accordion
+          v-if="assignedServers.length > 0"
+          class="mb-2"
+          open-by-default
+          button-class="text-primary m-0 p-0 border-none bg-transparent active:scale-95"
+        >
+          <template #title> {{ assignedServers.length }} servers </template>
+          <div class="mt-2 flex flex-wrap gap-2">
+            <TagItem
+              v-for="server in assignedServers"
+              :key="`server-${server.id}`"
+              :action="() => unassign(server.id, true)"
+            >
+              <XIcon />
+              {{ server.id }}
+            </TagItem>
+          </div>
+        </Accordion>
+        <span v-else class="mb-2"> No servers assigned yet </span>
+
+        <div class="flex flex-col gap-2">
+          <label for="server-assign-field" class="flex flex-col gap-1">
+            <span class="text-lg font-semibold text-contrast"> Assigned nodes </span>
+          </label>
+          <Accordion
+            v-if="assignedNodes.length > 0"
+            class="mb-2"
+            open-by-default
+            button-class="text-primary m-0 p-0 border-none bg-transparent active:scale-95"
+          >
+            <template #title> {{ assignedNodes.length }} nodes </template>
+            <div class="mt-2 flex flex-wrap gap-2">
+              <TagItem
+                v-for="node in assignedNodes"
+                :key="`node-${node.id}`"
+                :action="
+                  () => {
+                    unassign(node.id, false);
+                  }
+                "
+              >
+                <XIcon />
+                {{ node.id }}
+              </TagItem>
+            </div>
+          </Accordion>
+          <span v-else class="mb-2"> No nodes assigned yet </span>
+        </div>
+        <div class="flex w-[45rem] items-center gap-2">
+          <input
+            id="server-assign-field"
+            v-model="inputField"
+            class="w-full"
+            type="text"
+            autocomplete="off"
+          />
+          <ButtonStyled color="green" color-fill="text">
+            <button class="shrink-0" @click="() => assign(true)">
+              <PlusIcon />
+              Add server
+            </button>
+          </ButtonStyled>
+          <ButtonStyled color="blue" color-fill="text">
+            <button class="shrink-0" @click="() => assign(false)">
+              <PlusIcon />
+              Add node
+            </button>
+          </ButtonStyled>
+          <ButtonStyled color="red" color-fill="text">
+            <button class="shrink-0" @click="() => unassignDetect()">
+              <XIcon />
+              Remove
+            </button>
+          </ButtonStyled>
+        </div>
+      </div>
+    </div>
+  </NewModal>
+</template>
diff --git a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
new file mode 100644
index 00000000..434f3b85
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import dayjs from "dayjs";
+import { ButtonStyled, commonMessages, CopyCode, ServerNotice, TagItem } from "@modrinth/ui";
+import { EditIcon, SettingsIcon, TrashIcon } from "@modrinth/assets";
+import { ServerNotice as ServerNoticeType } from "@modrinth/utils";
+import {
+  DISMISSABLE,
+  getDismissableMetadata,
+  NOTICE_LEVELS,
+} from "@modrinth/ui/src/utils/notices.ts";
+import { useVIntl } from "@vintl/vintl";
+
+const { formatMessage } = useVIntl();
+
+const props = defineProps<{
+  notice: ServerNoticeType;
+}>();
+</script>
+<template>
+  <div class="col-span-full grid grid-cols-subgrid gap-4 rounded-2xl bg-bg-raised p-4">
+    <div class="col-span-full grid grid-cols-subgrid items-center gap-4">
+      <div>
+        <CopyCode :text="`${notice.id}`" />
+      </div>
+      <div class="text-sm">
+        <span v-if="notice.announce_at">
+          {{ dayjs(notice.announce_at).format("MMM D, YYYY [at] h:mm A") }} ({{
+            dayjs(notice.announce_at).fromNow()
+          }})
+        </span>
+        <template v-else> Never begins </template>
+      </div>
+      <div class="text-sm">
+        <span
+          v-if="notice.expires"
+          v-tooltip="dayjs(notice.expires).format('MMMM D, YYYY [at] h:mm A')"
+        >
+          {{ dayjs(notice.expires).fromNow() }}
+        </span>
+        <template v-else> Never expires </template>
+      </div>
+      <div
+        :style="
+          NOTICE_LEVELS[notice.level]
+            ? {
+                '--_color': NOTICE_LEVELS[notice.level].colors.text,
+                '--_bg-color': NOTICE_LEVELS[notice.level].colors.bg,
+              }
+            : undefined
+        "
+      >
+        <TagItem>
+          {{
+            NOTICE_LEVELS[notice.level]
+              ? formatMessage(NOTICE_LEVELS[notice.level].name)
+              : notice.level
+          }}
+        </TagItem>
+      </div>
+      <div
+        :style="{
+          '--_color': getDismissableMetadata(notice.dismissable).colors.text,
+          '--_bg-color': getDismissableMetadata(notice.dismissable).colors.bg,
+        }"
+      >
+        <TagItem>
+          {{ formatMessage(getDismissableMetadata(notice.dismissable).name) }}
+        </TagItem>
+      </div>
+      <div class="col-span-2 flex gap-2 md:col-span-1">
+        <ButtonStyled>
+          <button @click="() => startEditing(notice)">
+            <EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled color="red">
+          <button @click="() => deleteNotice(notice)">
+            <TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}
+          </button>
+        </ButtonStyled>
+      </div>
+    </div>
+    <div class="col-span-full grid">
+      <ServerNotice
+        :level="notice.level"
+        :message="notice.message"
+        :dismissable="notice.dismissable"
+        preview
+      />
+      <div class="mt-4 flex items-center gap-2">
+        <span v-if="!notice.assigned || notice.assigned.length === 0"
+          >Not assigned to any servers</span
+        >
+        <span v-else-if="!notice.assigned.some((n) => n.kind === 'server')">
+          Assigned to
+          {{ notice.assigned.filter((n) => n.kind === "node").length }} nodes
+        </span>
+        <span v-else-if="!notice.assigned.some((n) => n.kind === 'node')">
+          Assigned to
+          {{ notice.assigned.filter((n) => n.kind === "server").length }} servers
+        </span>
+        <span v-else>
+          Assigned to
+          {{ notice.assigned.filter((n) => n.kind === "server").length }} servers and
+          {{ notice.assigned.filter((n) => n.kind === "node").length }} nodes
+        </span>
+        •
+        <button
+          class="m-0 flex items-center gap-1 border-none bg-transparent p-0 text-blue hover:underline hover:brightness-125 active:scale-95 active:brightness-150"
+          @click="() => startEditing(notice, true)"
+        >
+          <SettingsIcon />
+          Edit assignments
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/apps/frontend/src/composables/pyroServers.ts b/apps/frontend/src/composables/pyroServers.ts
index 206063a2..eb3d32a0 100644
--- a/apps/frontend/src/composables/pyroServers.ts
+++ b/apps/frontend/src/composables/pyroServers.ts
@@ -1,5 +1,6 @@
 // usePyroServer is a composable that interfaces with the REDACTED API to get data and control the users server
 import { $fetch, FetchError } from "ofetch";
+import type { ServerNotice } from "@modrinth/utils";
 
 interface PyroFetchOptions {
   method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
@@ -289,6 +290,7 @@ interface General {
   sftp_password: string;
   sftp_host: string;
   datacenter?: string;
+  notices?: ServerNotice[];
 }
 
 interface Allocation {
diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index 11807424..a387f493 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -298,6 +298,12 @@
                 link: '/admin/user_email',
                 shown: isAdmin(auth.user),
               },
+              {
+                id: 'servers-notices',
+                color: 'primary',
+                link: '/admin/servers/notices',
+                shown: isAdmin(auth.user),
+              },
             ]"
           >
             <ModrinthIcon aria-hidden="true" />
@@ -305,6 +311,9 @@
             <template #review-projects> <ScaleIcon aria-hidden="true" /> Review projects </template>
             <template #review-reports> <ReportIcon aria-hidden="true" /> Reports </template>
             <template #user-lookup> <UserIcon aria-hidden="true" /> Lookup by email </template>
+            <template #servers-notices>
+              <IssuesIcon aria-hidden="true" /> Manage server notices
+            </template>
           </OverflowMenu>
         </ButtonStyled>
         <ButtonStyled type="transparent">
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 998d2265..8bb4a520 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -959,6 +959,33 @@
   "search.filter.locked.server.sync": {
     "message": "Sync with server"
   },
+  "servers.notice.actions": {
+    "message": "Actions"
+  },
+  "servers.notice.begins": {
+    "message": "Begins"
+  },
+  "servers.notice.dismissable": {
+    "message": "Dismissable"
+  },
+  "servers.notice.expires": {
+    "message": "Expires"
+  },
+  "servers.notice.id": {
+    "message": "ID"
+  },
+  "servers.notice.level": {
+    "message": "Level"
+  },
+  "servers.notice.undismissable": {
+    "message": "Undismissable"
+  },
+  "servers.notices.create-notice": {
+    "message": "Create notice"
+  },
+  "servers.notices.no-notices": {
+    "message": "No notices"
+  },
   "settings.billing.modal.cancel.action": {
     "message": "Cancel subscription"
   },
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
new file mode 100644
index 00000000..14374c82
--- /dev/null
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -0,0 +1,470 @@
+<template>
+  <NewModal ref="createNoticeModal">
+    <template #title>
+      <span class="text-lg font-extrabold text-contrast">{{
+        editingNotice ? `Editing notice #${editingNotice?.id}` : "Creating a notice"
+      }}</span>
+    </template>
+    <div class="flex w-[700px] flex-col gap-3">
+      <div class="flex flex-col gap-2">
+        <label for="notice-message" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast">
+            Message
+            <span class="text-brand-red">*</span>
+          </span>
+        </label>
+        <div class="textarea-wrapper">
+          <textarea id="notice-message" v-model="newNoticeMessage" maxlength="256" />
+        </div>
+      </div>
+      <div class="flex items-center justify-between gap-2">
+        <label for="level-selector" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Level </span>
+          <span>Determines how the notice should be styled.</span>
+        </label>
+        <TeleportDropdownMenu
+          id="level-selector"
+          v-model="newNoticeLevel"
+          class="max-w-[10rem]"
+          :options="levelOptions"
+          :display-name="(x) => formatMessage(x.name)"
+          name="Level"
+        />
+      </div>
+      <div class="flex items-center justify-between gap-2">
+        <label for="dismissable-toggle" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Dismissable </span>
+          <span>Allow users to dismiss the notice from their panel.</span>
+        </label>
+        <Toggle id="dismissable-toggle" v-model="newNoticeDismissable" />
+      </div>
+      <div class="flex items-center justify-between gap-2">
+        <label for="scheduled-date" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Announcement date </span>
+          <span>Leave blank for notice to be available immediately.</span>
+        </label>
+        <input
+          id="scheduled-date"
+          v-model="newNoticeScheduledDate"
+          type="datetime-local"
+          maxlength="128"
+          autocomplete="off"
+        />
+      </div>
+      <div class="flex items-center justify-between gap-2">
+        <label for="expiration-date" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Expiration date </span>
+          <span>The notice will automatically be deleted after this date.</span>
+        </label>
+        <input
+          id="expiration-date"
+          v-model="newNoticeExpiresDate"
+          type="datetime-local"
+          maxlength="128"
+          autocomplete="off"
+        />
+      </div>
+
+      <div class="flex flex-col gap-2">
+        <span class="text-lg font-semibold text-contrast"> Preview </span>
+        <ServerNotice
+          :level="newNoticeLevel.id"
+          :message="
+            !trimmedMessage || trimmedMessage.length < 1
+              ? 'Type a message to begin previewing it.'
+              : trimmedMessage
+          "
+          :dismissable="newNoticeDismissable"
+          preview
+        />
+      </div>
+      <div class="flex gap-2">
+        <ButtonStyled color="brand">
+          <button v-if="editingNotice" :disabled="!!noticeSubmitError" @click="() => saveChanges()">
+            <SaveIcon aria-hidden="true" />
+            {{ formatMessage(commonMessages.saveChangesButton) }}
+          </button>
+          <button v-else :disabled="!!noticeSubmitError" @click="() => createNotice()">
+            <PlusIcon aria-hidden="true" />
+            {{ formatMessage(messages.createNotice) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled>
+          <button @click="createNoticeModal?.hide">
+            <XIcon aria-hidden="true" />
+            Cancel
+          </button>
+        </ButtonStyled>
+      </div>
+    </div>
+  </NewModal>
+  <AssignNoticeModal ref="assignNoticeModal" @close="refreshNotices" />
+  <div class="page experimental-styles-within">
+    <div
+      class="mb-6 flex items-end justify-between border-0 border-b border-solid border-divider pb-4"
+    >
+      <h1 class="m-0 text-2xl">Servers notices</h1>
+      <ButtonStyled color="brand">
+        <button @click="openNewNoticeModal">
+          <PlusIcon />
+          {{ formatMessage(messages.createNotice) }}
+        </button>
+      </ButtonStyled>
+    </div>
+    <div>
+      <div v-if="!notices || notices.length === 0">{{ formatMessage(messages.noNotices) }}</div>
+      <div
+        v-else
+        class="grid grid-cols-[auto_auto_auto] gap-4 md:grid-cols-[min-content_auto_auto_auto_auto_min-content]"
+      >
+        <div class="col-span-full grid grid-cols-subgrid gap-4 px-4 font-bold text-contrast">
+          <div>{{ formatMessage(messages.id) }}</div>
+          <div>{{ formatMessage(messages.begins) }}</div>
+          <div>{{ formatMessage(messages.expires) }}</div>
+          <div class="hidden md:block">{{ formatMessage(messages.level) }}</div>
+          <div class="hidden md:block">{{ formatMessage(messages.dismissable) }}</div>
+          <div class="hidden md:block">{{ formatMessage(messages.actions) }}</div>
+        </div>
+        <div
+          v-for="notice in notices"
+          :key="`notice-${notice.id}`"
+          class="col-span-full grid grid-cols-subgrid gap-4 rounded-2xl bg-bg-raised p-4"
+        >
+          <div class="col-span-full grid grid-cols-subgrid items-center gap-4">
+            <div>
+              <CopyCode :text="`${notice.id}`" />
+            </div>
+            <div class="text-sm">
+              <span v-if="notice.announce_at">
+                {{ dayjs(notice.announce_at).format("MMM D, YYYY [at] h:mm A") }} ({{
+                  dayjs(notice.announce_at).fromNow()
+                }})
+              </span>
+              <template v-else> Never begins </template>
+            </div>
+            <div class="text-sm">
+              <span
+                v-if="notice.expires"
+                v-tooltip="dayjs(notice.expires).format('MMMM D, YYYY [at] h:mm A')"
+              >
+                {{ dayjs(notice.expires).fromNow() }}
+              </span>
+              <template v-else> Never expires </template>
+            </div>
+            <div
+              :style="
+                NOTICE_LEVELS[notice.level]
+                  ? {
+                      '--_color': NOTICE_LEVELS[notice.level].colors.text,
+                      '--_bg-color': NOTICE_LEVELS[notice.level].colors.bg,
+                    }
+                  : undefined
+              "
+            >
+              <TagItem>
+                {{
+                  NOTICE_LEVELS[notice.level]
+                    ? formatMessage(NOTICE_LEVELS[notice.level].name)
+                    : notice.level
+                }}
+              </TagItem>
+            </div>
+            <div
+              :style="{
+                '--_color': notice.dismissable ? 'var(--color-green)' : 'var(--color-red)',
+                '--_bg-color': notice.dismissable ? 'var(--color-green-bg)' : 'var(--color-red-bg)',
+              }"
+            >
+              <TagItem>
+                {{
+                  formatMessage(notice.dismissable ? messages.dismissable : messages.undismissable)
+                }}
+              </TagItem>
+            </div>
+            <div class="col-span-2 flex gap-2 md:col-span-1">
+              <ButtonStyled>
+                <button @click="() => startEditing(notice)">
+                  <EditIcon /> {{ formatMessage(commonMessages.editButton) }}
+                </button>
+              </ButtonStyled>
+              <ButtonStyled color="red">
+                <button @click="() => deleteNotice(notice)">
+                  <TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}
+                </button>
+              </ButtonStyled>
+            </div>
+          </div>
+          <div class="col-span-full grid">
+            <ServerNotice
+              :level="notice.level"
+              :message="notice.message"
+              :dismissable="notice.dismissable"
+              preview
+            />
+            <div class="mt-4 flex items-center gap-2">
+              <span v-if="!notice.assigned || notice.assigned.length === 0"
+                >Not assigned to any servers</span
+              >
+              <span v-else-if="!notice.assigned.some((n) => n.kind === 'server')">
+                Assigned to
+                {{ notice.assigned.filter((n) => n.kind === "node").length }} nodes
+              </span>
+              <span v-else-if="!notice.assigned.some((n) => n.kind === 'node')">
+                Assigned to
+                {{ notice.assigned.filter((n) => n.kind === "server").length }} servers
+              </span>
+              <span v-else>
+                Assigned to
+                {{ notice.assigned.filter((n) => n.kind === "server").length }} servers and
+                {{ notice.assigned.filter((n) => n.kind === "node").length }} nodes
+              </span>
+              •
+              <button
+                class="m-0 flex items-center gap-1 border-none bg-transparent p-0 text-blue hover:underline hover:brightness-125 active:scale-95 active:brightness-150"
+                @click="() => startEditing(notice, true)"
+              >
+                <SettingsIcon />
+                Edit assignments
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import {
+  CopyCode,
+  TagItem,
+  ButtonStyled,
+  ServerNotice,
+  commonMessages,
+  NewModal,
+  TeleportDropdownMenu,
+  Toggle,
+} from "@modrinth/ui";
+import { SettingsIcon, PlusIcon, SaveIcon, TrashIcon, EditIcon, XIcon } from "@modrinth/assets";
+import dayjs from "dayjs";
+import { useVIntl } from "@vintl/vintl";
+import type { ServerNotice as ServerNoticeType } from "@modrinth/utils";
+import { computed } from "vue";
+import { NOTICE_LEVELS } from "@modrinth/ui/src/utils/notices.ts";
+import { usePyroFetch } from "~/composables/pyroFetch.ts";
+import AssignNoticeModal from "~/components/ui/servers/notice/AssignNoticeModal.vue";
+
+const { formatMessage } = useVIntl();
+const app = useNuxtApp() as unknown as { $notify: any };
+
+const notices = ref<ServerNoticeType[]>([]);
+const createNoticeModal = ref<InstanceType<typeof NewModal>>();
+const assignNoticeModal = ref<InstanceType<typeof AssignNoticeModal>>();
+
+await refreshNotices();
+
+async function refreshNotices() {
+  await usePyroFetch("notices").then((res) => {
+    notices.value = res as ServerNoticeType[];
+    notices.value.sort((a, b) => {
+      const dateDiff = dayjs(b.announce_at).diff(dayjs(a.announce_at));
+      if (dateDiff === 0) {
+        return b.id - a.id;
+      }
+
+      return dateDiff;
+    });
+  });
+}
+
+const levelOptions = Object.keys(NOTICE_LEVELS).map((x) => ({
+  id: x,
+  ...NOTICE_LEVELS[x],
+}));
+
+const DATE_TIME_FORMAT = "YYYY-MM-DDTHH:mm";
+
+const newNoticeLevel = ref(levelOptions[0]);
+const newNoticeDismissable = ref(false);
+const newNoticeMessage = ref("");
+const newNoticeScheduledDate = ref<string>();
+const newNoticeExpiresDate = ref<string>();
+
+function openNewNoticeModal() {
+  newNoticeLevel.value = levelOptions[0];
+  newNoticeDismissable.value = false;
+  newNoticeMessage.value = "";
+  newNoticeScheduledDate.value = undefined;
+  newNoticeExpiresDate.value = undefined;
+  editingNotice.value = undefined;
+  createNoticeModal.value?.show();
+}
+
+const editingNotice = ref<undefined | ServerNoticeType>();
+
+function startEditing(notice: ServerNoticeType, assignments: boolean = false) {
+  newNoticeLevel.value = levelOptions.find((x) => x.id === notice.level) ?? levelOptions[0];
+  newNoticeDismissable.value = notice.dismissable;
+  newNoticeMessage.value = notice.message;
+  newNoticeScheduledDate.value = dayjs(notice.announce_at).format(DATE_TIME_FORMAT);
+  newNoticeExpiresDate.value = notice.expires
+    ? dayjs(notice.expires).format(DATE_TIME_FORMAT)
+    : undefined;
+  editingNotice.value = notice;
+  if (assignments) {
+    assignNoticeModal.value?.show?.(notice);
+  } else {
+    createNoticeModal.value?.show();
+  }
+}
+
+async function deleteNotice(notice: ServerNoticeType) {
+  await usePyroFetch(`notices/${notice.id}`, {
+    method: "DELETE",
+  })
+    .then(() => {
+      app.$notify({
+        group: "main",
+        title: `Successfully deleted notice #${notice.id}`,
+        type: "success",
+      });
+    })
+    .catch((err) => {
+      app.$notify({
+        group: "main",
+        title: "Error deleting notice",
+        text: err,
+        type: "error",
+      });
+    });
+  await refreshNotices();
+}
+
+const trimmedMessage = computed(() => newNoticeMessage.value?.trim());
+
+const noticeSubmitError = computed(() => {
+  let error: undefined | string;
+  if (!trimmedMessage.value || trimmedMessage.value.length === 0) {
+    error = "Notice message is required";
+  }
+  if (!newNoticeLevel.value) {
+    error = "Notice level is required";
+  }
+  return error;
+});
+
+function validateSubmission(message: string) {
+  if (noticeSubmitError.value) {
+    addNotification({
+      group: "main",
+      title: message,
+      text: noticeSubmitError.value,
+      type: "error",
+    });
+    return false;
+  }
+  return true;
+}
+
+async function saveChanges() {
+  if (!validateSubmission("Error saving notice")) {
+    return;
+  }
+
+  await usePyroFetch(`notices/${editingNotice.value?.id}`, {
+    method: "PATCH",
+    body: {
+      message: newNoticeMessage.value,
+      level: newNoticeLevel.value.id,
+      dismissable: newNoticeDismissable.value,
+      announce_at: newNoticeScheduledDate.value
+        ? dayjs(newNoticeScheduledDate.value).toISOString()
+        : dayjs().toISOString(),
+      expires: newNoticeExpiresDate.value
+        ? dayjs(newNoticeScheduledDate.value).toISOString()
+        : undefined,
+    },
+  }).catch((err) => {
+    app.$notify({
+      group: "main",
+      title: "Error saving changes to notice",
+      text: err,
+      type: "error",
+    });
+  });
+  await refreshNotices();
+  createNoticeModal.value?.hide();
+}
+
+async function createNotice() {
+  if (!validateSubmission("Error creating notice")) {
+    return;
+  }
+
+  await usePyroFetch("notices", {
+    method: "POST",
+    body: {
+      message: newNoticeMessage.value,
+      level: newNoticeLevel.value.id,
+      dismissable: newNoticeDismissable.value,
+      announce_at: newNoticeScheduledDate.value ?? dayjs().toISOString(),
+      expires: newNoticeExpiresDate.value,
+    },
+  }).catch((err) => {
+    app.$notify({
+      group: "main",
+      title: "Error creating notice",
+      text: err,
+      type: "error",
+    });
+  });
+  await refreshNotices();
+  createNoticeModal.value?.hide();
+}
+
+const messages = defineMessages({
+  createNotice: {
+    id: "servers.notices.create-notice",
+    defaultMessage: "Create notice",
+  },
+  noNotices: {
+    id: "servers.notices.no-notices",
+    defaultMessage: "No notices",
+  },
+  dismissable: {
+    id: "servers.notice.dismissable",
+    defaultMessage: "Dismissable",
+  },
+  undismissable: {
+    id: "servers.notice.undismissable",
+    defaultMessage: "Undismissable",
+  },
+  id: {
+    id: "servers.notice.id",
+    defaultMessage: "ID",
+  },
+  begins: {
+    id: "servers.notice.begins",
+    defaultMessage: "Begins",
+  },
+  expires: {
+    id: "servers.notice.expires",
+    defaultMessage: "Expires",
+  },
+  actions: {
+    id: "servers.notice.actions",
+    defaultMessage: "Actions",
+  },
+  level: {
+    id: "servers.notice.level",
+    defaultMessage: "Level",
+  },
+});
+</script>
+<style lang="scss" scoped>
+.page {
+  padding: 1rem;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 78.5rem;
+}
+</style>
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 0d117873..8dfde57f 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -1,5 +1,19 @@
 <template>
   <div class="contents">
+    <div
+      v-if="serverData?.notices && serverData.notices.length > 0"
+      class="experimental-styles-within relative mx-auto flex w-full min-w-0 max-w-[1280px] flex-col gap-3 px-6"
+    >
+      <ServerNotice
+        v-for="notice in serverData?.notices"
+        :key="`notice-${notice.id}`"
+        :level="notice.level"
+        :message="notice.message"
+        :dismissable="notice.dismissable"
+        class="w-full"
+        @dismiss="() => dismissNotice(notice.id)"
+      />
+    </div>
     <div
       v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'upgrading'"
       class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
@@ -398,11 +412,14 @@ import {
   LockIcon,
 } from "@modrinth/assets";
 import DOMPurify from "dompurify";
-import { ButtonStyled } from "@modrinth/ui";
+import { ButtonStyled, ServerNotice } from "@modrinth/ui";
 import { Intercom, shutdown } from "@intercom/messenger-js-sdk";
 import { reloadNuxtApp, navigateTo } from "#app";
 import type { ServerState, Stats, WSEvent, WSInstallationResultEvent } from "~/types/servers";
 import { usePyroConsole } from "~/store/console.ts";
+import { usePyroFetch } from "~/composables/pyroFetch.ts";
+
+const app = useNuxtApp() as unknown as { $notify: any };
 
 const socket = ref<WebSocket | null>(null);
 const isReconnecting = ref(false);
@@ -927,6 +944,20 @@ const cleanup = () => {
   DOMPurify.removeHook("afterSanitizeAttributes");
 };
 
+async function dismissNotice(noticeId: number) {
+  await usePyroFetch(`servers/${serverId}/notices/${noticeId}/dismiss`, {
+    method: "POST",
+  }).catch((err) => {
+    app.$notify({
+      group: "main",
+      title: "Error dismissing notice",
+      text: err,
+      type: "error",
+    });
+  });
+  await server.refresh(["general"]);
+}
+
 onMounted(() => {
   isMounted.value = true;
   if (server.general?.status === "suspended") {
diff --git a/packages/ui/src/components/base/Accordion.vue b/packages/ui/src/components/base/Accordion.vue
index 333e2564..57a2debd 100644
--- a/packages/ui/src/components/base/Accordion.vue
+++ b/packages/ui/src/components/base/Accordion.vue
@@ -2,14 +2,14 @@
   <div v-bind="$attrs">
     <button
       v-if="!!slots.title"
-      :class="buttonClass ?? 'flex flex-col gap-2'"
+      :class="buttonClass ?? 'flex flex-col gap-2 bg-transparent m-0 p-0 border-none'"
       @click="() => (isOpen ? close() : open())"
     >
       <slot name="button" :open="isOpen">
-        <div class="flex items-center w-full">
+        <div class="flex items-center gap-1 w-full">
           <slot name="title" />
           <DropdownIcon
-            class="ml-auto size-5 transition-transform duration-300 shrink-0 text-contrast"
+            class="ml-auto size-5 transition-transform duration-300 shrink-0"
             :class="{ 'rotate-180': isOpen }"
           />
         </div>
diff --git a/packages/ui/src/components/base/Admonition.vue b/packages/ui/src/components/base/Admonition.vue
index 538bb9d8..63e50bde 100644
--- a/packages/ui/src/components/base/Admonition.vue
+++ b/packages/ui/src/components/base/Admonition.vue
@@ -10,13 +10,16 @@
       :class="['hidden h-8 w-8 flex-none sm:block', iconClasses[type]]"
     />
     <div class="flex flex-col gap-2">
-      <div class="font-semibold">
+      <div class="font-semibold flex justify-between gap-4">
         <slot name="header">{{ header }}</slot>
       </div>
       <div class="font-normal">
         <slot>{{ body }}</slot>
       </div>
     </div>
+    <div class="ml-auto w-fit">
+      <slot name="actions" />
+    </div>
   </div>
 </template>
 
diff --git a/packages/ui/src/components/base/ContentPageHeader.vue b/packages/ui/src/components/base/ContentPageHeader.vue
index eeada8e8..3b6e5614 100644
--- a/packages/ui/src/components/base/ContentPageHeader.vue
+++ b/packages/ui/src/components/base/ContentPageHeader.vue
@@ -11,10 +11,10 @@
           </h1>
           <slot name="title-suffix" />
         </div>
-        <p class="m-0 line-clamp-2 max-w-[40rem] empty:hidden">
+        <p v-if="$slots.summary" class="m-0 line-clamp-2 max-w-[40rem] empty:hidden">
           <slot name="summary" />
         </p>
-        <div class="mt-auto flex flex-wrap gap-4 empty:hidden">
+        <div v-if="$slots.stats" class="mt-auto flex flex-wrap gap-4 empty:hidden">
           <slot name="stats" />
         </div>
       </div>
diff --git a/packages/ui/src/components/base/ServerNotice.vue b/packages/ui/src/components/base/ServerNotice.vue
new file mode 100644
index 00000000..cd06ab12
--- /dev/null
+++ b/packages/ui/src/components/base/ServerNotice.vue
@@ -0,0 +1,73 @@
+<template>
+  <Admonition :type="NOTICE_TYPE[props.level]">
+    <template #header>
+      {{ formatMessage(heading) }}
+    </template>
+    <template #actions>
+      <ButtonStyled v-if="dismissable" circular>
+        <button
+          v-tooltip="formatMessage(messages.dismiss)"
+          @click="() => (preview ? {} : emit('dismiss'))"
+        >
+          <XIcon />
+        </button>
+      </ButtonStyled>
+    </template>
+    <div v-if="message" class="markdown-body" v-html="renderString(message)" />
+  </Admonition>
+</template>
+
+<script setup lang="ts">
+import { renderString } from '@modrinth/utils'
+import { Admonition } from '../index'
+import { XIcon } from '@modrinth/assets'
+import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
+import { computed } from 'vue'
+import ButtonStyled from './ButtonStyled.vue'
+
+const { formatMessage } = useVIntl()
+const emit = defineEmits<{
+  (e: 'dismiss'): void
+}>()
+
+const props = withDefaults(
+  defineProps<{
+    level: string
+    message: string
+    dismissable: boolean
+    preview?: boolean
+  }>(),
+  {
+    preview: false,
+  },
+)
+
+const messages = defineMessages({
+  info: {
+    id: 'servers.notice.heading.info',
+    defaultMessage: 'Info',
+  },
+  attention: {
+    id: 'servers.notice.heading.attention',
+    defaultMessage: 'Attention',
+  },
+  dismiss: {
+    id: 'servers.notice.dismiss',
+    defaultMessage: 'Dismiss',
+  },
+})
+
+const NOTICE_HEADINGS: Record<string, MessageDescriptor> = {
+  info: messages.info,
+  warn: messages.attention,
+  critical: messages.attention,
+}
+
+const NOTICE_TYPE: Record<string, 'info' | 'warning' | 'critical'> = {
+  info: 'info',
+  warn: 'warning',
+  critical: 'critical',
+}
+
+const heading = computed(() => NOTICE_HEADINGS[props.level] ?? messages.info)
+</script>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index ab41adef..1c4ee40b 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -30,6 +30,7 @@ export { default as ProjectCard } from './base/ProjectCard.vue'
 export { default as RadialHeader } from './base/RadialHeader.vue'
 export { default as RadioButtons } from './base/RadioButtons.vue'
 export { default as ScrollablePanel } from './base/ScrollablePanel.vue'
+export { default as ServerNotice } from './base/ServerNotice.vue'
 export { default as SimpleBadge } from './base/SimpleBadge.vue'
 export { default as Slider } from './base/Slider.vue'
 export { default as StatItem } from './base/StatItem.vue'
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index d569d1ec..c0fe5dbc 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -404,6 +404,30 @@
   "search.filter_type.shader_loader": {
     "defaultMessage": "Loader"
   },
+  "servers.notice.dismiss": {
+    "defaultMessage": "Dismiss"
+  },
+  "servers.notice.dismissable": {
+    "defaultMessage": "Dismissable"
+  },
+  "servers.notice.heading.attention": {
+    "defaultMessage": "Attention"
+  },
+  "servers.notice.heading.info": {
+    "defaultMessage": "Info"
+  },
+  "servers.notice.level.critical.name": {
+    "defaultMessage": "Critical"
+  },
+  "servers.notice.level.info.name": {
+    "defaultMessage": "Info"
+  },
+  "servers.notice.level.warn.name": {
+    "defaultMessage": "Warning"
+  },
+  "servers.notice.undismissable": {
+    "defaultMessage": "Undismissable"
+  },
   "settings.account.title": {
     "defaultMessage": "Account and security"
   },
diff --git a/packages/ui/src/utils/notices.ts b/packages/ui/src/utils/notices.ts
new file mode 100644
index 00000000..d7abf93d
--- /dev/null
+++ b/packages/ui/src/utils/notices.ts
@@ -0,0 +1,63 @@
+import { defineMessage, type MessageDescriptor } from '@vintl/vintl'
+
+export const NOTICE_LEVELS: Record<
+  string,
+  { name: MessageDescriptor; colors: { text: string; bg: string } }
+> = {
+  info: {
+    name: defineMessage({
+      id: 'servers.notice.level.info.name',
+      defaultMessage: 'Info',
+    }),
+    colors: {
+      text: 'var(--color-blue)',
+      bg: 'var(--color-blue-bg)',
+    },
+  },
+  warn: {
+    name: defineMessage({
+      id: 'servers.notice.level.warn.name',
+      defaultMessage: 'Warning',
+    }),
+    colors: {
+      text: 'var(--color-orange)',
+      bg: 'var(--color-orange-bg)',
+    },
+  },
+  critical: {
+    name: defineMessage({
+      id: 'servers.notice.level.critical.name',
+      defaultMessage: 'Critical',
+    }),
+    colors: {
+      text: 'var(--color-red)',
+      bg: 'var(--color-red-bg)',
+    },
+  },
+}
+
+const DISMISSABLE = {
+  name: defineMessage({
+    id: 'servers.notice.dismissable',
+    defaultMessage: 'Dismissable',
+  }),
+  colors: {
+    text: 'var(--color-green)',
+    bg: 'var(--color-green-bg)',
+  },
+}
+
+const UNDISMISSABLE = {
+  name: defineMessage({
+    id: 'servers.notice.undismissable',
+    defaultMessage: 'Undismissable',
+  }),
+  colors: {
+    text: 'var(--color-red)',
+    bg: 'var(--color-red-bg)',
+  },
+}
+
+export function getDismissableMetadata(dismissable: boolean) {
+  return dismissable ? DISMISSABLE : UNDISMISSABLE
+}
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index 7f7892d2..bf440cdd 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -252,3 +252,21 @@ export type Report = {
   created: string
   body: string
 }
+
+export type ServerNotice = {
+  id: number
+  message: string
+  level: string
+  dismissable: boolean
+  announce_at: string
+  expires: string
+  assigned: {
+    kind: 'server' | 'node'
+    id: string
+    name: string
+  }[]
+  dismissed_by: {
+    server: string
+    dismissed_on: string
+  }[]
+}

From edd09b0b16d962bb2697c81aed0bd23d83cccd8d Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Sat, 12 Apr 2025 22:06:22 -0700
Subject: [PATCH 08/28] Update changelog

---
 packages/utils/changelog.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 57087bd8..c3cfb2d8 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,18 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-04-12T22:10:00-07:00`,
+    product: 'servers',
+    body: `### Added
+- Added ability to notify customers in the panel with notices concerning their servers.`,
+  },
+  {
+    date: `2025-04-12T22:10:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Fix missing dropdown icon in publishing checklist.`,
+  },
   {
     date: `2025-04-01T21:15:00-07:00`,
     product: 'web',

From f2ec89e62bf51b96df848513e9facde79d199a3e Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sun, 13 Apr 2025 01:21:02 -0400
Subject: [PATCH 09/28] Fix two database errors (#3483)

* Fixes error when an admin tries transferring project ownership
* Fixes error when trying to delete a user when they previously have a transaction

Co-authored-by: Jai Agrawal <18202329+Geometrically@users.noreply.github.com>
---
 ...e0368ee972ed20bd4d4b2490c655fde999dda.json | 15 +++++++++
 .../labrinth/src/database/models/user_item.rs | 12 +++++++
 apps/labrinth/src/routes/v3/teams.rs          | 33 +++++++++++--------
 3 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json

diff --git a/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json b/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json
new file mode 100644
index 00000000..f2104ac6
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE charges\n                SET user_id = $1\n                WHERE user_id = $2\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda"
+}
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index a231c2c6..05db1992 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -657,6 +657,18 @@ impl User {
             .execute(&mut **transaction)
             .await?;
 
+            sqlx::query!(
+                "
+                UPDATE charges
+                SET user_id = $1
+                WHERE user_id = $2
+                ",
+                deleted_user as UserId,
+                id as UserId,
+            )
+            .execute(&mut **transaction)
+            .await?;
+
             sqlx::query!(
                 "
                 DELETE FROM user_backup_codes
diff --git a/apps/labrinth/src/routes/v3/teams.rs b/apps/labrinth/src/routes/v3/teams.rs
index 4917d054..e6f9ecd7 100644
--- a/apps/labrinth/src/routes/v3/teams.rs
+++ b/apps/labrinth/src/routes/v3/teams.rs
@@ -936,19 +936,26 @@ pub async fn transfer_ownership(
     let mut transaction = pool.begin().await?;
 
     // The following are the only places new_is_owner is modified.
-    TeamMember::edit_team_member(
-        id.into(),
-        current_user.id.into(),
-        None,
-        None,
-        None,
-        None,
-        None,
-        None,
-        Some(false),
-        &mut transaction,
-    )
-    .await?;
+    if let Some(former_owner) =
+        TeamMember::get_from_team_full(id.into(), &**pool, &redis)
+            .await?
+            .into_iter()
+            .find(|x| x.is_owner)
+    {
+        TeamMember::edit_team_member(
+            id.into(),
+            former_owner.user_id,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+            Some(false),
+            &mut transaction,
+        )
+        .await?;
+    }
 
     TeamMember::edit_team_member(
         id.into(),

From 6c16688ca93fc1ab878d9e915246d78fa723dca8 Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Sat, 12 Apr 2025 22:23:38 -0700
Subject: [PATCH 10/28] Remove notice limit

---
 apps/frontend/src/pages/admin/servers/notices.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index 14374c82..153f8c5a 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -47,7 +47,6 @@
           id="scheduled-date"
           v-model="newNoticeScheduledDate"
           type="datetime-local"
-          maxlength="128"
           autocomplete="off"
         />
       </div>
@@ -60,7 +59,6 @@
           id="expiration-date"
           v-model="newNoticeExpiresDate"
           type="datetime-local"
-          maxlength="128"
           autocomplete="off"
         />
       </div>

From 04659a8198f5f918cc17baf2ae896e1fc1921a6d Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Mon, 14 Apr 2025 16:58:31 -0700
Subject: [PATCH 11/28] Notices fixes and support for titles (#3508)

* Notices fixes and support for titles

* Lint
---
 .../ui/servers/notice/AssignNoticeModal.vue   |  1 +
 .../ui/servers/notice/NoticeDashboardItem.vue |  1 +
 .../src/pages/admin/servers/notices.vue       | 33 ++++++++++++++++---
 .../src/pages/servers/manage/[id].vue         |  1 +
 .../ui/src/components/base/ServerNotice.vue   | 21 +++++++++++-
 packages/utils/types.ts                       |  1 +
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
index e57ac27a..b7446c36 100644
--- a/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
+++ b/apps/frontend/src/components/ui/servers/notice/AssignNoticeModal.vue
@@ -114,6 +114,7 @@ defineExpose({ show, hide });
         :level="notice.level"
         :message="notice.message"
         :dismissable="notice.dismissable"
+        :title="notice.title"
         preview
       />
       <div class="flex flex-col gap-2">
diff --git a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
index 434f3b85..bae501e0 100644
--- a/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
+++ b/apps/frontend/src/components/ui/servers/notice/NoticeDashboardItem.vue
@@ -85,6 +85,7 @@ const props = defineProps<{
         :level="notice.level"
         :message="notice.message"
         :dismissable="notice.dismissable"
+        :title="notice.title"
         preview
       />
       <div class="mt-4 flex items-center gap-2">
diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index 153f8c5a..74169520 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -6,6 +6,18 @@
       }}</span>
     </template>
     <div class="flex w-[700px] flex-col gap-3">
+      <div class="flex flex-col gap-2">
+        <label for="notice-title" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Title </span>
+        </label>
+        <input
+          id="notice-title"
+          v-model="newNoticeTitle"
+          placeholder="E.g. Maintenance"
+          type="text"
+          autocomplete="off"
+        />
+      </div>
       <div class="flex flex-col gap-2">
         <label for="notice-message" class="flex flex-col gap-1">
           <span class="text-lg font-semibold text-contrast">
@@ -13,8 +25,8 @@
             <span class="text-brand-red">*</span>
           </span>
         </label>
-        <div class="textarea-wrapper">
-          <textarea id="notice-message" v-model="newNoticeMessage" maxlength="256" />
+        <div class="textarea-wrapper h-32">
+          <textarea id="notice-message" v-model="newNoticeMessage" />
         </div>
       </div>
       <div class="flex items-center justify-between gap-2">
@@ -73,6 +85,7 @@
               : trimmedMessage
           "
           :dismissable="newNoticeDismissable"
+          :title="trimmedTitle"
           preview
         />
       </div>
@@ -197,6 +210,7 @@
               :level="notice.level"
               :message="notice.message"
               :dismissable="notice.dismissable"
+              :title="notice.title"
               preview
             />
             <div class="mt-4 flex items-center gap-2">
@@ -285,6 +299,7 @@ const newNoticeLevel = ref(levelOptions[0]);
 const newNoticeDismissable = ref(false);
 const newNoticeMessage = ref("");
 const newNoticeScheduledDate = ref<string>();
+const newNoticeTitle = ref<string>();
 const newNoticeExpiresDate = ref<string>();
 
 function openNewNoticeModal() {
@@ -303,6 +318,7 @@ function startEditing(notice: ServerNoticeType, assignments: boolean = false) {
   newNoticeLevel.value = levelOptions.find((x) => x.id === notice.level) ?? levelOptions[0];
   newNoticeDismissable.value = notice.dismissable;
   newNoticeMessage.value = notice.message;
+  newNoticeTitle.value = notice.title;
   newNoticeScheduledDate.value = dayjs(notice.announce_at).format(DATE_TIME_FORMAT);
   newNoticeExpiresDate.value = notice.expires
     ? dayjs(notice.expires).format(DATE_TIME_FORMAT)
@@ -338,6 +354,7 @@ async function deleteNotice(notice: ServerNoticeType) {
 }
 
 const trimmedMessage = computed(() => newNoticeMessage.value?.trim());
+const trimmedTitle = computed(() => newNoticeTitle.value?.trim());
 
 const noticeSubmitError = computed(() => {
   let error: undefined | string;
@@ -372,13 +389,14 @@ async function saveChanges() {
     method: "PATCH",
     body: {
       message: newNoticeMessage.value,
+      title: trimmedTitle.value,
       level: newNoticeLevel.value.id,
       dismissable: newNoticeDismissable.value,
       announce_at: newNoticeScheduledDate.value
         ? dayjs(newNoticeScheduledDate.value).toISOString()
         : dayjs().toISOString(),
       expires: newNoticeExpiresDate.value
-        ? dayjs(newNoticeScheduledDate.value).toISOString()
+        ? dayjs(newNoticeExpiresDate.value).toISOString()
         : undefined,
     },
   }).catch((err) => {
@@ -402,10 +420,15 @@ async function createNotice() {
     method: "POST",
     body: {
       message: newNoticeMessage.value,
+      title: trimmedTitle.value,
       level: newNoticeLevel.value.id,
       dismissable: newNoticeDismissable.value,
-      announce_at: newNoticeScheduledDate.value ?? dayjs().toISOString(),
-      expires: newNoticeExpiresDate.value,
+      announce_at: newNoticeScheduledDate.value
+        ? dayjs(newNoticeScheduledDate.value).toISOString()
+        : dayjs().toISOString(),
+      expires: newNoticeExpiresDate.value
+        ? dayjs(newNoticeExpiresDate.value).toISOString()
+        : undefined,
     },
   }).catch((err) => {
     app.$notify({
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 8dfde57f..7862a304 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -10,6 +10,7 @@
         :level="notice.level"
         :message="notice.message"
         :dismissable="notice.dismissable"
+        :title="notice.title"
         class="w-full"
         @dismiss="() => dismissNotice(notice.id)"
       />
diff --git a/packages/ui/src/components/base/ServerNotice.vue b/packages/ui/src/components/base/ServerNotice.vue
index cd06ab12..2d107e3d 100644
--- a/packages/ui/src/components/base/ServerNotice.vue
+++ b/packages/ui/src/components/base/ServerNotice.vue
@@ -1,7 +1,15 @@
 <template>
   <Admonition :type="NOTICE_TYPE[props.level]">
     <template #header>
-      {{ formatMessage(heading) }}
+      <template v-if="!hideDefaultTitle">
+        {{ formatMessage(heading) }}
+      </template>
+      <template v-if="title">
+        <template v-if="hideDefaultTitle">
+          {{ title.substring(1) }}
+        </template>
+        <template v-else> - {{ title }}</template>
+      </template>
     </template>
     <template #actions>
       <ButtonStyled v-if="dismissable" circular>
@@ -36,12 +44,18 @@ const props = withDefaults(
     message: string
     dismissable: boolean
     preview?: boolean
+    title?: string
   }>(),
   {
     preview: false,
+    title: undefined,
   },
 )
 
+const hideDefaultTitle = computed(
+  () => props.title && props.title.length > 1 && props.title.startsWith('\\'),
+)
+
 const messages = defineMessages({
   info: {
     id: 'servers.notice.heading.info',
@@ -71,3 +85,8 @@ const NOTICE_TYPE: Record<string, 'info' | 'warning' | 'critical'> = {
 
 const heading = computed(() => NOTICE_HEADINGS[props.level] ?? messages.info)
 </script>
+<style scoped lang="scss">
+.markdown-body > *:first-child {
+  margin-top: 0;
+}
+</style>
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index bf440cdd..a81668e1 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -256,6 +256,7 @@ export type Report = {
 export type ServerNotice = {
   id: number
   message: string
+  title?: string
   level: string
   dismissable: boolean
   announce_at: string

From 76be502e16684b17d237f49fc02a132f260884c7 Mon Sep 17 00:00:00 2001
From: Jai Agrawal <18202329+Geometrically@users.noreply.github.com>
Date: Tue, 15 Apr 2025 15:39:13 -0700
Subject: [PATCH 12/28] Make connections short-lived redis (#3509)

---
 apps/labrinth/src/database/redis.rs | 150 ++++++++++++++--------------
 1 file changed, 74 insertions(+), 76 deletions(-)

diff --git a/apps/labrinth/src/database/redis.rs b/apps/labrinth/src/database/redis.rs
index 9a040907..ee0268fd 100644
--- a/apps/labrinth/src/database/redis.rs
+++ b/apps/labrinth/src/database/redis.rs
@@ -224,8 +224,6 @@ impl RedisPool {
             + Serialize,
         S: Display + Clone + DeserializeOwned + Serialize + Debug,
     {
-        let connection = self.connect().await?.connection;
-
         let ids = keys
             .iter()
             .map(|x| (x.to_string(), x.clone()))
@@ -235,49 +233,21 @@ impl RedisPool {
             return Ok(HashMap::new());
         }
 
-        let get_cached_values =
-            |ids: DashMap<String, I>,
-             mut connection: deadpool_redis::Connection| async move {
-                let slug_ids = if let Some(slug_namespace) = slug_namespace {
-                    cmd("MGET")
-                        .arg(
-                            ids.iter()
-                                .map(|x| {
-                                    format!(
-                                        "{}_{slug_namespace}:{}",
-                                        self.meta_namespace,
-                                        if case_sensitive {
-                                            x.value().to_string()
-                                        } else {
-                                            x.value().to_string().to_lowercase()
-                                        }
-                                    )
-                                })
-                                .collect::<Vec<_>>(),
-                        )
-                        .query_async::<Vec<Option<String>>>(&mut connection)
-                        .await?
-                        .into_iter()
-                        .flatten()
-                        .collect::<Vec<_>>()
-                } else {
-                    Vec::new()
-                };
-
-                let cached_values = cmd("MGET")
+        let get_cached_values = |ids: DashMap<String, I>| async move {
+            let slug_ids = if let Some(slug_namespace) = slug_namespace {
+                let mut connection = self.pool.get().await?;
+                cmd("MGET")
                     .arg(
                         ids.iter()
-                            .map(|x| x.value().to_string())
-                            .chain(ids.iter().filter_map(|x| {
-                                parse_base62(&x.value().to_string())
-                                    .ok()
-                                    .map(|x| x.to_string())
-                            }))
-                            .chain(slug_ids)
                             .map(|x| {
                                 format!(
-                                    "{}_{namespace}:{x}",
-                                    self.meta_namespace
+                                    "{}_{slug_namespace}:{}",
+                                    self.meta_namespace,
+                                    if case_sensitive {
+                                        x.value().to_string()
+                                    } else {
+                                        x.value().to_string().to_lowercase()
+                                    }
                                 )
                             })
                             .collect::<Vec<_>>(),
@@ -285,23 +255,46 @@ impl RedisPool {
                     .query_async::<Vec<Option<String>>>(&mut connection)
                     .await?
                     .into_iter()
-                    .filter_map(|x| {
-                        x.and_then(|val| {
-                            serde_json::from_str::<RedisValue<T, K, S>>(&val)
-                                .ok()
-                        })
-                        .map(|val| (val.key.clone(), val))
-                    })
-                    .collect::<HashMap<_, _>>();
-
-                Ok::<_, DatabaseError>((cached_values, connection, ids))
+                    .flatten()
+                    .collect::<Vec<_>>()
+            } else {
+                Vec::new()
             };
 
+            let mut connection = self.pool.get().await?;
+            let cached_values = cmd("MGET")
+                .arg(
+                    ids.iter()
+                        .map(|x| x.value().to_string())
+                        .chain(ids.iter().filter_map(|x| {
+                            parse_base62(&x.value().to_string())
+                                .ok()
+                                .map(|x| x.to_string())
+                        }))
+                        .chain(slug_ids)
+                        .map(|x| {
+                            format!("{}_{namespace}:{x}", self.meta_namespace)
+                        })
+                        .collect::<Vec<_>>(),
+                )
+                .query_async::<Vec<Option<String>>>(&mut connection)
+                .await?
+                .into_iter()
+                .filter_map(|x| {
+                    x.and_then(|val| {
+                        serde_json::from_str::<RedisValue<T, K, S>>(&val).ok()
+                    })
+                    .map(|val| (val.key.clone(), val))
+                })
+                .collect::<HashMap<_, _>>();
+
+            Ok::<_, DatabaseError>((cached_values, ids))
+        };
+
         let current_time = Utc::now();
         let mut expired_values = HashMap::new();
 
-        let (cached_values_raw, mut connection, ids) =
-            get_cached_values(ids, connection).await?;
+        let (cached_values_raw, ids) = get_cached_values(ids).await?;
         let mut cached_values = cached_values_raw
             .into_iter()
             .filter_map(|(key, val)| {
@@ -352,9 +345,12 @@ impl RedisPool {
                         .with_expiration(SetExpiry::EX(60)),
                 );
             });
-            let results = pipe
-                .query_async::<Vec<Option<i32>>>(&mut connection)
-                .await?;
+            let results = {
+                let mut connection = self.pool.get().await?;
+
+                pipe.query_async::<Vec<Option<i32>>>(&mut connection)
+                    .await?
+            };
 
             for (idx, key) in fetch_ids.into_iter().enumerate() {
                 if let Some(locked) = results.get(idx) {
@@ -487,6 +483,7 @@ impl RedisPool {
                     ));
                 }
 
+                let mut connection = self.pool.get().await?;
                 pipe.query_async::<()>(&mut connection).await?;
 
                 Ok(return_values)
@@ -495,28 +492,29 @@ impl RedisPool {
 
         if !subscribe_ids.is_empty() {
             fetch_tasks.push(Box::pin(async {
-                let mut connection = self.pool.get().await?;
-
                 let mut interval =
                     tokio::time::interval(Duration::from_millis(100));
                 let start = Utc::now();
                 loop {
-                    let results = cmd("MGET")
-                        .arg(
-                            subscribe_ids
-                                .iter()
-                                .map(|x| {
-                                    format!(
-                                        "{}_{namespace}:{}/lock",
-                                        self.meta_namespace,
-                                        // We lowercase key because locks are stored in lowercase
-                                        x.key().to_lowercase()
-                                    )
-                                })
-                                .collect::<Vec<_>>(),
-                        )
-                        .query_async::<Vec<Option<String>>>(&mut connection)
-                        .await?;
+                    let results = {
+                        let mut connection = self.pool.get().await?;
+                        cmd("MGET")
+                            .arg(
+                                subscribe_ids
+                                    .iter()
+                                    .map(|x| {
+                                        format!(
+                                            "{}_{namespace}:{}/lock",
+                                            self.meta_namespace,
+                                            // We lowercase key because locks are stored in lowercase
+                                            x.key().to_lowercase()
+                                        )
+                                    })
+                                    .collect::<Vec<_>>(),
+                            )
+                            .query_async::<Vec<Option<String>>>(&mut connection)
+                            .await?
+                    };
 
                     if results.into_iter().all(|x| x.is_none()) {
                         break;
@@ -529,8 +527,8 @@ impl RedisPool {
                     interval.tick().await;
                 }
 
-                let (return_values, _, _) =
-                    get_cached_values(subscribe_ids, connection).await?;
+                let (return_values, _) =
+                    get_cached_values(subscribe_ids).await?;
 
                 Ok(return_values)
             }));

From 6aa6db4e8c5b70db5ef274108eb039239523fe4d Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Tue, 15 Apr 2025 16:29:50 -0700
Subject: [PATCH 13/28] Survey notices for Servers (#3514)

* Survey notices for Servers

* lint

* remove creepy frog
---
 .../src/pages/admin/servers/notices.vue       |  67 +++++-----
 .../src/pages/servers/manage/[id].vue         | 118 ++++++++++++++++--
 .../ui/src/components/base/ServerNotice.vue   |   9 +-
 packages/ui/src/utils/notices.ts              |  10 ++
 packages/utils/types.ts                       |   2 +-
 5 files changed, 168 insertions(+), 38 deletions(-)

diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index 74169520..d83df81e 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -6,29 +6,6 @@
       }}</span>
     </template>
     <div class="flex w-[700px] flex-col gap-3">
-      <div class="flex flex-col gap-2">
-        <label for="notice-title" class="flex flex-col gap-1">
-          <span class="text-lg font-semibold text-contrast"> Title </span>
-        </label>
-        <input
-          id="notice-title"
-          v-model="newNoticeTitle"
-          placeholder="E.g. Maintenance"
-          type="text"
-          autocomplete="off"
-        />
-      </div>
-      <div class="flex flex-col gap-2">
-        <label for="notice-message" class="flex flex-col gap-1">
-          <span class="text-lg font-semibold text-contrast">
-            Message
-            <span class="text-brand-red">*</span>
-          </span>
-        </label>
-        <div class="textarea-wrapper h-32">
-          <textarea id="notice-message" v-model="newNoticeMessage" />
-        </div>
-      </div>
       <div class="flex items-center justify-between gap-2">
         <label for="level-selector" class="flex flex-col gap-1">
           <span class="text-lg font-semibold text-contrast"> Level </span>
@@ -43,7 +20,38 @@
           name="Level"
         />
       </div>
-      <div class="flex items-center justify-between gap-2">
+      <div v-if="!newNoticeSurvey" class="flex flex-col gap-2">
+        <label for="notice-title" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast"> Title </span>
+        </label>
+        <input
+          id="notice-title"
+          v-model="newNoticeTitle"
+          placeholder="E.g. Maintenance"
+          type="text"
+          autocomplete="off"
+        />
+      </div>
+      <div class="flex flex-col gap-2">
+        <label for="notice-message" class="flex flex-col gap-1">
+          <span class="text-lg font-semibold text-contrast">
+            {{ newNoticeSurvey ? "Survey ID" : "Message" }}
+            <span class="text-brand-red">*</span>
+          </span>
+        </label>
+        <input
+          v-if="newNoticeSurvey"
+          id="notice-message"
+          v-model="newNoticeMessage"
+          placeholder="E.g. rXGtq2"
+          type="text"
+          autocomplete="off"
+        />
+        <div v-else class="textarea-wrapper h-32">
+          <textarea id="notice-message" v-model="newNoticeMessage" />
+        </div>
+      </div>
+      <div v-if="!newNoticeSurvey" class="flex items-center justify-between gap-2">
         <label for="dismissable-toggle" class="flex flex-col gap-1">
           <span class="text-lg font-semibold text-contrast"> Dismissable </span>
           <span>Allow users to dismiss the notice from their panel.</span>
@@ -75,7 +83,7 @@
         />
       </div>
 
-      <div class="flex flex-col gap-2">
+      <div v-if="!newNoticeSurvey" class="flex flex-col gap-2">
         <span class="text-lg font-semibold text-contrast"> Preview </span>
         <ServerNotice
           :level="newNoticeLevel.id"
@@ -355,6 +363,7 @@ async function deleteNotice(notice: ServerNoticeType) {
 
 const trimmedMessage = computed(() => newNoticeMessage.value?.trim());
 const trimmedTitle = computed(() => newNoticeTitle.value?.trim());
+const newNoticeSurvey = computed(() => newNoticeLevel.value.id === "survey");
 
 const noticeSubmitError = computed(() => {
   let error: undefined | string;
@@ -389,9 +398,9 @@ async function saveChanges() {
     method: "PATCH",
     body: {
       message: newNoticeMessage.value,
-      title: trimmedTitle.value,
+      title: newNoticeSurvey.value ? undefined : trimmedTitle.value,
       level: newNoticeLevel.value.id,
-      dismissable: newNoticeDismissable.value,
+      dismissable: newNoticeSurvey.value ? true : newNoticeDismissable.value,
       announce_at: newNoticeScheduledDate.value
         ? dayjs(newNoticeScheduledDate.value).toISOString()
         : dayjs().toISOString(),
@@ -420,9 +429,9 @@ async function createNotice() {
     method: "POST",
     body: {
       message: newNoticeMessage.value,
-      title: trimmedTitle.value,
+      title: newNoticeSurvey.value ? undefined : trimmedTitle.value,
       level: newNoticeLevel.value.id,
-      dismissable: newNoticeDismissable.value,
+      dismissable: newNoticeSurvey.value ? true : newNoticeDismissable.value,
       announce_at: newNoticeScheduledDate.value
         ? dayjs(newNoticeScheduledDate.value).toISOString()
         : dayjs().toISOString(),
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 7862a304..20397dc8 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -1,11 +1,11 @@
 <template>
   <div class="contents">
     <div
-      v-if="serverData?.notices && serverData.notices.length > 0"
+      v-if="filteredNotices.length > 0"
       class="experimental-styles-within relative mx-auto flex w-full min-w-0 max-w-[1280px] flex-col gap-3 px-6"
     >
       <ServerNotice
-        v-for="notice in serverData?.notices"
+        v-for="notice in filteredNotices"
         :key="`notice-${notice.id}`"
         :level="notice.level"
         :message="notice.message"
@@ -430,15 +430,13 @@ const isFirstMount = ref(true);
 const isMounted = ref(true);
 
 const INTERCOM_APP_ID = ref("ykeritl9");
-const auth = await useAuth();
-// @ts-expect-error - Auth is untyped
+const auth = (await useAuth()) as unknown as {
+  value: { user: { id: string; username: string; email: string; created: string } };
+};
 const userId = ref(auth.value?.user?.id ?? null);
-// @ts-expect-error - Auth is untyped
 const username = ref(auth.value?.user?.username ?? null);
-// @ts-expect-error - Auth is untyped
 const email = ref(auth.value?.user?.email ?? null);
 const createdAt = ref(
-  // @ts-expect-error - Auth is untyped
   auth.value?.user?.created ? Math.floor(new Date(auth.value.user.created).getTime() / 1000) : null,
 );
 
@@ -544,6 +542,99 @@ const navLinks = [
   },
 ];
 
+const filteredNotices = computed(
+  () => serverData.value?.notices?.filter((n) => n.level !== "survey") ?? [],
+);
+const surveyNotice = computed(() => serverData.value?.notices?.find((n) => n.level === "survey"));
+
+async function dismissSurvey() {
+  const noticeId = surveyNotice.value?.id;
+  if (noticeId === undefined) {
+    console.warn("No survey notice to dismiss");
+    return;
+  }
+  await dismissNotice(noticeId);
+  console.log(`Dismissed survey notice ${noticeId}`);
+}
+
+type TallyPopupOptions = {
+  key?: string;
+  layout?: "default" | "modal";
+  width?: number;
+  alignLeft?: boolean;
+  hideTitle?: boolean;
+  overlay?: boolean;
+  emoji?: {
+    text: string;
+    animation:
+      | "none"
+      | "wave"
+      | "tada"
+      | "heart-beat"
+      | "spin"
+      | "flash"
+      | "bounce"
+      | "rubber-band"
+      | "head-shake";
+  };
+  autoClose?: number;
+  showOnce?: boolean;
+  doNotShowAfterSubmit?: boolean;
+  customFormUrl?: string;
+  hiddenFields?: {
+    [key: string]: unknown;
+  };
+  onOpen?: () => void;
+  onClose?: () => void;
+  onPageView?: (page: number) => void;
+  onSubmit?: (payload: unknown) => void;
+};
+
+const popupOptions = computed(
+  () =>
+    ({
+      layout: "default",
+      width: 400,
+      autoClose: 2000,
+      hideTitle: true,
+      hiddenFields: {
+        username: auth.value?.user?.username,
+        user_id: auth.value?.user?.id,
+        user_email: auth.value?.user?.email,
+        server_id: serverData.value?.server_id,
+        loader: serverData.value?.loader,
+        game_version: serverData.value?.mc_version,
+        modpack_id: serverData.value?.project?.id,
+        modpack_name: serverData.value?.project?.title,
+      },
+      onOpen: () => console.log(`Opened survey notice: ${surveyNotice.value?.id}`),
+      onClose: async () => await dismissSurvey(),
+      onSubmit: (payload: any) => {
+        console.log("Form submitted:", payload);
+      },
+    }) satisfies TallyPopupOptions,
+);
+
+function showSurvey() {
+  if (!surveyNotice.value) {
+    console.warn("No survey notice to open");
+    return;
+  }
+
+  try {
+    if ((window as any).Tally?.openPopup) {
+      console.log(
+        `Opening Tally popup for survey notice ${surveyNotice.value?.id} (form ID: ${surveyNotice.value?.message})`,
+      );
+      (window as any).Tally.openPopup(surveyNotice.value?.message, popupOptions.value);
+    } else {
+      console.warn("Tally script not yet loaded");
+    }
+  } catch (e) {
+    console.error("Error opening Tally popup:", e);
+  }
+}
+
 const connectWebSocket = () => {
   if (!isMounted.value) return;
 
@@ -1006,6 +1097,10 @@ onMounted(() => {
       }
     },
   );
+
+  if (surveyNotice.value) {
+    showSurvey();
+  }
 });
 
 onUnmounted(() => {
@@ -1030,6 +1125,15 @@ watch(
 definePageMeta({
   middleware: "auth",
 });
+
+useHead({
+  script: [
+    {
+      src: "https://tally.so/widgets/embed.js",
+      defer: true,
+    },
+  ],
+});
 </script>
 
 <style>
diff --git a/packages/ui/src/components/base/ServerNotice.vue b/packages/ui/src/components/base/ServerNotice.vue
index 2d107e3d..9b57a47c 100644
--- a/packages/ui/src/components/base/ServerNotice.vue
+++ b/packages/ui/src/components/base/ServerNotice.vue
@@ -1,5 +1,11 @@
 <template>
-  <Admonition :type="NOTICE_TYPE[props.level]">
+  <div
+    v-if="level === 'survey'"
+    class="flex items-center gap-2 border-2 border-solid border-brand-purple bg-bg-purple p-4 rounded-2xl"
+  >
+    <span class="text-contrast font-bold">Survey ID:</span> <CopyCode :text="message" />
+  </div>
+  <Admonition v-else :type="NOTICE_TYPE[level]">
     <template #header>
       <template v-if="!hideDefaultTitle">
         {{ formatMessage(heading) }}
@@ -32,6 +38,7 @@ import { XIcon } from '@modrinth/assets'
 import { defineMessages, type MessageDescriptor, useVIntl } from '@vintl/vintl'
 import { computed } from 'vue'
 import ButtonStyled from './ButtonStyled.vue'
+import CopyCode from './CopyCode.vue'
 
 const { formatMessage } = useVIntl()
 const emit = defineEmits<{
diff --git a/packages/ui/src/utils/notices.ts b/packages/ui/src/utils/notices.ts
index d7abf93d..9c67c69f 100644
--- a/packages/ui/src/utils/notices.ts
+++ b/packages/ui/src/utils/notices.ts
@@ -34,6 +34,16 @@ export const NOTICE_LEVELS: Record<
       bg: 'var(--color-red-bg)',
     },
   },
+  survey: {
+    name: defineMessage({
+      id: 'servers.notice.level.survey.name',
+      defaultMessage: 'Survey',
+    }),
+    colors: {
+      text: 'var(--color-purple)',
+      bg: 'var(--color-purple-bg)',
+    },
+  },
 }
 
 const DISMISSABLE = {
diff --git a/packages/utils/types.ts b/packages/utils/types.ts
index a81668e1..1d6ca593 100644
--- a/packages/utils/types.ts
+++ b/packages/utils/types.ts
@@ -257,7 +257,7 @@ export type ServerNotice = {
   id: number
   message: string
   title?: string
-  level: string
+  level: 'info' | 'warn' | 'critical' | 'survey'
   dismissable: boolean
   announce_at: string
   expires: string

From 09aae0edc95dd56dae78f1e1adad527ff63b4efe Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Tue, 15 Apr 2025 16:30:56 -0700
Subject: [PATCH 14/28] Update changelog

---
 packages/utils/changelog.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index c3cfb2d8..7eb3c92b 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-04-15T16:35:00-07:00`,
+    product: 'servers',
+    body: `### Added
+- Added ability to send surveys to customers in the panel via notices.`,
+  },
   {
     date: `2025-04-12T22:10:00-07:00`,
     product: 'servers',

From d5dfb609cf7dfcb50da988bacc18fa22a7163d7a Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Tue, 15 Apr 2025 16:31:46 -0700
Subject: [PATCH 15/28] Update changelog

---
 packages/utils/changelog.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 7eb3c92b..0a6e8f61 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -14,7 +14,10 @@ const VERSIONS: VersionEntry[] = [
     date: `2025-04-15T16:35:00-07:00`,
     product: 'servers',
     body: `### Added
-- Added ability to send surveys to customers in the panel via notices.`,
+- Added ability to send surveys to customers in the panel via notices.
+
+### Improvements
+- Added titles to notices.`,
   },
   {
     date: `2025-04-12T22:10:00-07:00`,

From 817151e47ccfc14ec4c75c09ead499c0a36ad93b Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Tue, 15 Apr 2025 18:11:32 -0700
Subject: [PATCH 16/28] Add notice dismissed count to dashboard

---
 apps/frontend/src/pages/admin/servers/notices.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/frontend/src/pages/admin/servers/notices.vue b/apps/frontend/src/pages/admin/servers/notices.vue
index d83df81e..1a919a71 100644
--- a/apps/frontend/src/pages/admin/servers/notices.vue
+++ b/apps/frontend/src/pages/admin/servers/notices.vue
@@ -246,6 +246,10 @@
                 <SettingsIcon />
                 Edit assignments
               </button>
+              <template v-if="notice.dismissed_by.length > 0">
+                •
+                <span> Dismissed by {{ notice.dismissed_by.length }} servers </span>
+              </template>
             </div>
           </div>
         </div>

From f8494030aa4a12271e497b9e57dd4cd2d81971b8 Mon Sep 17 00:00:00 2001
From: Sticks <sticks@teamhydra.dev>
Date: Thu, 17 Apr 2025 04:26:13 -0400
Subject: [PATCH 17/28] backup page fixes and new impls for new apis (#3437)

* wip: backup page fixes and new impls for new apis

* wip: more progress on backup fixes, almost done

* lint

* Backups cleanup

* Don't show create warning if creating

* Fix ongoing state

* Download support

* Support ready

* Disable auto backup button

* Use auth param for download of backups

* Disable install buttons when backup is in progress, add retrying

* Make prepare button have immediate feedback, don't refresh backups in all cases

* Intl:extract & rebase fixes

* Updated changelog and fix lint

---------

Co-authored-by: Prospector <prospectordev@gmail.com>
---
 .../ui/servers/BackupCreateModal.vue          |  63 +-
 .../ui/servers/BackupDeleteModal.vue          | 101 +--
 .../src/components/ui/servers/BackupItem.vue  | 320 +++++++
 .../ui/servers/BackupRenameModal.vue          | 106 ++-
 .../ui/servers/BackupRestoreModal.vue         |  90 +-
 .../ui/servers/PanelServerActionButton.vue    |   3 +
 .../ui/servers/PlatformMrpackModal.vue        |  99 +--
 .../ui/servers/PlatformVersionSelectModal.vue | 111 +--
 .../components/ui/servers/ServerSidebar.vue   |  11 +-
 apps/frontend/src/composables/featureFlags.ts |   1 +
 apps/frontend/src/composables/pyroServers.ts  | 159 ++--
 apps/frontend/src/locales/en-US/index.json    |  51 ++
 .../src/pages/servers/manage/[id].vue         | 788 ++++++++++--------
 .../src/pages/servers/manage/[id]/backups.vue | 537 +++++-------
 .../src/pages/servers/manage/[id]/options.vue |  10 +-
 .../servers/manage/[id]/options/loader.vue    |  19 +-
 apps/frontend/src/types/servers.ts            |  15 +-
 packages/assets/icons/bot.svg                 |   1 +
 packages/assets/icons/folder-archive.svg      |   1 +
 packages/assets/icons/rotate-ccw.svg          |   1 +
 packages/assets/icons/rotate-cw.svg           |   1 +
 packages/assets/index.ts                      |   8 +
 .../ui/src/components/base/ButtonStyled.vue   |   3 +-
 .../ui/src/components/base/ProgressBar.vue    |  83 ++
 packages/ui/src/components/index.ts           |   4 +
 .../ui/src/components/modal/ConfirmModal.vue  |  55 +-
 .../servers/backups/BackupWarning.vue         |  25 +
 packages/ui/src/locales/en-US/index.json      |   9 +
 packages/ui/src/utils/common-messages.ts      |   8 +
 packages/utils/changelog.ts                   |  12 +
 30 files changed, 1550 insertions(+), 1145 deletions(-)
 create mode 100644 apps/frontend/src/components/ui/servers/BackupItem.vue
 create mode 100644 packages/assets/icons/bot.svg
 create mode 100644 packages/assets/icons/folder-archive.svg
 create mode 100644 packages/assets/icons/rotate-ccw.svg
 create mode 100644 packages/assets/icons/rotate-cw.svg
 create mode 100644 packages/ui/src/components/base/ProgressBar.vue
 create mode 100644 packages/ui/src/components/servers/backups/BackupWarning.vue

diff --git a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
index 31c3a657..f055b4b0 100644
--- a/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupCreateModal.vue
@@ -1,29 +1,32 @@
 <template>
   <NewModal ref="modal" header="Creating backup" @show="focusInput">
     <div class="flex flex-col gap-2 md:w-[600px]">
-      <div class="font-semibold text-contrast">Name</div>
+      <label for="backup-name-input">
+        <span class="text-lg font-semibold text-contrast"> Name </span>
+      </label>
       <input
+        id="backup-name-input"
         ref="input"
         v-model="backupName"
         type="text"
         class="bg-bg-input w-full rounded-lg p-4"
-        placeholder="e.g. Before 1.21"
-        maxlength="64"
+        :placeholder="`Backup #${newBackupAmount}`"
+        maxlength="48"
       />
-      <div class="flex items-center gap-2">
-        <InfoIcon class="hidden sm:block" />
-        <span class="text-sm text-secondary">
-          If left empty, the backup name will default to
-          <span class="font-semibold"> Backup #{{ newBackupAmount }}</span>
+      <div v-if="nameExists && !isCreating" class="flex items-center gap-1">
+        <IssuesIcon class="hidden text-orange sm:block" />
+        <span class="text-sm text-orange">
+          You already have a backup named '<span class="font-semibold">{{ trimmedName }}</span
+          >'
         </span>
       </div>
       <div v-if="isRateLimited" class="mt-2 text-sm text-red">
         You're creating backups too fast. Please wait a moment before trying again.
       </div>
     </div>
-    <div class="mb-1 mt-4 flex justify-start gap-4">
+    <div class="mt-2 flex justify-start gap-2">
       <ButtonStyled color="brand">
-        <button :disabled="isCreating" @click="createBackup">
+        <button :disabled="isCreating || nameExists" @click="createBackup">
           <PlusIcon />
           Create backup
         </button>
@@ -41,24 +44,30 @@
 <script setup lang="ts">
 import { ref, nextTick, computed } from "vue";
 import { ButtonStyled, NewModal } from "@modrinth/ui";
-import { PlusIcon, XIcon, InfoIcon } from "@modrinth/assets";
+import { IssuesIcon, PlusIcon, XIcon } from "@modrinth/assets";
 
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
 }>();
 
-const emit = defineEmits(["backupCreated"]);
-
 const modal = ref<InstanceType<typeof NewModal>>();
 const input = ref<HTMLInputElement>();
 const isCreating = ref(false);
 const isRateLimited = ref(false);
-const backupError = ref<string | null>(null);
 const backupName = ref("");
 const newBackupAmount = computed(() =>
   props.server.backups?.data?.length === undefined ? 1 : props.server.backups?.data?.length + 1,
 );
 
+const trimmedName = computed(() => backupName.value.trim());
+
+const nameExists = computed(() => {
+  if (!props.server.backups?.data) return false;
+  return props.server.backups.data.some(
+    (backup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
+  );
+});
+
 const focusInput = () => {
   nextTick(() => {
     setTimeout(() => {
@@ -67,30 +76,38 @@ const focusInput = () => {
   });
 };
 
+function show() {
+  backupName.value = "";
+  isCreating.value = false;
+  modal.value?.show();
+}
+
 const hideModal = () => {
   modal.value?.hide();
-  backupName.value = "";
 };
 
 const createBackup = async () => {
-  if (!backupName.value.trim()) {
+  if (backupName.value.trim().length === 0) {
     backupName.value = `Backup #${newBackupAmount.value}`;
   }
 
   isCreating.value = true;
   isRateLimited.value = false;
   try {
-    await props.server.backups?.create(backupName.value);
-    await props.server.refresh();
+    await props.server.backups?.create(trimmedName.value);
     hideModal();
-    emit("backupCreated", { success: true, message: "Backup created successfully" });
+    await props.server.refresh();
   } catch (error) {
     if (error instanceof PyroFetchError && error.statusCode === 429) {
       isRateLimited.value = true;
-      backupError.value = "You're creating backups too fast.";
+      addNotification({
+        type: "error",
+        title: "Error creating backup",
+        text: "You're creating backups too fast.",
+      });
     } else {
-      backupError.value = error instanceof Error ? error.message : String(error);
-      emit("backupCreated", { success: false, message: backupError.value });
+      const message = error instanceof Error ? error.message : String(error);
+      addNotification({ type: "error", title: "Error creating backup", text: message });
     }
   } finally {
     isCreating.value = false;
@@ -98,7 +115,7 @@ const createBackup = async () => {
 };
 
 defineExpose({
-  show: () => modal.value?.show(),
+  show,
   hide: hideModal,
 });
 </script>
diff --git a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue b/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
index 44d0ac11..632919c6 100644
--- a/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupDeleteModal.vue
@@ -1,86 +1,45 @@
 <template>
-  <NewModal ref="modal" danger header="Deleting backup">
-    <div class="flex flex-col gap-4">
-      <div class="relative flex w-full flex-col gap-2 rounded-2xl bg-[#0e0e0ea4] p-6">
-        <div class="text-2xl font-extrabold text-contrast">
-          {{ backupName }}
-        </div>
-        <div class="flex gap-2 font-semibold text-contrast">
-          <CalendarIcon />
-          {{ formattedDate }}
-        </div>
-      </div>
-    </div>
-    <div class="mb-1 mt-4 flex justify-end gap-4">
-      <ButtonStyled color="red">
-        <button :disabled="isDeleting" @click="deleteBackup">
-          <TrashIcon />
-          Delete backup
-        </button>
-      </ButtonStyled>
-      <ButtonStyled type="transparent">
-        <button @click="hideModal">Cancel</button>
-      </ButtonStyled>
-    </div>
-  </NewModal>
+  <ConfirmModal
+    ref="modal"
+    danger
+    title="Are you sure you want to delete this backup?"
+    proceed-label="Delete backup"
+    :confirmation-text="currentBackup?.name ?? 'null'"
+    has-to-type
+    @proceed="emit('delete', currentBackup)"
+  >
+    <BackupItem
+      v-if="currentBackup"
+      :backup="currentBackup"
+      preview
+      class="border-px border-solid border-button-border"
+    />
+  </ConfirmModal>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { ButtonStyled, NewModal } from "@modrinth/ui";
-import { TrashIcon, CalendarIcon } from "@modrinth/assets";
+import { ConfirmModal } from "@modrinth/ui";
 import type { Server } from "~/composables/pyroServers";
+import BackupItem from "~/components/ui/servers/BackupItem.vue";
 
-const props = defineProps<{
-  server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
-  backupId: string;
-  backupName: string;
-  backupCreatedAt: string;
+defineProps<{
+  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
 }>();
 
-const emit = defineEmits(["backupDeleted"]);
+const emit = defineEmits<{
+  (e: "delete", backup: Backup | undefined): void;
+}>();
 
-const modal = ref<InstanceType<typeof NewModal>>();
-const isDeleting = ref(false);
-const backupError = ref<string | null>(null);
+const modal = ref<InstanceType<typeof ConfirmModal>>();
+const currentBackup = ref<Backup | undefined>(undefined);
 
-const formattedDate = computed(() => {
-  return new Date(props.backupCreatedAt).toLocaleString("en-US", {
-    month: "numeric",
-    day: "numeric",
-    year: "2-digit",
-    hour: "numeric",
-    minute: "numeric",
-    hour12: true,
-  });
-});
-
-const hideModal = () => {
-  modal.value?.hide();
-};
-
-const deleteBackup = async () => {
-  if (!props.backupId) {
-    emit("backupDeleted", { success: false, message: "No backup selected" });
-    return;
-  }
-
-  isDeleting.value = true;
-  try {
-    await props.server.backups?.delete(props.backupId);
-    await props.server.refresh();
-    hideModal();
-    emit("backupDeleted", { success: true, message: "Backup deleted successfully" });
-  } catch (error) {
-    backupError.value = error instanceof Error ? error.message : String(error);
-    emit("backupDeleted", { success: false, message: backupError.value });
-  } finally {
-    isDeleting.value = false;
-  }
-};
+function show(backup: Backup) {
+  currentBackup.value = backup;
+  modal.value?.show();
+}
 
 defineExpose({
-  show: () => modal.value?.show(),
-  hide: hideModal,
+  show,
 });
 </script>
diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
new file mode 100644
index 00000000..064ab699
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -0,0 +1,320 @@
+<script setup lang="ts">
+import dayjs from "dayjs";
+import {
+  MoreVerticalIcon,
+  HistoryIcon,
+  DownloadIcon,
+  SpinnerIcon,
+  EditIcon,
+  LockIcon,
+  TrashIcon,
+  FolderArchiveIcon,
+  BotIcon,
+  XIcon,
+  LockOpenIcon,
+  RotateCounterClockwiseIcon,
+} from "@modrinth/assets";
+import { ButtonStyled, commonMessages, OverflowMenu, ProgressBar } from "@modrinth/ui";
+import { defineMessages, useVIntl } from "@vintl/vintl";
+import { ref } from "vue";
+import type { Backup } from "~/composables/pyroServers.ts";
+
+const flags = useFeatureFlags();
+const { formatMessage } = useVIntl();
+
+const emit = defineEmits<{
+  (e: "prepare" | "download" | "rename" | "restore" | "lock" | "retry"): void;
+  (e: "delete", skipConfirmation?: boolean): void;
+}>();
+
+const props = withDefaults(
+  defineProps<{
+    backup: Backup;
+    preview?: boolean;
+    kyrosUrl?: string;
+    jwt?: string;
+  }>(),
+  {
+    preview: false,
+    kyrosUrl: undefined,
+    jwt: undefined,
+  },
+);
+
+const backupQueued = computed(
+  () =>
+    props.backup.task?.create?.progress === 0 ||
+    (props.backup.ongoing && !props.backup.task?.create),
+);
+const automated = computed(() => props.backup.automated);
+const failedToCreate = computed(() => props.backup.interrupted);
+
+const preparedDownloadStates = ["ready", "done"];
+const inactiveStates = ["failed", "cancelled"];
+
+const hasPreparedDownload = computed(() =>
+  preparedDownloadStates.includes(props.backup.task?.file?.state ?? ""),
+);
+
+const creating = computed(() => {
+  const task = props.backup.task?.create;
+  if (task && task.progress < 1 && !inactiveStates.includes(task.state)) {
+    return task;
+  }
+  if (props.backup.ongoing) {
+    return {
+      progress: 0,
+      state: "ongoing",
+    };
+  }
+  return undefined;
+});
+
+const restoring = computed(() => {
+  const task = props.backup.task?.restore;
+  if (task && task.progress < 1 && !inactiveStates.includes(task.state)) {
+    return task;
+  }
+  return undefined;
+});
+
+const initiatedPrepare = ref(false);
+
+const preparingFile = computed(() => {
+  const task = props.backup.task?.file;
+  return (
+    initiatedPrepare.value || (task && task.progress < 1 && !inactiveStates.includes(task.state))
+  );
+});
+
+const failedToRestore = computed(() => props.backup.task?.restore?.state === "failed");
+
+const messages = defineMessages({
+  locked: {
+    id: "servers.backups.item.locked",
+    defaultMessage: "Locked",
+  },
+  lock: {
+    id: "servers.backups.item.lock",
+    defaultMessage: "Lock",
+  },
+  unlock: {
+    id: "servers.backups.item.unlock",
+    defaultMessage: "Unlock",
+  },
+  restore: {
+    id: "servers.backups.item.restore",
+    defaultMessage: "Restore",
+  },
+  rename: {
+    id: "servers.backups.item.rename",
+    defaultMessage: "Rename",
+  },
+  queuedForBackup: {
+    id: "servers.backups.item.queued-for-backup",
+    defaultMessage: "Queued for backup",
+  },
+  preparingDownload: {
+    id: "servers.backups.item.preparing-download",
+    defaultMessage: "Preparing download...",
+  },
+  prepareDownload: {
+    id: "servers.backups.item.prepare-download",
+    defaultMessage: "Prepare download",
+  },
+  alreadyPreparing: {
+    id: "servers.backups.item.already-preparing",
+    defaultMessage: "Already preparing backup for download",
+  },
+  creatingBackup: {
+    id: "servers.backups.item.creating-backup",
+    defaultMessage: "Creating backup...",
+  },
+  restoringBackup: {
+    id: "servers.backups.item.restoring-backup",
+    defaultMessage: "Restoring from backup...",
+  },
+  failedToCreateBackup: {
+    id: "servers.backups.item.failed-to-create-backup",
+    defaultMessage: "Failed to create backup",
+  },
+  failedToRestoreBackup: {
+    id: "servers.backups.item.failed-to-restore-backup",
+    defaultMessage: "Failed to restore from backup",
+  },
+  automated: {
+    id: "servers.backups.item.automated",
+    defaultMessage: "Automated",
+  },
+  retry: {
+    id: "servers.backups.item.retry",
+    defaultMessage: "Retry",
+  },
+});
+</script>
+<template>
+  <div
+    :class="
+      preview
+        ? 'grid-cols-[min-content_1fr_1fr] sm:grid-cols-[min-content_3fr_2fr_1fr] md:grid-cols-[auto_3fr_2fr_1fr]'
+        : 'grid-cols-[min-content_1fr_1fr] sm:grid-cols-[min-content_3fr_2fr_1fr] md:grid-cols-[auto_3fr_2fr_1fr_2fr]'
+    "
+    class="grid items-center gap-4 rounded-2xl bg-bg-raised px-4 py-3"
+  >
+    <div
+      class="flex h-12 w-12 items-center justify-center rounded-xl border-[1px] border-solid border-button-border bg-button-bg"
+    >
+      <SpinnerIcon
+        v-if="creating"
+        class="h-6 w-6 animate-spin"
+        :class="{ 'text-orange': backupQueued, 'text-green': !backupQueued }"
+      />
+      <FolderArchiveIcon v-else class="h-6 w-6" />
+    </div>
+    <div class="col-span-2 flex flex-col gap-1 sm:col-span-1">
+      <span class="font-bold text-contrast">
+        {{ backup.name }}
+      </span>
+      <div class="flex items-center gap-2 text-sm">
+        <span v-if="backup.locked" class="flex items-center gap-1 text-sm text-secondary">
+          <LockIcon /> {{ formatMessage(messages.locked) }}
+        </span>
+        <span v-if="automated && backup.locked">•</span>
+        <span v-if="automated" class="flex items-center gap-1 text-secondary">
+          <BotIcon /> {{ formatMessage(messages.automated) }}
+        </span>
+        <span v-if="(failedToCreate || failedToRestore) && (automated || backup.locked)">•</span>
+        <span
+          v-if="failedToCreate || failedToRestore"
+          class="flex items-center gap-1 text-sm text-red"
+        >
+          <XIcon />
+          {{
+            formatMessage(
+              failedToCreate ? messages.failedToCreateBackup : messages.failedToRestoreBackup,
+            )
+          }}
+        </span>
+      </div>
+    </div>
+    <div v-if="creating" class="col-span-2 flex flex-col gap-3">
+      <span v-if="backupQueued" class="text-orange">
+        {{ formatMessage(messages.queuedForBackup) }}
+      </span>
+      <span v-else class="text-green"> {{ formatMessage(messages.creatingBackup) }} </span>
+      <ProgressBar
+        :progress="creating.progress"
+        :color="backupQueued ? 'orange' : 'green'"
+        :waiting="creating.progress === 0"
+        class="max-w-full"
+      />
+    </div>
+    <div v-else-if="restoring" class="col-span-2 flex flex-col gap-3 text-purple">
+      {{ formatMessage(messages.restoringBackup) }}
+      <ProgressBar
+        :progress="restoring.progress"
+        color="purple"
+        :waiting="restoring.progress === 0"
+        class="max-w-full"
+      />
+    </div>
+    <template v-else>
+      <div class="col-span-2">
+        {{ dayjs(backup.created_at).format("MMMM D, YYYY [at] h:mm A") }}
+      </div>
+      <div v-if="false">{{ 245 }} MiB</div>
+    </template>
+    <div
+      v-if="!preview"
+      class="col-span-full flex justify-normal gap-2 md:col-span-1 md:justify-end"
+    >
+      <template v-if="failedToCreate">
+        <ButtonStyled>
+          <button @click="() => emit('retry')">
+            <RotateCounterClockwiseIcon />
+            {{ formatMessage(messages.retry) }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled>
+          <button @click="() => emit('delete', true)">
+            <TrashIcon />
+            Remove
+          </button>
+        </ButtonStyled>
+      </template>
+      <ButtonStyled v-else-if="creating">
+        <button @click="() => emit('delete')">
+          <XIcon />
+          {{ formatMessage(commonMessages.cancelButton) }}
+        </button>
+      </ButtonStyled>
+      <template v-else>
+        <ButtonStyled>
+          <a
+            v-if="hasPreparedDownload"
+            :class="{
+              disabled: !kyrosUrl || !jwt,
+            }"
+            :href="`https://${kyrosUrl}/modrinth/v0/backups/${backup.id}/download?auth=${jwt}`"
+            @click="() => emit('download')"
+          >
+            <DownloadIcon />
+            {{ formatMessage(commonMessages.downloadButton) }}
+          </a>
+          <button
+            v-else
+            :disabled="!!preparingFile"
+            @click="
+              () => {
+                initiatedPrepare = true;
+                emit('prepare');
+              }
+            "
+          >
+            <SpinnerIcon v-if="preparingFile" class="animate-spin" />
+            <DownloadIcon v-else />
+            {{
+              formatMessage(preparingFile ? messages.preparingDownload : messages.prepareDownload)
+            }}
+          </button>
+        </ButtonStyled>
+        <ButtonStyled circular type="transparent">
+          <OverflowMenu
+            :options="[
+              { id: 'rename', action: () => emit('rename') },
+              {
+                id: 'restore',
+                action: () => emit('restore'),
+                disabled: !!restoring || !!preparingFile,
+              },
+              { id: 'lock', action: () => emit('lock') },
+              { divider: true },
+              {
+                id: 'delete',
+                color: 'red',
+                action: () => emit('delete'),
+                disabled: !!restoring || !!preparingFile,
+              },
+            ]"
+          >
+            <MoreVerticalIcon />
+            <template #rename> <EditIcon /> {{ formatMessage(messages.rename) }} </template>
+            <template #restore> <HistoryIcon /> {{ formatMessage(messages.restore) }} </template>
+            <template v-if="backup.locked" #lock>
+              <LockOpenIcon /> {{ formatMessage(messages.unlock) }}
+            </template>
+            <template v-else #lock> <LockIcon /> {{ formatMessage(messages.lock) }} </template>
+            <template #delete>
+              <TrashIcon /> {{ formatMessage(commonMessages.deleteLabel) }}
+            </template>
+          </OverflowMenu>
+        </ButtonStyled>
+      </template>
+    </div>
+    <pre
+      v-if="!preview && flags.advancedDebugInfo"
+      class="col-span-full m-0 rounded-xl bg-button-bg text-xs"
+      >{{ backup }}</pre
+    >
+  </div>
+</template>
diff --git a/apps/frontend/src/components/ui/servers/BackupRenameModal.vue b/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
index f1ab41e2..22157624 100644
--- a/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupRenameModal.vue
@@ -1,24 +1,41 @@
 <template>
   <NewModal ref="modal" header="Renaming backup" @show="focusInput">
     <div class="flex flex-col gap-2 md:w-[600px]">
-      <div class="font-semibold text-contrast">Name</div>
+      <label for="backup-name-input">
+        <span class="text-lg font-semibold text-contrast"> Name </span>
+      </label>
       <input
+        id="backup-name-input"
         ref="input"
         v-model="backupName"
         type="text"
         class="bg-bg-input w-full rounded-lg p-4"
-        placeholder="e.g. Before 1.21"
+        :placeholder="`Backup #${backupNumber}`"
+        maxlength="48"
       />
+      <div v-if="nameExists" class="flex items-center gap-1">
+        <IssuesIcon class="hidden text-orange sm:block" />
+        <span class="text-sm text-orange">
+          You already have a backup named '<span class="font-semibold">{{ trimmedName }}</span
+          >'
+        </span>
+      </div>
     </div>
-    <div class="mb-1 mt-4 flex justify-start gap-4">
+    <div class="mt-2 flex justify-start gap-2">
       <ButtonStyled color="brand">
-        <button :disabled="isRenaming" @click="renameBackup">
-          <SaveIcon />
-          Rename backup
+        <button :disabled="isRenaming || nameExists" @click="renameBackup">
+          <template v-if="isRenaming">
+            <SpinnerIcon class="animate-spin" />
+            Renaming...
+          </template>
+          <template v-else>
+            <SaveIcon />
+            Save changes
+          </template>
         </button>
       </ButtonStyled>
       <ButtonStyled>
-        <button @click="hideModal">
+        <button @click="hide">
           <XIcon />
           Cancel
         </button>
@@ -28,23 +45,38 @@
 </template>
 
 <script setup lang="ts">
-import { ref, nextTick } from "vue";
+import { ref, nextTick, computed } from "vue";
 import { ButtonStyled, NewModal } from "@modrinth/ui";
-import { SaveIcon, XIcon } from "@modrinth/assets";
+import { SpinnerIcon, SaveIcon, XIcon, IssuesIcon } from "@modrinth/assets";
 import type { Server } from "~/composables/pyroServers";
 
 const props = defineProps<{
-  server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
-  currentBackupId: string;
+  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
 }>();
 
-const emit = defineEmits(["backupRenamed"]);
-
 const modal = ref<InstanceType<typeof NewModal>>();
 const input = ref<HTMLInputElement>();
 const backupName = ref("");
+const originalName = ref("");
 const isRenaming = ref(false);
-const backupError = ref<string | null>(null);
+
+const currentBackup = ref<Backup | null>(null);
+
+const trimmedName = computed(() => backupName.value.trim());
+
+const nameExists = computed(() => {
+  if (!props.server.backups?.data || trimmedName.value === originalName.value || isRenaming.value) {
+    return false;
+  }
+
+  return props.server.backups.data.some(
+    (backup) => backup.name.trim().toLowerCase() === trimmedName.value.toLowerCase(),
+  );
+});
+
+const backupNumber = computed(
+  () => (props.server.backups?.data?.findIndex((b) => b.id === currentBackup.value?.id) ?? 0) + 1,
+);
 
 const focusInput = () => {
   nextTick(() => {
@@ -54,33 +86,55 @@ const focusInput = () => {
   });
 };
 
-const hideModal = () => {
-  backupName.value = "";
+function show(backup: Backup) {
+  currentBackup.value = backup;
+  backupName.value = backup.name;
+  originalName.value = backup.name;
+  isRenaming.value = false;
+  modal.value?.show();
+}
+
+function hide() {
   modal.value?.hide();
-};
+}
 
 const renameBackup = async () => {
-  if (!backupName.value.trim() || !props.currentBackupId) {
-    emit("backupRenamed", { success: false, message: "Backup name cannot be empty" });
+  if (!currentBackup.value) {
+    addNotification({
+      type: "error",
+      title: "Error renaming backup",
+      text: "Current backup is null",
+    });
+    return;
+  }
+
+  if (trimmedName.value === originalName.value) {
+    hide();
     return;
   }
 
   isRenaming.value = true;
   try {
-    await props.server.backups?.rename(props.currentBackupId, backupName.value);
+    let newName = trimmedName.value;
+
+    if (newName.length === 0) {
+      newName = `Backup #${backupNumber.value}`;
+    }
+
+    await props.server.backups?.rename(currentBackup.value.id, newName);
+    hide();
     await props.server.refresh();
-    hideModal();
-    emit("backupRenamed", { success: true, message: "Backup renamed successfully" });
   } catch (error) {
-    backupError.value = error instanceof Error ? error.message : String(error);
-    emit("backupRenamed", { success: false, message: backupError.value });
+    const message = error instanceof Error ? error.message : String(error);
+    addNotification({ type: "error", title: "Error renaming backup", text: message });
   } finally {
+    hide();
     isRenaming.value = false;
   }
 };
 
 defineExpose({
-  show: () => modal.value?.show(),
-  hide: hideModal,
+  show,
+  hide,
 });
 </script>
diff --git a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue b/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
index 9439ecb2..18bcd72d 100644
--- a/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
+++ b/apps/frontend/src/components/ui/servers/BackupRestoreModal.vue
@@ -1,82 +1,58 @@
 <template>
-  <NewModal ref="modal" header="Restoring backup">
-    <div class="flex flex-col gap-4">
-      <div class="relative flex w-full flex-col gap-2 rounded-2xl bg-bg p-6">
-        <div class="text-2xl font-extrabold text-contrast">
-          {{ backupName }}
-        </div>
-        <div class="flex gap-2 font-semibold text-contrast">
-          <CalendarIcon />
-          {{ formattedDate }}
-        </div>
-      </div>
-    </div>
-    <div class="mb-1 mt-4 flex justify-end gap-4">
-      <ButtonStyled color="brand">
-        <button :disabled="isRestoring" @click="restoreBackup">Restore backup</button>
-      </ButtonStyled>
-      <ButtonStyled type="transparent">
-        <button @click="hideModal">Cancel</button>
-      </ButtonStyled>
-    </div>
-  </NewModal>
+  <ConfirmModal
+    ref="modal"
+    danger
+    title="Are you sure you want to restore from this backup?"
+    proceed-label="Restore from backup"
+    description="This will **overwrite all files on your server** and replace them with the files from the backup."
+    @proceed="restoreBackup"
+  >
+    <BackupItem
+      v-if="currentBackup"
+      :backup="currentBackup"
+      preview
+      class="border-px border-solid border-button-border"
+    />
+  </ConfirmModal>
 </template>
 
 <script setup lang="ts">
 import { ref } from "vue";
-import { ButtonStyled, NewModal } from "@modrinth/ui";
-import { CalendarIcon } from "@modrinth/assets";
+import { ConfirmModal, NewModal } from "@modrinth/ui";
 import type { Server } from "~/composables/pyroServers";
+import BackupItem from "~/components/ui/servers/BackupItem.vue";
 
 const props = defineProps<{
-  server: Server<["general", "mods", "backups", "network", "startup", "ws", "fs"]>;
-  backupId: string;
-  backupName: string;
-  backupCreatedAt: string;
+  server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
 }>();
 
-const emit = defineEmits(["backupRestored"]);
-
 const modal = ref<InstanceType<typeof NewModal>>();
-const isRestoring = ref(false);
-const backupError = ref<string | null>(null);
+const currentBackup = ref<Backup | null>(null);
 
-const formattedDate = computed(() => {
-  return new Date(props.backupCreatedAt).toLocaleString("en-US", {
-    month: "numeric",
-    day: "numeric",
-    year: "2-digit",
-    hour: "numeric",
-    minute: "numeric",
-    hour12: true,
-  });
-});
-
-const hideModal = () => {
-  modal.value?.hide();
-};
+function show(backup: Backup) {
+  currentBackup.value = backup;
+  modal.value?.show();
+}
 
 const restoreBackup = async () => {
-  if (!props.backupId) {
-    emit("backupRestored", { success: false, message: "No backup selected" });
+  if (!currentBackup.value) {
+    addNotification({
+      type: "error",
+      title: "Failed to restore backup",
+      text: "Current backup is null",
+    });
     return;
   }
 
-  isRestoring.value = true;
   try {
-    await props.server.backups?.restore(props.backupId);
-    hideModal();
-    emit("backupRestored", { success: true, message: "Backup restored successfully" });
+    await props.server.backups?.restore(currentBackup.value.id);
   } catch (error) {
-    backupError.value = error instanceof Error ? error.message : String(error);
-    emit("backupRestored", { success: false, message: backupError.value });
-  } finally {
-    isRestoring.value = false;
+    const message = error instanceof Error ? error.message : String(error);
+    addNotification({ type: "error", title: "Failed to restore backup", text: message });
   }
 };
 
 defineExpose({
-  show: () => modal.value?.show(),
-  hide: hideModal,
+  show,
 });
 </script>
diff --git a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
index 8eb08a86..78ce7a27 100644
--- a/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
+++ b/apps/frontend/src/components/ui/servers/PanelServerActionButton.vue
@@ -42,6 +42,9 @@
         :column="true"
         class="mb-6 flex flex-col gap-2"
       />
+      <div v-if="flags.advancedDebugInfo" class="markdown-body">
+        <pre>{{ serverData }}</pre>
+      </div>
       <ButtonStyled type="standard" color="brand" @click="closeDetailsModal">
         <button class="w-full">Close</button>
       </ButtonStyled>
diff --git a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
index e81117e8..5c4ebc3d 100644
--- a/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformMrpackModal.vue
@@ -67,37 +67,27 @@
             Removes all data on your server, including your worlds, mods, and configuration files,
             then reinstalls it with the selected version.
           </div>
+          <div class="font-bold">This does not affect your backups, which are stored off-site.</div>
         </div>
 
-        <div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
-          <div class="flex w-full flex-row items-center justify-between">
-            <label class="w-full text-lg font-bold text-contrast" for="backup-server-mrpack">
-              Backup server
-            </label>
-            <input
-              id="backup-server-mrpack"
-              v-model="backupServer"
-              class="switch stylized-toggle shrink-0"
-              type="checkbox"
-            />
-          </div>
-          <div>Creates a backup of your server before proceeding.</div>
-        </div>
+        <BackupWarning :backup-link="`/servers/manage/${props.server?.serverId}/backups`" />
       </div>
       <div class="mt-4 flex justify-start gap-4">
         <ButtonStyled :color="isDangerous ? 'red' : 'brand'">
-          <button :disabled="canInstall" @click="handleReinstall">
+          <button
+            v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+            :disabled="canInstall || backupInProgress"
+            @click="handleReinstall"
+          >
             <RightArrowIcon />
             {{
-              isBackingUp
-                ? "Backing up..."
-                : isMrpackModalSecondPhase
-                  ? "Erase and install"
-                  : loadingServerCheck
-                    ? "Loading..."
-                    : isDangerous
-                      ? "Erase and install"
-                      : "Install"
+              isMrpackModalSecondPhase
+                ? "Erase and install"
+                : loadingServerCheck
+                  ? "Loading..."
+                  : isDangerous
+                    ? "Erase and install"
+                    : "Install"
             }}
           </button>
         </ButtonStyled>
@@ -124,12 +114,14 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled, NewModal } from "@modrinth/ui";
+import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
 import { UploadIcon, RightArrowIcon, XIcon, ServerIcon } from "@modrinth/assets";
 import type { Server } from "~/composables/pyroServers";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
 
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  backupInProgress?: BackupInProgressReason;
 }>();
 
 const emit = defineEmits<{
@@ -139,9 +131,7 @@ const emit = defineEmits<{
 const mrpackModal = ref();
 const isMrpackModalSecondPhase = ref(false);
 const hardReset = ref(false);
-const backupServer = ref(false);
 const isLoading = ref(false);
-const isBackingUp = ref(false);
 const loadingServerCheck = ref(false);
 const mrpackFile = ref<File | null>(null);
 
@@ -156,64 +146,12 @@ const uploadMrpack = (event: Event) => {
   mrpackFile.value = target.files[0];
 };
 
-const performBackup = async (): Promise<boolean> => {
-  try {
-    const date = new Date();
-    const format = date.toLocaleString(navigator.language || "en-US", {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-      hour: "numeric",
-      minute: "numeric",
-      second: "numeric",
-      timeZoneName: "short",
-    });
-    const backupName = `Reinstallation - ${format}`;
-    isLoading.value = true;
-    const backupId = await props.server.backups?.create(backupName);
-    isBackingUp.value = true;
-    let attempts = 0;
-    while (true) {
-      attempts++;
-      if (attempts > 100) {
-        addNotification({
-          group: "server",
-          title: "Backup Failed",
-          text: "An unexpected error occurred while backing up. Please try again later.",
-        });
-        return false;
-      }
-      await props.server.refresh(["backups"]);
-      const backups = await props.server.backups?.data;
-      const backup = backupId ? backups?.find((x) => x.id === backupId) : undefined;
-      if (backup && !backup.ongoing) {
-        isBackingUp.value = false;
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    }
-    return true;
-  } catch {
-    addNotification({
-      group: "server",
-      title: "Backup Failed",
-      text: "An unexpected error occurred while backing up. Please try again later.",
-    });
-    return false;
-  }
-};
-
 const handleReinstall = async () => {
-  if (hardReset.value && !backupServer.value && !isMrpackModalSecondPhase.value) {
+  if (hardReset.value && !isMrpackModalSecondPhase.value) {
     isMrpackModalSecondPhase.value = true;
     return;
   }
 
-  if (backupServer.value && !(await performBackup())) {
-    isLoading.value = false;
-    return;
-  }
-
   isLoading.value = true;
 
   try {
@@ -259,7 +197,6 @@ const handleReinstall = async () => {
 
 const onShow = () => {
   hardReset.value = false;
-  backupServer.value = false;
   isMrpackModalSecondPhase.value = false;
   loadingServerCheck.value = false;
   isLoading.value = false;
diff --git a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
index 55bd8b2d..6b3e1f24 100644
--- a/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
+++ b/apps/frontend/src/components/ui/servers/PlatformVersionSelectModal.vue
@@ -20,9 +20,7 @@
         }"
       >
         {{
-          backupServer
-            ? "A backup will be created before proceeding with the reinstallation, then all data will be erased from your server. Are you sure you want to continue?"
-            : "This will reinstall your server and erase all data. Are you sure you want to continue?"
+          "This will reinstall your server and erase all data. Are you sure you want to continue?"
         }}
       </p>
       <div v-if="!isSecondPhase" class="flex flex-col gap-4">
@@ -131,41 +129,28 @@
             Removes all data on your server, including your worlds, mods, and configuration files,
             then reinstalls it with the selected version.
           </div>
+          <div class="font-bold">This does not affect your backups, which are stored off-site.</div>
         </div>
 
-        <div class="flex w-full flex-col gap-2 rounded-2xl bg-table-alternateRow p-4">
-          <div class="flex w-full flex-row items-center justify-between">
-            <label class="w-full text-lg font-bold text-contrast" for="backup-server">
-              Backup server
-            </label>
-            <input
-              id="backup-server"
-              v-model="backupServer"
-              class="switch stylized-toggle shrink-0"
-              type="checkbox"
-            />
-          </div>
-          <div>
-            Creates a backup of your server before proceeding with the installation or
-            reinstallation.
-          </div>
-        </div>
+        <BackupWarning :backup-link="`/servers/manage/${props.server?.serverId}/backups`" />
       </div>
 
       <div class="mt-4 flex justify-start gap-4">
         <ButtonStyled :color="isDangerous ? 'red' : 'brand'">
-          <button :disabled="canInstall" @click="handleReinstall">
+          <button
+            v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+            :disabled="canInstall || !!backupInProgress"
+            @click="handleReinstall"
+          >
             <RightArrowIcon />
             {{
-              isBackingUp
-                ? "Backing up..."
-                : isLoading
-                  ? "Installing..."
-                  : isSecondPhase
-                    ? "Erase and install"
-                    : hardReset
-                      ? "Continue"
-                      : "Install"
+              isLoading
+                ? "Installing..."
+                : isSecondPhase
+                  ? "Erase and install"
+                  : hardReset
+                    ? "Continue"
+                    : "Install"
             }}
           </button>
         </ButtonStyled>
@@ -192,10 +177,13 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled, NewModal } from "@modrinth/ui";
+import { BackupWarning, ButtonStyled, NewModal } from "@modrinth/ui";
 import { RightArrowIcon, XIcon, ServerIcon, DropdownIcon } from "@modrinth/assets";
 import type { Server } from "~/composables/pyroServers";
 import type { Loaders } from "~/types/servers";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+
+const { formatMessage } = useVIntl();
 
 interface LoaderVersion {
   id: string;
@@ -213,6 +201,7 @@ type VersionCache = Record<string, any>;
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
   currentLoader: Loaders | undefined;
+  backupInProgress?: BackupInProgressReason;
 }>();
 
 const emit = defineEmits<{
@@ -222,9 +211,7 @@ const emit = defineEmits<{
 const versionSelectModal = ref();
 const isSecondPhase = ref(false);
 const hardReset = ref(false);
-const backupServer = ref(false);
 const isLoading = ref(false);
-const isBackingUp = ref(false);
 const loadingServerCheck = ref(false);
 const serverCheckError = ref("");
 
@@ -413,69 +400,12 @@ const canInstall = computed(() => {
   return conds || !selectedLoaderVersion.value;
 });
 
-const performBackup = async (): Promise<boolean> => {
-  try {
-    const date = new Date();
-    const format = date.toLocaleString(navigator.language || "en-US", {
-      month: "short",
-      day: "numeric",
-      year: "numeric",
-      hour: "numeric",
-      minute: "numeric",
-      second: "numeric",
-      timeZoneName: "short",
-    });
-    const backupName = `Reinstallation - ${format}`;
-    isLoading.value = true;
-    const backupId = await props.server.backups?.create(backupName);
-    isBackingUp.value = true;
-    let attempts = 0;
-    while (true) {
-      attempts++;
-      if (attempts > 100) {
-        addNotification({
-          group: "server",
-          title: "Backup Failed",
-          text: "An unexpected error occurred while backing up. Please try again later.",
-        });
-        return false;
-      }
-      await props.server.refresh(["backups"]);
-      const backups = await props.server.backups?.data;
-      const backup = backupId ? backups?.find((x) => x.id === backupId) : undefined;
-      if (backup && !backup.ongoing) {
-        isBackingUp.value = false;
-        break;
-      }
-      await new Promise((resolve) => setTimeout(resolve, 5000));
-    }
-    return true;
-  } catch {
-    addNotification({
-      group: "server",
-      title: "Backup Failed",
-      text: "An unexpected error occurred while backing up. Please try again later.",
-    });
-    return false;
-  }
-};
-
 const handleReinstall = async () => {
   if (hardReset.value && !isSecondPhase.value) {
     isSecondPhase.value = true;
     return;
   }
 
-  if (backupServer.value) {
-    isBackingUp.value = true;
-    if (!(await performBackup())) {
-      isBackingUp.value = false;
-      isLoading.value = false;
-      return;
-    }
-    isBackingUp.value = false;
-  }
-
   isLoading.value = true;
 
   try {
@@ -522,7 +452,6 @@ const onShow = () => {
 
 const onHide = () => {
   hardReset.value = false;
-  backupServer.value = false;
   isSecondPhase.value = false;
   serverCheckError.value = "";
   loadingServerCheck.value = false;
diff --git a/apps/frontend/src/components/ui/servers/ServerSidebar.vue b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
index 8c52c6c0..d287109f 100644
--- a/apps/frontend/src/components/ui/servers/ServerSidebar.vue
+++ b/apps/frontend/src/components/ui/servers/ServerSidebar.vue
@@ -21,7 +21,12 @@
     </div>
 
     <div class="h-full w-full">
-      <NuxtPage :route="props.route" :server="props.server" @reinstall="onReinstall" />
+      <NuxtPage
+        :route="route"
+        :server="server"
+        :backup-in-progress="backupInProgress"
+        @reinstall="onReinstall"
+      />
     </div>
   </div>
 </template>
@@ -30,13 +35,15 @@
 import { RightArrowIcon } from "@modrinth/assets";
 import type { RouteLocationNormalized } from "vue-router";
 import type { Server } from "~/composables/pyroServers";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
 
 const emit = defineEmits(["reinstall"]);
 
-const props = defineProps<{
+defineProps<{
   navLinks: { label: string; href: string; icon: Component; external?: boolean }[];
   route: RouteLocationNormalized;
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  backupInProgress?: BackupInProgressReason;
 }>();
 
 const onReinstall = (...args: any[]) => {
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index e6a93259..7832eb99 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -30,6 +30,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
   newProjectCards: false,
   projectBackground: false,
   searchBackground: false,
+  advancedDebugInfo: false,
   // advancedRendering: true,
   // externalLinksNewTab: true,
   // notUsingBlockers: false,
diff --git a/apps/frontend/src/composables/pyroServers.ts b/apps/frontend/src/composables/pyroServers.ts
index eb3d32a0..609c1390 100644
--- a/apps/frontend/src/composables/pyroServers.ts
+++ b/apps/frontend/src/composables/pyroServers.ts
@@ -1,6 +1,7 @@
 // usePyroServer is a composable that interfaces with the REDACTED API to get data and control the users server
 import { $fetch, FetchError } from "ofetch";
 import type { ServerNotice } from "@modrinth/utils";
+import type { WSBackupState, WSBackupTask } from "~/types/servers.ts";
 
 interface PyroFetchOptions {
   method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
@@ -193,7 +194,7 @@ async function PyroFetch<T>(
   throw lastError || new Error("Maximum retry attempts reached");
 }
 
-const internalServerRefrence = ref<any>(null);
+const internalServerReference = ref<any>(null);
 
 interface License {
   id: string;
@@ -291,6 +292,10 @@ interface General {
   sftp_host: string;
   datacenter?: string;
   notices?: ServerNotice[];
+  node: {
+    token: string;
+    instance: string;
+  };
 }
 
 interface Allocation {
@@ -317,12 +322,20 @@ export interface Mod {
   installing: boolean;
 }
 
-interface Backup {
+export interface Backup {
   id: string;
   name: string;
   created_at: string;
-  ongoing: boolean;
   locked: boolean;
+  automated: boolean;
+  interrupted: boolean;
+  ongoing: boolean;
+  task: {
+    [K in WSBackupTask]?: {
+      progress: number;
+      state: WSBackupState;
+    };
+  };
 }
 
 interface AutoBackupSettings {
@@ -370,7 +383,7 @@ const constructServerProperties = (properties: any): string => {
 
 const processImage = async (iconUrl: string | undefined) => {
   const sharedImage = useState<string | undefined>(
-    `server-icon-${internalServerRefrence.value.serverId}`,
+    `server-icon-${internalServerReference.value.serverId}`,
   );
 
   if (sharedImage.value) {
@@ -378,7 +391,7 @@ const processImage = async (iconUrl: string | undefined) => {
   }
 
   try {
-    const auth = await PyroFetch<JWTAuth>(`servers/${internalServerRefrence.value.serverId}/fs`);
+    const auth = await PyroFetch<JWTAuth>(`servers/${internalServerReference.value.serverId}/fs`);
     try {
       const fileData = await PyroFetch(`/download?path=/server-icon-original.png`, {
         override: auth,
@@ -465,13 +478,13 @@ const processImage = async (iconUrl: string | undefined) => {
 
 const sendPowerAction = async (action: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/power`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/power`, {
       method: "POST",
       body: { action },
     });
 
     await new Promise((resolve) => setTimeout(resolve, 1000));
-    await internalServerRefrence.value.refresh();
+    await internalServerReference.value.refresh();
   } catch (error) {
     console.error("Error changing power state:", error);
     throw error;
@@ -480,7 +493,7 @@ const sendPowerAction = async (action: string) => {
 
 const updateName = async (newName: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/name`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/name`, {
       method: "POST",
       body: { name: newName },
     });
@@ -524,7 +537,7 @@ const reinstallFromMrpack = async (mrpack: File, hardReset: boolean = false) =>
   const hardResetParam = hardReset ? "true" : "false";
   try {
     const auth = await PyroFetch<JWTAuth>(
-      `servers/${internalServerRefrence.value.serverId}/reinstallFromMrpack`,
+      `servers/${internalServerReference.value.serverId}/reinstallFromMrpack`,
     );
 
     const formData = new FormData();
@@ -553,7 +566,7 @@ const reinstallFromMrpack = async (mrpack: File, hardReset: boolean = false) =>
 
 const suspendServer = async (status: boolean) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/suspend`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/suspend`, {
       method: "POST",
       body: { suspended: status },
     });
@@ -565,7 +578,7 @@ const suspendServer = async (status: boolean) => {
 
 const fetchConfigFile = async (fileName: string) => {
   try {
-    return await PyroFetch(`servers/${internalServerRefrence.value.serverId}/config/${fileName}`);
+    return await PyroFetch(`servers/${internalServerReference.value.serverId}/config/${fileName}`);
   } catch (error) {
     console.error("Error fetching config file:", error);
     throw error;
@@ -596,7 +609,7 @@ const setMotd = async (motd: string) => {
       const newProps = constructServerProperties(props);
       const octetStream = new Blob([newProps], { type: "application/octet-stream" });
       const auth = await await PyroFetch<JWTAuth>(
-        `servers/${internalServerRefrence.value.serverId}/fs`,
+        `servers/${internalServerReference.value.serverId}/fs`,
       );
 
       return await PyroFetch(`/update?path=/server.properties`, {
@@ -615,7 +628,7 @@ const setMotd = async (motd: string) => {
 
 const installContent = async (contentType: ContentType, projectId: string, versionId: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/mods`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/mods`, {
       method: "POST",
       body: {
         rinth_ids: { project_id: projectId, version_id: versionId },
@@ -630,7 +643,7 @@ const installContent = async (contentType: ContentType, projectId: string, versi
 
 const removeContent = async (path: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/deleteMod`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/deleteMod`, {
       method: "POST",
       body: {
         path,
@@ -644,7 +657,7 @@ const removeContent = async (path: string) => {
 
 const reinstallContent = async (replace: string, projectId: string, versionId: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/mods/update`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/mods/update`, {
       method: "POST",
       body: { replace, project_id: projectId, version_id: versionId },
     });
@@ -659,13 +672,13 @@ const reinstallContent = async (replace: string, projectId: string, versionId: s
 const createBackup = async (backupName: string) => {
   try {
     const response = await PyroFetch<{ id: string }>(
-      `servers/${internalServerRefrence.value.serverId}/backups`,
+      `servers/${internalServerReference.value.serverId}/backups`,
       {
         method: "POST",
         body: { name: backupName },
       },
     );
-    await internalServerRefrence.value.refresh(["backups"]);
+    await internalServerReference.value.refresh(["backups"]);
     return response.id;
   } catch (error) {
     console.error("Error creating backup:", error);
@@ -675,11 +688,14 @@ const createBackup = async (backupName: string) => {
 
 const renameBackup = async (backupId: string, newName: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups/${backupId}/rename`, {
-      method: "POST",
-      body: { name: newName },
-    });
-    await internalServerRefrence.value.refresh(["backups"]);
+    await PyroFetch(
+      `servers/${internalServerReference.value.serverId}/backups/${backupId}/rename`,
+      {
+        method: "POST",
+        body: { name: newName },
+      },
+    );
+    await internalServerReference.value.refresh(["backups"]);
   } catch (error) {
     console.error("Error renaming backup:", error);
     throw error;
@@ -688,10 +704,10 @@ const renameBackup = async (backupId: string, newName: string) => {
 
 const deleteBackup = async (backupId: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups/${backupId}`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}`, {
       method: "DELETE",
     });
-    await internalServerRefrence.value.refresh(["backups"]);
+    await internalServerReference.value.refresh(["backups"]);
   } catch (error) {
     console.error("Error deleting backup:", error);
     throw error;
@@ -701,30 +717,35 @@ const deleteBackup = async (backupId: string) => {
 const restoreBackup = async (backupId: string) => {
   try {
     await PyroFetch(
-      `servers/${internalServerRefrence.value.serverId}/backups/${backupId}/restore`,
+      `servers/${internalServerReference.value.serverId}/backups/${backupId}/restore`,
       {
         method: "POST",
       },
     );
-    await internalServerRefrence.value.refresh(["backups"]);
+    await internalServerReference.value.refresh(["backups"]);
   } catch (error) {
     console.error("Error restoring backup:", error);
     throw error;
   }
 };
 
-const downloadBackup = async (backupId: string) => {
+const prepareBackup = async (backupId: string) => {
   try {
-    return await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups/${backupId}`);
+    await PyroFetch(
+      `servers/${internalServerReference.value.serverId}/backups/${backupId}/prepare-download`,
+      {
+        method: "POST",
+      },
+    );
   } catch (error) {
-    console.error("Error downloading backup:", error);
+    console.error("Error preparing backup:", error);
     throw error;
   }
 };
 
 const updateAutoBackup = async (autoBackup: "enable" | "disable", interval: number) => {
   try {
-    return await PyroFetch(`servers/${internalServerRefrence.value.serverId}/autobackup`, {
+    return await PyroFetch(`servers/${internalServerReference.value.serverId}/autobackup`, {
       method: "POST",
       body: { set: autoBackup, interval },
     });
@@ -736,7 +757,7 @@ const updateAutoBackup = async (autoBackup: "enable" | "disable", interval: numb
 
 const getAutoBackup = async () => {
   try {
-    return await PyroFetch(`servers/${internalServerRefrence.value.serverId}/autobackup`);
+    return await PyroFetch(`servers/${internalServerReference.value.serverId}/autobackup`);
   } catch (error) {
     console.error("Error getting auto backup settings:", error);
     throw error;
@@ -745,10 +766,10 @@ const getAutoBackup = async () => {
 
 const lockBackup = async (backupId: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups/${backupId}/lock`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}/lock`, {
       method: "POST",
     });
-    await internalServerRefrence.value.refresh(["backups"]);
+    await internalServerReference.value.refresh(["backups"]);
   } catch (error) {
     console.error("Error locking backup:", error);
     throw error;
@@ -757,22 +778,36 @@ const lockBackup = async (backupId: string) => {
 
 const unlockBackup = async (backupId: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/backups/${backupId}/unlock`, {
-      method: "POST",
-    });
-    await internalServerRefrence.value.refresh(["backups"]);
+    await PyroFetch(
+      `servers/${internalServerReference.value.serverId}/backups/${backupId}/unlock`,
+      {
+        method: "POST",
+      },
+    );
+    await internalServerReference.value.refresh(["backups"]);
   } catch (error) {
     console.error("Error unlocking backup:", error);
     throw error;
   }
 };
 
+const retryBackup = async (backupId: string) => {
+  try {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/backups/${backupId}/retry`, {
+      method: "POST",
+    });
+  } catch (error) {
+    console.error("Error retrying backup:", error);
+    throw error;
+  }
+};
+
 // ------------------ NETWORK ------------------ //
 
 const reserveAllocation = async (name: string): Promise<Allocation> => {
   try {
     return await PyroFetch<Allocation>(
-      `servers/${internalServerRefrence.value.serverId}/allocations?name=${name}`,
+      `servers/${internalServerReference.value.serverId}/allocations?name=${name}`,
       {
         method: "POST",
       },
@@ -786,7 +821,7 @@ const reserveAllocation = async (name: string): Promise<Allocation> => {
 const updateAllocation = async (port: number, name: string) => {
   try {
     await PyroFetch(
-      `servers/${internalServerRefrence.value.serverId}/allocations/${port}?name=${name}`,
+      `servers/${internalServerReference.value.serverId}/allocations/${port}?name=${name}`,
       {
         method: "PUT",
       },
@@ -799,7 +834,7 @@ const updateAllocation = async (port: number, name: string) => {
 
 const deleteAllocation = async (port: number) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/allocations/${port}`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/allocations/${port}`, {
       method: "DELETE",
     });
   } catch (error) {
@@ -819,7 +854,7 @@ const checkSubdomainAvailability = async (subdomain: string): Promise<{ availabl
 
 const changeSubdomain = async (subdomain: string) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/subdomain`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/subdomain`, {
       method: "POST",
       body: { subdomain },
     });
@@ -837,7 +872,7 @@ const updateStartupSettings = async (
   jdkBuild: "corretto" | "temurin" | "graal",
 ) => {
   try {
-    await PyroFetch(`servers/${internalServerRefrence.value.serverId}/startup`, {
+    await PyroFetch(`servers/${internalServerReference.value.serverId}/startup`, {
       method: "POST",
       body: {
         invocation: invocation || null,
@@ -858,7 +893,7 @@ const retryWithAuth = async (requestFn: () => Promise<any>) => {
     return await requestFn();
   } catch (error) {
     if (error instanceof PyroServersFetchError && error.statusCode === 401) {
-      await internalServerRefrence.value.refresh(["fs"]);
+      await internalServerReference.value.refresh(["fs"]);
       return await requestFn();
     }
 
@@ -870,7 +905,7 @@ const listDirContents = (path: string, page: number, pageSize: number) => {
   return retryWithAuth(async () => {
     const encodedPath = encodeURIComponent(path);
     return await PyroFetch(`/list?path=${encodedPath}&page=${page}&page_size=${pageSize}`, {
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
       retry: false,
     });
   });
@@ -882,7 +917,7 @@ const createFileOrFolder = (path: string, type: "file" | "directory") => {
     return await PyroFetch(`/create?path=${encodedPath}&type=${type}`, {
       method: "POST",
       contentType: "application/octet-stream",
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
     });
   });
 };
@@ -925,9 +960,12 @@ const uploadFile = (path: string, file: File) => {
 
       xhr.open(
         "POST",
-        `https://${internalServerRefrence.value.fs.auth.url}/create?path=${encodedPath}&type=file`,
+        `https://${internalServerReference.value.fs.auth.url}/create?path=${encodedPath}&type=file`,
+      );
+      xhr.setRequestHeader(
+        "Authorization",
+        `Bearer ${internalServerReference.value.fs.auth.token}`,
       );
-      xhr.setRequestHeader("Authorization", `Bearer ${internalServerRefrence.value.fs.auth.token}`);
       xhr.setRequestHeader("Content-Type", "application/octet-stream");
       xhr.send(file);
 
@@ -957,7 +995,7 @@ const renameFileOrFolder = (path: string, name: string) => {
   return retryWithAuth(async () => {
     await PyroFetch(`/move`, {
       method: "POST",
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
       body: {
         source: path,
         destination: pathName,
@@ -974,7 +1012,7 @@ const updateFile = (path: string, content: string) => {
       method: "PUT",
       contentType: "application/octet-stream",
       body: octetStream,
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
     });
   });
 };
@@ -1004,7 +1042,7 @@ const moveFileOrFolder = (path: string, newPath: string) => {
 
     return await PyroFetch(`/move`, {
       method: "POST",
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
       body: {
         source: path,
         destination: newPath,
@@ -1018,7 +1056,7 @@ const deleteFileOrFolder = (path: string, recursive: boolean) => {
   return retryWithAuth(async () => {
     return await PyroFetch(`/delete?path=${encodedPath}&recursive=${recursive}`, {
       method: "DELETE",
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
     });
   });
 };
@@ -1027,7 +1065,7 @@ const downloadFile = (path: string, raw?: boolean) => {
   return retryWithAuth(async () => {
     const encodedPath = encodeURIComponent(path);
     const fileData = await PyroFetch(`/download?path=${encodedPath}`, {
-      override: internalServerRefrence.value.fs.auth,
+      override: internalServerReference.value.fs.auth,
     });
 
     if (fileData instanceof Blob) {
@@ -1139,11 +1177,12 @@ const modules: any = {
     rename: renameBackup,
     delete: deleteBackup,
     restore: restoreBackup,
-    download: downloadBackup,
+    prepare: prepareBackup,
     updateAutoBackup,
     getAutoBackup,
     lock: lockBackup,
     unlock: unlockBackup,
+    retry: retryBackup,
   },
   network: {
     get: async (serverId: string) => {
@@ -1384,6 +1423,12 @@ type BackupFunctions = {
    */
   download: (backupId: string) => Promise<void>;
 
+  /**
+   * Prepare a backup for the server.
+   * @param backupId - The ID of the backup.
+   */
+  prepare: (backupId: string) => Promise<void>;
+
   /**
    * Updates the auto backup settings of the server.
    * @param autoBackup - Whether to enable auto backup.
@@ -1407,6 +1452,12 @@ type BackupFunctions = {
    * @param backupId - The ID of the backup.
    */
   unlock: (backupId: string) => Promise<void>;
+
+  /**
+   * Retries a failed backup for the server.
+   * @param backupId - The ID of the backup.
+   */
+  retry: (backupId: string) => Promise<void>;
 };
 
 type NetworkFunctions = {
@@ -1704,7 +1755,7 @@ export const usePyroServer = async (serverId: string, includedModules: avaliable
     server[module] = modules[module];
   });
 
-  internalServerRefrence.value = server;
+  internalServerReference.value = server;
   await server.refresh(initialModules);
 
   if (deferredModules.length > 0) {
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index 8bb4a520..a059cb77 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -959,6 +959,57 @@
   "search.filter.locked.server.sync": {
     "message": "Sync with server"
   },
+  "servers.backup.create.in-progress.tooltip": {
+    "message": "Backup creation in progress"
+  },
+  "servers.backup.restore.in-progress.tooltip": {
+    "message": "Backup restore in progress"
+  },
+  "servers.backups.item.already-preparing": {
+    "message": "Already preparing backup for download"
+  },
+  "servers.backups.item.automated": {
+    "message": "Automated"
+  },
+  "servers.backups.item.creating-backup": {
+    "message": "Creating backup..."
+  },
+  "servers.backups.item.failed-to-create-backup": {
+    "message": "Failed to create backup"
+  },
+  "servers.backups.item.failed-to-restore-backup": {
+    "message": "Failed to restore from backup"
+  },
+  "servers.backups.item.lock": {
+    "message": "Lock"
+  },
+  "servers.backups.item.locked": {
+    "message": "Locked"
+  },
+  "servers.backups.item.prepare-download": {
+    "message": "Prepare download"
+  },
+  "servers.backups.item.preparing-download": {
+    "message": "Preparing download..."
+  },
+  "servers.backups.item.queued-for-backup": {
+    "message": "Queued for backup"
+  },
+  "servers.backups.item.rename": {
+    "message": "Rename"
+  },
+  "servers.backups.item.restore": {
+    "message": "Restore"
+  },
+  "servers.backups.item.restoring-backup": {
+    "message": "Restoring from backup..."
+  },
+  "servers.backups.item.retry": {
+    "message": "Retry"
+  },
+  "servers.backups.item.unlock": {
+    "message": "Unlock"
+  },
   "servers.notice.actions": {
     "message": "Actions"
   },
diff --git a/apps/frontend/src/pages/servers/manage/[id].vue b/apps/frontend/src/pages/servers/manage/[id].vue
index 20397dc8..696788ce 100644
--- a/apps/frontend/src/pages/servers/manage/[id].vue
+++ b/apps/frontend/src/pages/servers/manage/[id].vue
@@ -1,401 +1,391 @@
 <template>
-  <div class="contents">
-    <div
-      v-if="filteredNotices.length > 0"
-      class="experimental-styles-within relative mx-auto flex w-full min-w-0 max-w-[1280px] flex-col gap-3 px-6"
-    >
-      <ServerNotice
-        v-for="notice in filteredNotices"
-        :key="`notice-${notice.id}`"
-        :level="notice.level"
-        :message="notice.message"
-        :dismissable="notice.dismissable"
-        :title="notice.title"
-        class="w-full"
-        @dismiss="() => dismissNotice(notice.id)"
-      />
-    </div>
-    <div
-      v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'upgrading'"
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-blue p-4">
-              <TransferIcon class="size-12 text-blue" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server upgrading</h1>
+  <div
+    v-if="filteredNotices.length > 0"
+    class="experimental-styles-within relative mx-auto flex w-full min-w-0 max-w-[1280px] flex-col gap-3 px-6"
+  >
+    <ServerNotice
+      v-for="notice in filteredNotices"
+      :key="`notice-${notice.id}`"
+      :level="notice.level"
+      :message="notice.message"
+      :dismissable="notice.dismissable"
+      :title="notice.title"
+      class="w-full"
+      @dismiss="() => dismissNotice(notice.id)"
+    />
+  </div>
+  <div
+    v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'upgrading'"
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-blue p-4">
+            <TransferIcon class="size-12 text-blue" />
           </div>
-          <p class="text-lg text-secondary">
-            Your server's hardware is currently being upgraded and will be back online shortly!
-          </p>
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server upgrading</h1>
         </div>
+        <p class="text-lg text-secondary">
+          Your server's hardware is currently being upgraded and will be back online shortly!
+        </p>
       </div>
     </div>
-    <div
-      v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'support'"
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-blue p-4">
-              <TransferIcon class="size-12 text-blue" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">We're working on your server</h1>
+  </div>
+  <div
+    v-if="serverData?.status === 'suspended' && serverData.suspension_reason === 'support'"
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-blue p-4">
+            <TransferIcon class="size-12 text-blue" />
           </div>
-          <p class="text-lg text-secondary">
-            You recently contacted Modrinth Support, and we're actively working on your server. It
-            will be back online shortly.
-          </p>
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">We're working on your server</h1>
         </div>
+        <p class="text-lg text-secondary">
+          You recently contacted Modrinth Support, and we're actively working on your server. It
+          will be back online shortly.
+        </p>
       </div>
     </div>
-    <div
-      v-else-if="serverData?.status === 'suspended' && serverData.suspension_reason !== 'upgrading'"
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-              <LockIcon class="size-12 text-orange" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server suspended</h1>
+  </div>
+  <div
+    v-else-if="serverData?.status === 'suspended' && serverData.suspension_reason !== 'upgrading'"
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
+            <LockIcon class="size-12 text-orange" />
           </div>
-          <p class="text-lg text-secondary">
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server suspended</h1>
+        </div>
+        <p class="text-lg text-secondary">
+          {{
+            serverData.suspension_reason === "cancelled"
+              ? "Your subscription has been cancelled."
+              : serverData.suspension_reason
+                ? `Your server has been suspended: ${serverData.suspension_reason}`
+                : "Your server has been suspended."
+          }}
+          <br />
+          Contact Modrinth support if you believe this is an error.
+        </p>
+      </div>
+      <ButtonStyled size="large" color="brand" @click="() => router.push('/settings/billing')">
+        <button class="mt-6 !w-full">Go to billing settings</button>
+      </ButtonStyled>
+    </div>
+  </div>
+  <div
+    v-else-if="
+      server.general?.error?.error.statusCode === 403 ||
+      server.general?.error?.error.statusCode === 404
+    "
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
+            <TransferIcon class="size-12 text-orange" />
+          </div>
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server not found</h1>
+        </div>
+        <p class="text-lg text-secondary">
+          You don't have permission to view this server or it no longer exists. If you believe this
+          is an error, please contact Modrinth support.
+        </p>
+      </div>
+      <UiCopyCode :text="JSON.stringify(server.general?.error)" />
+
+      <ButtonStyled size="large" color="brand" @click="() => router.push('/servers/manage')">
+        <button class="mt-6 !w-full">Go back to all servers</button>
+      </ButtonStyled>
+    </div>
+  </div>
+  <div
+    v-else-if="server.general?.error?.error.statusCode === 503"
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-red p-4">
+            <UiServersIconsPanelErrorIcon class="size-12 text-red" />
+          </div>
+          <h1 class="m-0 mb-4 w-fit text-4xl font-bold">Server Node Unavailable</h1>
+        </div>
+        <p class="m-0 mb-4 leading-[170%] text-secondary">
+          Your server's node, where your Modrinth Server is physically hosted, is experiencing
+          issues. We are working with our datacenter to resolve the issue as quickly as possible.
+        </p>
+        <p class="m-0 mb-4 leading-[170%] text-secondary">
+          Your data is safe and will not be lost, and your server will be back online as soon as the
+          issue is resolved.
+        </p>
+        <p class="m-0 mb-4 leading-[170%] text-secondary">
+          For updates, please join the Modrinth Discord or contact Modrinth Support via the chat
+          bubble in the bottom right corner and we'll be happy to help.
+        </p>
+
+        <div class="flex flex-col gap-2">
+          <UiCopyCode :text="'Server ID: ' + server.serverId" />
+          <UiCopyCode :text="'Node: ' + server.general?.datacenter" />
+        </div>
+      </div>
+      <ButtonStyled
+        size="large"
+        color="standard"
+        @click="
+          () =>
+            navigateTo('https://discord.modrinth.com', {
+              external: true,
+            })
+        "
+      >
+        <button class="mt-6 !w-full">Join Modrinth Discord</button>
+      </ButtonStyled>
+      <ButtonStyled
+        :disabled="formattedTime !== '00'"
+        size="large"
+        color="standard"
+        @click="() => reloadNuxtApp()"
+      >
+        <button class="mt-3 !w-full">Reload</button>
+      </ButtonStyled>
+    </div>
+  </div>
+  <div
+    v-else-if="server.general?.error"
+    class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
+            <TransferIcon class="size-12 text-orange" />
+          </div>
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Connection lost</h1>
+          <div class="text-center text-secondary">
             {{
-              serverData.suspension_reason === "cancelled"
-                ? "Your subscription has been cancelled."
-                : serverData.suspension_reason
-                  ? `Your server has been suspended: ${serverData.suspension_reason}`
-                  : "Your server has been suspended."
+              formattedTime == "00" ? "Reconnecting..." : `Retrying in ${formattedTime} seconds...`
             }}
-            <br />
-            Contact Modrinth support if you believe this is an error.
-          </p>
-        </div>
-        <ButtonStyled size="large" color="brand" @click="() => router.push('/settings/billing')">
-          <button class="mt-6 !w-full">Go to billing settings</button>
-        </ButtonStyled>
-      </div>
-    </div>
-    <div
-      v-else-if="
-        server.general?.error?.error.statusCode === 403 ||
-        server.general?.error?.error.statusCode === 404
-      "
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-              <TransferIcon class="size-12 text-orange" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Server not found</h1>
           </div>
-          <p class="text-lg text-secondary">
-            You don't have permission to view this server or it no longer exists. If you believe
-            this is an error, please contact Modrinth support.
-          </p>
         </div>
-        <UiCopyCode :text="JSON.stringify(server.general?.error)" />
+        <p class="text-lg text-secondary">
+          Something went wrong, and we couldn't connect to your server. This is likely due to a
+          temporary network issue. You'll be reconnected automatically.
+        </p>
+      </div>
+      <UiCopyCode :text="JSON.stringify(server.general?.error)" />
+      <ButtonStyled
+        :disabled="formattedTime !== '00'"
+        size="large"
+        color="brand"
+        @click="() => reloadNuxtApp()"
+      >
+        <button class="mt-6 !w-full">Reload</button>
+      </ButtonStyled>
+    </div>
+  </div>
+  <!-- SERVER START -->
+  <div
+    v-else-if="serverData"
+    data-pyro-server-manager-root
+    class="experimental-styles-within mobile-blurred-servericon relative mx-auto mb-6 box-border flex min-h-screen w-full min-w-0 max-w-[1280px] flex-col gap-6 px-6 transition-all duration-300"
+    :style="{
+      '--server-bg-image': serverData.image
+        ? `url(${serverData.image})`
+        : `linear-gradient(180deg, rgba(153,153,153,1) 0%, rgba(87,87,87,1) 100%)`,
+    }"
+  >
+    <div class="flex w-full min-w-0 select-none flex-col items-center gap-6 pt-4 sm:flex-row">
+      <UiServersServerIcon :image="serverData.image" class="drop-shadow-lg sm:drop-shadow-none" />
+      <div
+        class="flex min-w-0 flex-1 flex-col-reverse items-center gap-2 sm:flex-col sm:items-start"
+      >
+        <div class="hidden shrink-0 flex-row items-center gap-1 sm:flex">
+          <NuxtLink to="/servers/manage" class="breadcrumb goto-link flex w-fit items-center">
+            <LeftArrowIcon />
+            All servers
+          </NuxtLink>
+        </div>
+        <div class="flex w-full flex-col items-center gap-4 sm:flex-row">
+          <h1
+            class="m-0 w-screen flex-shrink gap-3 truncate px-3 text-center text-4xl font-bold text-contrast sm:w-full sm:p-0 sm:text-left"
+          >
+            {{ serverData.name }}
+          </h1>
+          <div
+            v-if="isConnected"
+            data-pyro-server-action-buttons
+            class="server-action-buttons-anim flex w-fit flex-shrink-0"
+          >
+            <UiServersPanelServerActionButton
+              class="flex-shrink-0"
+              :is-online="isServerRunning"
+              :is-actioning="isActioning"
+              :is-installing="serverData.status === 'installing'"
+              :disabled="isActioning || !!error"
+              :server-name="serverData.name"
+              :server-data="serverData"
+              :uptime-seconds="uptimeSeconds"
+              @action="sendPowerAction"
+            />
+          </div>
+        </div>
 
-        <ButtonStyled size="large" color="brand" @click="() => router.push('/servers/manage')">
-          <button class="mt-6 !w-full">Go back to all servers</button>
-        </ButtonStyled>
+        <UiServersServerInfoLabels
+          :server-data="serverData"
+          :show-game-label="showGameLabel"
+          :show-loader-label="showLoaderLabel"
+          :uptime-seconds="uptimeSeconds"
+          :linked="true"
+          class="server-action-buttons-anim flex min-w-0 flex-col flex-wrap items-center gap-4 text-secondary *:hidden sm:flex-row sm:*:flex"
+        />
       </div>
     </div>
-    <div
-      v-else-if="server.general?.error?.error.statusCode === 503"
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-red p-4">
-              <UiServersIconsPanelErrorIcon class="size-12 text-red" />
-            </div>
-            <h1 class="m-0 mb-4 w-fit text-4xl font-bold">Server Node Unavailable</h1>
-          </div>
-          <p class="m-0 mb-4 leading-[170%] text-secondary">
-            Your server's node, where your Modrinth Server is physically hosted, is experiencing
-            issues. We are working with our datacenter to resolve the issue as quickly as possible.
-          </p>
-          <p class="m-0 mb-4 leading-[170%] text-secondary">
-            Your data is safe and will not be lost, and your server will be back online as soon as
-            the issue is resolved.
-          </p>
-          <p class="m-0 mb-4 leading-[170%] text-secondary">
-            For updates, please join the Modrinth Discord or contact Modrinth Support via the chat
-            bubble in the bottom right corner and we'll be happy to help.
-          </p>
 
-          <div class="flex flex-col gap-2">
-            <UiCopyCode :text="'Server ID: ' + server.serverId" />
-            <UiCopyCode :text="'Node: ' + server.general?.datacenter" />
-          </div>
-        </div>
-        <ButtonStyled
-          size="large"
-          color="standard"
-          @click="
-            () =>
-              navigateTo('https://discord.modrinth.com', {
-                external: true,
-              })
-          "
-        >
-          <button class="mt-6 !w-full">Join Modrinth Discord</button>
-        </ButtonStyled>
-        <ButtonStyled
-          :disabled="formattedTime !== '00'"
-          size="large"
-          color="standard"
-          @click="() => reloadNuxtApp()"
-        >
-          <button class="mt-3 !w-full">Reload</button>
-        </ButtonStyled>
-      </div>
-    </div>
     <div
-      v-else-if="server.general?.error"
-      class="flex min-h-[calc(100vh-4rem)] items-center justify-center text-contrast"
+      data-pyro-navigation
+      class="isolate flex w-full select-none flex-col justify-between gap-4 overflow-auto md:flex-row md:items-center"
     >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-              <TransferIcon class="size-12 text-orange" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Connection lost</h1>
-            <div class="text-center text-secondary">
-              {{
-                formattedTime == "00"
-                  ? "Reconnecting..."
-                  : `Retrying in ${formattedTime} seconds...`
-              }}
-            </div>
-          </div>
-          <p class="text-lg text-secondary">
-            Something went wrong, and we couldn't connect to your server. This is likely due to a
-            temporary network issue. You'll be reconnected automatically.
-          </p>
-        </div>
-        <UiCopyCode :text="JSON.stringify(server.general?.error)" />
-        <ButtonStyled
-          :disabled="formattedTime !== '00'"
-          size="large"
-          color="brand"
-          @click="() => reloadNuxtApp()"
-        >
-          <button class="mt-6 !w-full">Reload</button>
-        </ButtonStyled>
-      </div>
+      <UiNavTabs :links="navLinks" />
     </div>
-    <!-- SERVER START -->
-    <div
-      v-else-if="serverData"
-      data-pyro-server-manager-root
-      class="experimental-styles-within mobile-blurred-servericon relative mx-auto box-border flex min-h-screen w-full min-w-0 max-w-[1280px] flex-col gap-6 px-6 transition-all duration-300"
-      :style="{
-        '--server-bg-image': serverData.image
-          ? `url(${serverData.image})`
-          : `linear-gradient(180deg, rgba(153,153,153,1) 0%, rgba(87,87,87,1) 100%)`,
-      }"
-    >
-      <div class="flex w-full min-w-0 select-none flex-col items-center gap-6 pt-4 sm:flex-row">
-        <UiServersServerIcon :image="serverData.image" class="drop-shadow-lg sm:drop-shadow-none" />
-        <div
-          class="flex min-w-0 flex-1 flex-col-reverse items-center gap-2 sm:flex-col sm:items-start"
-        >
-          <div class="hidden shrink-0 flex-row items-center gap-1 sm:flex">
-            <NuxtLink to="/servers/manage" class="breadcrumb goto-link flex w-fit items-center">
-              <LeftArrowIcon />
-              All servers
-            </NuxtLink>
-          </div>
-          <div class="flex w-full flex-col items-center gap-4 sm:flex-row">
-            <h1
-              class="m-0 w-screen flex-shrink gap-3 truncate px-3 text-center text-4xl font-bold text-contrast sm:w-full sm:p-0 sm:text-left"
-            >
-              {{ serverData.name }}
-            </h1>
-            <div
-              v-if="isConnected"
-              data-pyro-server-action-buttons
-              class="server-action-buttons-anim flex w-fit flex-shrink-0"
-            >
-              <UiServersPanelServerActionButton
-                class="flex-shrink-0"
-                :is-online="isServerRunning"
-                :is-actioning="isActioning"
-                :is-installing="serverData.status === 'installing'"
-                :disabled="isActioning || !!error"
-                :server-name="serverData.name"
-                :server-data="serverData"
-                :uptime-seconds="uptimeSeconds"
-                @action="sendPowerAction"
-              />
-            </div>
-          </div>
 
-          <UiServersServerInfoLabels
-            :server-data="serverData"
-            :show-game-label="showGameLabel"
-            :show-loader-label="showLoaderLabel"
-            :uptime-seconds="uptimeSeconds"
-            :linked="true"
-            class="server-action-buttons-anim flex min-w-0 flex-col flex-wrap items-center gap-4 text-secondary *:hidden sm:flex-row sm:*:flex"
-          />
+    <div data-pyro-mount class="h-full w-full flex-1">
+      <div
+        v-if="error"
+        class="mx-auto mb-4 flex justify-between gap-2 rounded-2xl border-2 border-solid border-red bg-bg-red p-4 font-semibold text-contrast"
+      >
+        <div class="flex flex-row gap-4">
+          <IssuesIcon class="hidden h-8 w-8 shrink-0 text-red sm:block" />
+          <div class="flex flex-col gap-2 leading-[150%]">
+            <div class="flex items-center gap-3">
+              <IssuesIcon class="flex h-8 w-8 shrink-0 text-red sm:hidden" />
+              <div class="flex gap-2 text-2xl font-bold">{{ errorTitle }}</div>
+            </div>
+
+            <div v-if="errorTitle.toLocaleLowerCase() === 'installation error'" class="font-normal">
+              <div
+                v-if="errorMessage.toLocaleLowerCase() === 'the specified version may be incorrect'"
+              >
+                An invalid loader or Minecraft version was specified and could not be installed.
+                <ul class="m-0 mt-4 p-0 pl-4">
+                  <li>
+                    If this version of Minecraft was released recently, please check if Modrinth
+                    Servers supports it.
+                  </li>
+                  <li>
+                    If you've installed a modpack, it may have been packaged incorrectly or may not
+                    be compatible with the loader.
+                  </li>
+                  <li>
+                    Your server may need to be reinstalled with a valid mod loader and version. You
+                    can change the loader by clicking the "Change Loader" button.
+                  </li>
+                  <li>
+                    If you're stuck, please contact Modrinth support with the information below:
+                  </li>
+                </ul>
+                <ButtonStyled>
+                  <button class="mt-2" @click="copyServerDebugInfo">
+                    <CopyIcon v-if="!copied" />
+                    <CheckIcon v-else />
+                    Copy Debug Info
+                  </button>
+                </ButtonStyled>
+              </div>
+              <div v-if="errorMessage.toLocaleLowerCase() === 'internal error'">
+                An internal error occurred while installing your server. Don't fret — try
+                reinstalling your server, and if the problem persists, please contact Modrinth
+                support with your server's debug information.
+              </div>
+              <div v-if="errorMessage.toLocaleLowerCase() === 'this version is not yet supported'">
+                An error occurred while installing your server because Modrinth Servers does not
+                support the version of Minecraft or the loader you specified. Try reinstalling your
+                server with a different version or loader, and if the problem persists, please
+                contact Modrinth support with your server's debug information.
+              </div>
+
+              <div
+                v-if="errorTitle === 'Installation error'"
+                class="mt-2 flex flex-col gap-4 sm:flex-row"
+              >
+                <ButtonStyled v-if="errorLog">
+                  <button @click="openInstallLog"><FileIcon />Open Installation Log</button>
+                </ButtonStyled>
+                <ButtonStyled>
+                  <button @click="copyServerDebugInfo">
+                    <CopyIcon v-if="!copied" />
+                    <CheckIcon v-else />
+                    Copy Debug Info
+                  </button>
+                </ButtonStyled>
+                <ButtonStyled color="red" type="standard">
+                  <NuxtLink
+                    class="whitespace-pre"
+                    :to="`/servers/manage/${serverId}/options/loader`"
+                  >
+                    <RightArrowIcon />
+                    Change Loader
+                  </NuxtLink>
+                </ButtonStyled>
+              </div>
+            </div>
+          </div>
         </div>
       </div>
 
       <div
-        data-pyro-navigation
-        class="isolate flex w-full select-none flex-col justify-between gap-4 overflow-auto md:flex-row md:items-center"
+        v-if="!isConnected && !isReconnecting && !isLoading"
+        data-pyro-server-ws-error
+        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-red p-4 text-contrast"
       >
-        <UiNavTabs :links="navLinks" />
+        <IssuesIcon class="size-5 text-red" />
+        Something went wrong...
       </div>
 
-      <div data-pyro-mount class="h-full w-full flex-1">
-        <div
-          v-if="error"
-          class="mx-auto mb-4 flex justify-between gap-2 rounded-2xl border-2 border-solid border-red bg-bg-red p-4 font-semibold text-contrast"
-        >
-          <div class="flex flex-row gap-4">
-            <IssuesIcon class="hidden h-8 w-8 shrink-0 text-red sm:block" />
-            <div class="flex flex-col gap-2 leading-[150%]">
-              <div class="flex items-center gap-3">
-                <IssuesIcon class="flex h-8 w-8 shrink-0 text-red sm:hidden" />
-                <div class="flex gap-2 text-2xl font-bold">{{ errorTitle }}</div>
-              </div>
-
-              <div
-                v-if="errorTitle.toLocaleLowerCase() === 'installation error'"
-                class="font-normal"
-              >
-                <div
-                  v-if="
-                    errorMessage.toLocaleLowerCase() === 'the specified version may be incorrect'
-                  "
-                >
-                  An invalid loader or Minecraft version was specified and could not be installed.
-                  <ul class="m-0 mt-4 p-0 pl-4">
-                    <li>
-                      If this version of Minecraft was released recently, please check if Modrinth
-                      Servers supports it.
-                    </li>
-                    <li>
-                      If you've installed a modpack, it may have been packaged incorrectly or may
-                      not be compatible with the loader.
-                    </li>
-                    <li>
-                      Your server may need to be reinstalled with a valid mod loader and version.
-                      You can change the loader by clicking the "Change Loader" button.
-                    </li>
-                    <li>
-                      If you're stuck, please contact Modrinth support with the information below:
-                    </li>
-                  </ul>
-                  <ButtonStyled>
-                    <button class="mt-2" @click="copyServerDebugInfo">
-                      <CopyIcon v-if="!copied" />
-                      <CheckIcon v-else />
-                      Copy Debug Info
-                    </button>
-                  </ButtonStyled>
-                </div>
-                <div v-if="errorMessage.toLocaleLowerCase() === 'internal error'">
-                  An internal error occurred while installing your server. Don't fret — try
-                  reinstalling your server, and if the problem persists, please contact Modrinth
-                  support with your server's debug information.
-                </div>
-                <div
-                  v-if="errorMessage.toLocaleLowerCase() === 'this version is not yet supported'"
-                >
-                  An error occurred while installing your server because Modrinth Servers does not
-                  support the version of Minecraft or the loader you specified. Try reinstalling
-                  your server with a different version or loader, and if the problem persists,
-                  please contact Modrinth support with your server's debug information.
-                </div>
-
-                <div
-                  v-if="errorTitle === 'Installation error'"
-                  class="mt-2 flex flex-col gap-4 sm:flex-row"
-                >
-                  <ButtonStyled v-if="errorLog">
-                    <button @click="openInstallLog"><FileIcon />Open Installation Log</button>
-                  </ButtonStyled>
-                  <ButtonStyled>
-                    <button @click="copyServerDebugInfo">
-                      <CopyIcon v-if="!copied" />
-                      <CheckIcon v-else />
-                      Copy Debug Info
-                    </button>
-                  </ButtonStyled>
-                  <ButtonStyled color="red" type="standard">
-                    <NuxtLink
-                      class="whitespace-pre"
-                      :to="`/servers/manage/${serverId}/options/loader`"
-                    >
-                      <RightArrowIcon />
-                      Change Loader
-                    </NuxtLink>
-                  </ButtonStyled>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <div
-          v-if="!isConnected && !isReconnecting && !isLoading"
-          data-pyro-server-ws-error
-          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-red p-4 text-contrast"
-        >
-          <IssuesIcon class="size-5 text-red" />
-          Something went wrong...
-        </div>
-
-        <div
-          v-if="isReconnecting"
-          data-pyro-server-ws-reconnecting
-          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-orange p-4 text-sm text-contrast"
-        >
-          <UiServersPanelSpinner />
-          Hang on, we're reconnecting to your server.
-        </div>
-
-        <div
-          v-if="serverData.status === 'installing'"
-          data-pyro-server-installing
-          class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-blue p-4 text-sm text-contrast"
-        >
-          <UiServersServerIcon :image="serverData.image" class="!h-10 !w-10" />
-
-          <div class="flex flex-col gap-1">
-            <span class="text-lg font-bold"> We're preparing your server! </span>
-            <div class="flex flex-row items-center gap-2">
-              <UiServersPanelSpinner class="!h-3 !w-3" /> <LazyUiServersInstallingTicker />
-            </div>
-          </div>
-        </div>
-        <NuxtPage
-          :route="route"
-          :is-connected="isConnected"
-          :is-ws-auth-incorrect="isWSAuthIncorrect"
-          :is-server-running="isServerRunning"
-          :stats="stats"
-          :server-power-state="serverPowerState"
-          :power-state-details="powerStateDetails"
-          :socket="socket"
-          :server="server"
-          @reinstall="onReinstall"
-        />
+      <div
+        v-if="isReconnecting"
+        data-pyro-server-ws-reconnecting
+        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-orange p-4 text-sm text-contrast"
+      >
+        <UiServersPanelSpinner />
+        Hang on, we're reconnecting to your server.
       </div>
+
+      <div
+        v-if="serverData.status === 'installing'"
+        data-pyro-server-installing
+        class="mb-4 flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-blue p-4 text-sm text-contrast"
+      >
+        <UiServersServerIcon :image="serverData.image" class="!h-10 !w-10" />
+
+        <div class="flex flex-col gap-1">
+          <span class="text-lg font-bold"> We're preparing your server! </span>
+          <div class="flex flex-row items-center gap-2">
+            <UiServersPanelSpinner class="!h-3 !w-3" /> <LazyUiServersInstallingTicker />
+          </div>
+        </div>
+      </div>
+      <NuxtPage
+        :route="route"
+        :is-connected="isConnected"
+        :is-ws-auth-incorrect="isWSAuthIncorrect"
+        :is-server-running="isServerRunning"
+        :stats="stats"
+        :server-power-state="serverPowerState"
+        :power-state-details="powerStateDetails"
+        :socket="socket"
+        :server="server"
+        :backup-in-progress="backupInProgress"
+        @reinstall="onReinstall"
+      />
     </div>
   </div>
 </template>
@@ -416,8 +406,10 @@ import DOMPurify from "dompurify";
 import { ButtonStyled, ServerNotice } from "@modrinth/ui";
 import { Intercom, shutdown } from "@intercom/messenger-js-sdk";
 import { reloadNuxtApp, navigateTo } from "#app";
+import type { MessageDescriptor } from "@vintl/vintl";
 import type { ServerState, Stats, WSEvent, WSInstallationResultEvent } from "~/types/servers";
 import { usePyroConsole } from "~/store/console.ts";
+import { type Backup } from "~/composables/pyroServers.ts";
 import { usePyroFetch } from "~/composables/pyroFetch.ts";
 
 const app = useNuxtApp() as unknown as { $notify: any };
@@ -770,6 +762,31 @@ const handleWebSocketMessage = (data: WSEvent) => {
       uptimeSeconds.value = data.uptime;
       startUptimeUpdates();
       break;
+    case "backup-progress": {
+      // Update a backup's state
+      const curBackup = server.backups?.data.find((backup) => backup.id === data.id);
+
+      if (!curBackup) {
+        console.log(`Ignoring backup-progress event for unknown backup: ${data.id}`);
+      } else {
+        console.log(
+          `Handling backup progress for ${curBackup.name} (${data.id}) task: ${data.task} state: ${data.state} progress: ${data.progress}`,
+        );
+
+        if (!curBackup.task) {
+          curBackup.task = {};
+        }
+
+        curBackup.task[data.task] = {
+          progress: data.progress,
+          state: data.state,
+        };
+
+        curBackup.ongoing = data.task === "create" && data.state === "ongoing";
+      }
+
+      break;
+    }
     default:
       console.warn("Unhandled WebSocket event:", data);
   }
@@ -968,6 +985,41 @@ const formattedTime = computed(() => {
   return `${seconds.toString().padStart(2, "0")}`;
 });
 
+export type BackupInProgressReason = {
+  type: string;
+  tooltip: MessageDescriptor;
+};
+
+const RestoreInProgressReason = {
+  type: "restore",
+  tooltip: defineMessage({
+    id: "servers.backup.restore.in-progress.tooltip",
+    defaultMessage: "Backup restore in progress",
+  }),
+} satisfies BackupInProgressReason;
+
+const CreateInProgressReason = {
+  type: "create",
+  tooltip: defineMessage({
+    id: "servers.backup.create.in-progress.tooltip",
+    defaultMessage: "Backup creation in progress",
+  }),
+} satisfies BackupInProgressReason;
+
+const backupInProgress = computed(() => {
+  const backups = server.backups?.data;
+  if (!backups) {
+    return undefined;
+  }
+  if (backups.find((backup: Backup) => backup?.task?.create?.state === "ongoing")) {
+    return CreateInProgressReason;
+  }
+  if (backups.find((backup: Backup) => backup?.task?.restore?.state === "ongoing")) {
+    return RestoreInProgressReason;
+  }
+  return undefined;
+});
+
 const stopPolling = () => {
   if (intervalId) {
     clearInterval(intervalId);
diff --git a/apps/frontend/src/pages/servers/manage/[id]/backups.vue b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
index 5f31ff00..9210cc65 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/backups.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/backups.vue
@@ -1,248 +1,147 @@
 <template>
-  <div class="contents">
-    <div
-      v-if="server.backups?.error"
-      class="flex w-full flex-col items-center justify-center gap-4 p-4"
-    >
-      <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
-        <div class="flex flex-col items-center text-center">
-          <div class="flex flex-col items-center gap-4">
-            <div class="grid place-content-center rounded-full bg-bg-orange p-4">
-              <IssuesIcon class="size-12 text-orange" />
-            </div>
-            <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Failed to load backups</h1>
+  <div
+    v-if="server.backups?.error"
+    class="flex w-full flex-col items-center justify-center gap-4 p-4"
+  >
+    <div class="flex max-w-lg flex-col items-center rounded-3xl bg-bg-raised p-6 shadow-xl">
+      <div class="flex flex-col items-center text-center">
+        <div class="flex flex-col items-center gap-4">
+          <div class="grid place-content-center rounded-full bg-bg-orange p-4">
+            <IssuesIcon class="size-12 text-orange" />
           </div>
-          <p class="text-lg text-secondary">
-            We couldn't load your server's backups. Here's what went wrong:
-          </p>
-          <p>
-            <span class="break-all font-mono">{{ JSON.stringify(server.backups.error) }}</span>
-          </p>
-          <ButtonStyled size="large" color="brand" @click="() => server.refresh(['backups'])">
-            <button class="mt-6 !w-full">Retry</button>
-          </ButtonStyled>
+          <h1 class="m-0 mb-2 w-fit text-4xl font-bold">Failed to load backups</h1>
         </div>
+        <p class="text-lg text-secondary">
+          We couldn't load your server's backups. Here's what went wrong:
+        </p>
+        <p>
+          <span class="break-all font-mono">{{ JSON.stringify(server.backups.error) }}</span>
+        </p>
+        <ButtonStyled size="large" color="brand" @click="() => server.refresh(['backups'])">
+          <button class="mt-6 !w-full">Retry</button>
+        </ButtonStyled>
       </div>
     </div>
-    <div v-else-if="data" class="contents">
-      <LazyUiServersBackupCreateModal
-        ref="createBackupModal"
-        :server="server"
-        @backup-created="handleBackupCreated"
-      />
-      <LazyUiServersBackupRenameModal
-        ref="renameBackupModal"
-        :server="server"
-        :current-backup-id="currentBackup"
-        :backup-name="renameBackupName"
-        @backup-renamed="handleBackupRenamed"
-      />
-      <LazyUiServersBackupRestoreModal
-        ref="restoreBackupModal"
-        :server="server"
-        :backup-id="currentBackup"
-        :backup-name="currentBackupDetails?.name ?? ''"
-        :backup-created-at="currentBackupDetails?.created_at ?? ''"
-        @backup-restored="handleBackupRestored"
-      />
-      <LazyUiServersBackupDeleteModal
-        ref="deleteBackupModal"
-        :server="server"
-        :backup-id="currentBackup"
-        :backup-name="currentBackupDetails?.name ?? ''"
-        :backup-created-at="currentBackupDetails?.created_at ?? ''"
-        @backup-deleted="handleBackupDeleted"
-      />
+  </div>
+  <div v-else-if="data" class="contents">
+    <BackupCreateModal ref="createBackupModal" :server="server" />
+    <BackupRenameModal ref="renameBackupModal" :server="server" />
+    <BackupRestoreModal ref="restoreBackupModal" :server="server" />
+    <BackupDeleteModal ref="deleteBackupModal" :server="server" @delete="deleteBackup" />
+    <BackupSettingsModal ref="backupSettingsModal" :server="server" />
 
-      <LazyUiServersBackupSettingsModal ref="backupSettingsModal" :server="server" />
-
-      <ul class="m-0 flex list-none flex-col gap-4 p-0">
-        <div class="relative w-full overflow-hidden rounded-2xl bg-bg-raised p-6 shadow-md">
-          <div class="flex flex-col items-center justify-between gap-4 sm:flex-row sm:gap-0">
-            <div class="flex flex-col items-baseline gap-2">
-              <div class="text-2xl font-bold text-contrast">
-                {{
-                  data.used_backup_quota === 0
-                    ? "No backups"
-                    : `You've created ${data.used_backup_quota} backup${data.used_backup_quota === 1 ? "" : "s"}`
-                }}
-              </div>
-              <div>
-                {{
-                  data.backup_quota - data.used_backup_quota === 0
-                    ? "You have reached your backup limit. Consider removing old backups to create new ones."
-                    : `You can create ${data.backup_quota - data.used_backup_quota} more backups for your server.`
-                }}
-              </div>
-            </div>
-            <div class="flex w-full flex-col gap-2 sm:w-fit sm:flex-row">
-              <ButtonStyled type="standard">
-                <button
-                  :disabled="server.general?.status === 'installing'"
-                  @click="showbackupSettingsModal"
-                >
-                  <SettingsIcon class="h-5 w-5" />
-                  Auto backups
-                </button>
-              </ButtonStyled>
-              <ButtonStyled type="standard" color="brand">
-                <button
-                  v-tooltip="
-                    isServerRunning && !userPreferences.backupWhileRunning
-                      ? 'Cannot create backup while server is running. You can disable this from your server Options > Preferences.'
-                      : server.general?.status === 'installing'
-                        ? 'Cannot create backups while server is being installed'
-                        : ''
-                  "
-                  class="w-full sm:w-fit"
-                  :disabled="
-                    (isServerRunning && !userPreferences.backupWhileRunning) ||
-                    data.used_backup_quota >= data.backup_quota ||
-                    backups.some((backup) => backup.ongoing) ||
-                    server.general?.status === 'installing'
-                  "
-                  @click="showCreateModel"
-                >
-                  <PlusIcon class="h-5 w-5" />
-                  Create backup
-                </button>
-              </ButtonStyled>
-            </div>
-          </div>
-        </div>
-
-        <div
-          v-if="backups.some((backup) => backup.ongoing)"
-          data-pyro-server-backup-ongoing
-          class="flex w-full flex-row items-center gap-4 rounded-2xl bg-bg-orange p-4 text-contrast"
-        >
-          A backup is currently being created. This may take a few minutes. This page will
-          automatically refresh when the backup is complete.
-        </div>
-
-        <div class="flex w-full flex-col gap-2">
-          <li
-            v-for="(backup, index) in backups"
-            :key="backup.id"
-            class="relative m-0 w-full list-none rounded-2xl bg-bg-raised p-2 shadow-md"
+    <div class="mb-6 flex flex-col items-center justify-between gap-4 sm:flex-row">
+      <div class="flex flex-col gap-2">
+        <div class="flex items-center gap-2">
+          <h1 class="m-0 text-2xl font-extrabold text-contrast">Backups</h1>
+          <TagItem
+            v-tooltip="`${data.backup_quota - data.used_backup_quota} backup slots remaining`"
+            class="cursor-help"
+            :style="{
+              '--_color':
+                data.backup_quota <= data.used_backup_quota
+                  ? 'var(--color-red)'
+                  : data.backup_quota - data.used_backup_quota <= 3
+                    ? 'var(--color-orange)'
+                    : undefined,
+              '--_bg-color':
+                data.backup_quota <= data.used_backup_quota
+                  ? 'var(--color-red-bg)'
+                  : data.backup_quota - data.used_backup_quota <= 3
+                    ? 'var(--color-orange-bg)'
+                    : undefined,
+            }"
           >
-            <div class="flex flex-col gap-4">
-              <div class="flex items-center justify-between">
-                <div class="flex min-w-0 flex-row items-center gap-4">
-                  <div
-                    class="grid size-14 shrink-0 place-content-center overflow-hidden rounded-xl border-[1px] border-solid border-button-border shadow-sm"
-                    :class="backup.ongoing ? 'text-green [&&]:bg-bg-green' : 'bg-button-bg'"
-                  >
-                    <UiServersIconsLoadingIcon
-                      v-if="backup.ongoing"
-                      v-tooltip="'Backup in progress'"
-                      class="size-6 animate-spin"
-                    />
-                    <LockIcon v-else-if="backup.locked" class="size-8" />
-                    <BoxIcon v-else class="size-8" />
-                  </div>
-                  <div class="flex min-w-0 flex-col gap-2">
-                    <div class="flex min-w-0 flex-col gap-2 sm:flex-row sm:items-center">
-                      <div class="max-w-full truncate font-bold text-contrast">
-                        {{ backup.name }}
-                      </div>
-
-                      <div
-                        v-if="index == 0"
-                        class="hidden items-center gap-1 rounded-full bg-bg-green p-1 px-1.5 text-xs font-semibold text-brand sm:flex"
-                      >
-                        <CheckIcon class="size-4" /> Latest
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-1 text-xs">
-                      <CalendarIcon class="size-4" />
-                      {{
-                        new Date(backup.created_at).toLocaleString("en-US", {
-                          month: "numeric",
-                          day: "numeric",
-                          year: "2-digit",
-                          hour: "numeric",
-                          minute: "numeric",
-                          hour12: true,
-                        })
-                      }}
-                    </div>
-                  </div>
-                </div>
-                <ButtonStyled v-if="!backup.ongoing" circular type="transparent">
-                  <UiServersTeleportOverflowMenu
-                    direction="left"
-                    position="bottom"
-                    class="bg-transparent"
-                    :disabled="backups.some((b) => b.ongoing)"
-                    :options="[
-                      {
-                        id: 'rename',
-                        action: () => {
-                          renameBackupName = backup.name;
-                          currentBackup = backup.id;
-                          renameBackupModal?.show();
-                        },
-                      },
-                      {
-                        id: 'restore',
-                        action: () => {
-                          currentBackup = backup.id;
-                          restoreBackupModal?.show();
-                        },
-                      },
-                      { id: 'download', action: () => initiateDownload(backup.id) },
-                      {
-                        id: 'lock',
-                        action: () => {
-                          if (backup.locked) {
-                            unlockBackup(backup.id);
-                          } else {
-                            lockBackup(backup.id);
-                          }
-                        },
-                      },
-                      {
-                        id: 'delete',
-                        action: () => {
-                          currentBackup = backup.id;
-                          deleteBackupModal?.show();
-                        },
-                        color: 'red',
-                      },
-                    ]"
-                  >
-                    <MoreHorizontalIcon class="h-5 w-5 bg-transparent" />
-                    <template #rename> <EditIcon /> Rename </template>
-                    <template #restore> <ClipboardCopyIcon /> Restore </template>
-                    <template v-if="backup.locked" #lock> <LockOpenIcon /> Unlock </template>
-                    <template v-else #lock> <LockIcon /> Lock </template>
-                    <template #download> <DownloadIcon /> Download </template>
-                    <template #delete> <TrashIcon /> Delete </template>
-                  </UiServersTeleportOverflowMenu>
-                </ButtonStyled>
-              </div>
-            </div>
-          </li>
+            {{ data.used_backup_quota }} / {{ data.backup_quota }}
+          </TagItem>
         </div>
-      </ul>
-
+        <p class="m-0">
+          You can have up to {{ data.backup_quota }} backups at once, securely off-site with
+          Backblaze.
+        </p>
+      </div>
       <div
-        class="over-the-top-download-animation"
-        :class="{ 'animation-hidden': !overTheTopDownloadAnimation }"
+        class="grid w-full grid-cols-[repeat(auto-fit,_minmax(180px,1fr))] gap-2 sm:flex sm:w-fit sm:flex-row"
       >
-        <div>
-          <div
-            class="animation-ring-3 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-40"
-          ></div>
-          <div
-            class="animation-ring-2 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-60"
-          ></div>
-          <div
-            class="animation-ring-1 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight"
+        <ButtonStyled type="standard">
+          <button
+            v-tooltip="
+              'Auto backups are currently unavailable; we apologize for the inconvenience.'
+            "
+            :disabled="true || server.general?.status === 'installing'"
+            @click="showbackupSettingsModal"
           >
-            <DownloadIcon class="h-20 w-20 text-contrast" />
-          </div>
+            <SettingsIcon class="h-5 w-5" />
+            Auto backups
+          </button>
+        </ButtonStyled>
+        <ButtonStyled type="standard" color="brand">
+          <button
+            v-tooltip="backupCreationDisabled"
+            class="w-full sm:w-fit"
+            :disabled="!!backupCreationDisabled"
+            @click="showCreateModel"
+          >
+            <PlusIcon class="h-5 w-5" />
+            Create backup
+          </button>
+        </ButtonStyled>
+      </div>
+    </div>
+
+    <div class="flex w-full flex-col gap-2">
+      <div
+        v-if="backups.length === 0"
+        class="mt-6 flex items-center justify-center gap-2 text-center text-secondary"
+      >
+        <template v-if="data.used_backup_quota">
+          <SpinnerIcon class="animate-spin" />
+          Loading backups...
+        </template>
+        <template v-else> You don't have any backups yet. </template>
+      </div>
+      <BackupItem
+        v-for="backup in backups"
+        :key="`backup-${backup.id}`"
+        :backup="backup"
+        :kyros-url="props.server.general?.node.instance"
+        :jwt="props.server.general?.node.token"
+        @prepare="() => prepareDownload(backup.id)"
+        @download="() => triggerDownloadAnimation()"
+        @rename="() => renameBackupModal?.show(backup)"
+        @restore="() => restoreBackupModal?.show(backup)"
+        @lock="
+          () => {
+            if (backup.locked) {
+              unlockBackup(backup.id);
+            } else {
+              lockBackup(backup.id);
+            }
+          }
+        "
+        @delete="
+          (skipConfirmation?: boolean) =>
+            !skipConfirmation ? deleteBackup(backup) : deleteBackupModal?.show(backup)
+        "
+        @retry="() => retryBackup(backup.id)"
+      />
+    </div>
+
+    <div
+      class="over-the-top-download-animation"
+      :class="{ 'animation-hidden': !overTheTopDownloadAnimation }"
+    >
+      <div>
+        <div
+          class="animation-ring-3 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-40"
+        ></div>
+        <div
+          class="animation-ring-2 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight opacity-60"
+        ></div>
+        <div
+          class="animation-ring-1 flex items-center justify-center rounded-full border-4 border-solid border-brand bg-brand-highlight"
+        >
+          <DownloadIcon class="h-20 w-20 text-contrast" />
         </div>
       </div>
     </div>
@@ -250,25 +149,17 @@
 </template>
 
 <script setup lang="ts">
-import { ButtonStyled, NewModal } from "@modrinth/ui";
+import { ButtonStyled, TagItem } from "@modrinth/ui";
 import { useStorage } from "@vueuse/core";
-import {
-  PlusIcon,
-  CheckIcon,
-  CalendarIcon,
-  MoreHorizontalIcon,
-  EditIcon,
-  ClipboardCopyIcon,
-  DownloadIcon,
-  TrashIcon,
-  SettingsIcon,
-  BoxIcon,
-  LockIcon,
-  LockOpenIcon,
-  IssuesIcon,
-} from "@modrinth/assets";
+import { SpinnerIcon, PlusIcon, DownloadIcon, SettingsIcon, IssuesIcon } from "@modrinth/assets";
 import { ref, computed } from "vue";
 import type { Server } from "~/composables/pyroServers";
+import BackupItem from "~/components/ui/servers/BackupItem.vue";
+import BackupRenameModal from "~/components/ui/servers/BackupRenameModal.vue";
+import BackupCreateModal from "~/components/ui/servers/BackupCreateModal.vue";
+import BackupRestoreModal from "~/components/ui/servers/BackupRestoreModal.vue";
+import BackupDeleteModal from "~/components/ui/servers/BackupDeleteModal.vue";
+import BackupSettingsModal from "~/components/ui/servers/BackupSettingsModal.vue";
 
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
@@ -299,19 +190,30 @@ useHead({
 
 const overTheTopDownloadAnimation = ref();
 
-const createBackupModal = ref<typeof NewModal>();
-const renameBackupModal = ref<typeof NewModal>();
-const restoreBackupModal = ref<typeof NewModal>();
-const deleteBackupModal = ref<typeof NewModal>();
-const backupSettingsModal = ref<typeof NewModal>();
+const createBackupModal = ref<InstanceType<typeof BackupCreateModal>>();
+const renameBackupModal = ref<InstanceType<typeof BackupRenameModal>>();
+const restoreBackupModal = ref<InstanceType<typeof BackupRestoreModal>>();
+const deleteBackupModal = ref<InstanceType<typeof BackupDeleteModal>>();
+const backupSettingsModal = ref<InstanceType<typeof BackupSettingsModal>>();
 
-const renameBackupName = ref("");
-const currentBackup = ref("");
-
-const refreshInterval = ref<ReturnType<typeof setInterval>>();
-
-const currentBackupDetails = computed(() => {
-  return backups.value.find((backup) => backup.id === currentBackup.value);
+const backupCreationDisabled = computed(() => {
+  if (props.isServerRunning && !userPreferences.value.backupWhileRunning) {
+    return "Cannot create backup while server is running";
+  }
+  if (
+    data.value?.used_backup_quota !== undefined &&
+    data.value?.backup_quota !== undefined &&
+    data.value?.used_backup_quota >= data.value?.backup_quota
+  ) {
+    return `All ${data.value.backup_quota} of your backup slots are in use`;
+  }
+  if (backups.value.some((backup) => backup.task?.create?.state === "ongoing")) {
+    return "A backup is already in progress";
+  }
+  if (props.server.general?.status === "installing") {
+    return "Cannot create backup while server is installing";
+  }
+  return undefined;
 });
 
 const showCreateModel = () => {
@@ -322,69 +224,17 @@ const showbackupSettingsModal = () => {
   backupSettingsModal.value?.show();
 };
 
-const handleBackupCreated = async (payload: { success: boolean; message: string }) => {
-  if (payload.success) {
-    addNotification({ type: "success", text: payload.message });
-    await props.server.refresh(["backups"]);
-  } else {
-    addNotification({ type: "error", text: payload.message });
-  }
-};
-
-const handleBackupRenamed = async (payload: { success: boolean; message: string }) => {
-  if (payload.success) {
-    addNotification({ type: "success", text: payload.message });
-    await props.server.refresh(["backups"]);
-  } else {
-    addNotification({ type: "error", text: payload.message });
-  }
-};
-
-const handleBackupRestored = async (payload: { success: boolean; message: string }) => {
-  if (payload.success) {
-    addNotification({ type: "success", text: payload.message });
-    await props.server.refresh(["backups"]);
-  } else {
-    addNotification({ type: "error", text: payload.message });
-  }
-};
-
-const handleBackupDeleted = async (payload: { success: boolean; message: string }) => {
-  if (payload.success) {
-    addNotification({ type: "success", text: payload.message });
-    await props.server.refresh(["backups"]);
-  } else {
-    addNotification({ type: "error", text: payload.message });
-  }
-};
-
 function triggerDownloadAnimation() {
   overTheTopDownloadAnimation.value = true;
   setTimeout(() => (overTheTopDownloadAnimation.value = false), 500);
 }
 
-const initiateDownload = async (backupId: string) => {
-  triggerDownloadAnimation();
-
+const prepareDownload = async (backupId: string) => {
   try {
-    const downloadurl: any = await props.server.backups?.download(backupId);
-    if (!downloadurl || !downloadurl.download_url) {
-      throw new Error("Invalid download URL.");
-    }
-
-    let finalDownloadUrl: string = downloadurl.download_url;
-
-    if (!/^https?:\/\//i.test(finalDownloadUrl)) {
-      finalDownloadUrl = `https://${finalDownloadUrl.startsWith("/") ? finalDownloadUrl.substring(1) : finalDownloadUrl}`;
-    }
-
-    const a = document.createElement("a");
-    a.href = finalDownloadUrl;
-    a.setAttribute("download", "");
-    a.click();
-    a.remove();
+    await props.server.backups?.prepare(backupId);
   } catch (error) {
-    console.error("Download failed:", error);
+    console.error("Failed to prepare download:", error);
+    addNotification({ type: "error", title: "Failed to prepare backup for download", text: error });
   }
 };
 
@@ -406,28 +256,37 @@ const unlockBackup = async (backupId: string) => {
   }
 };
 
-onMounted(() => {
-  watchEffect(() => {
-    const hasOngoingBackups = backups.value.some((backup) => backup.ongoing);
-
-    if (refreshInterval.value) {
-      clearInterval(refreshInterval.value);
-      refreshInterval.value = undefined;
-    }
-
-    if (hasOngoingBackups) {
-      refreshInterval.value = setInterval(async () => {
-        await props.server.refresh(["backups"]);
-      }, 10000);
-    }
-  });
-});
-
-onUnmounted(() => {
-  if (refreshInterval.value) {
-    clearInterval(refreshInterval.value);
+const retryBackup = async (backupId: string) => {
+  try {
+    await props.server.backups?.retry(backupId);
+    await props.server.refresh(["backups"]);
+  } catch (error) {
+    console.error("Failed to retry backup:", error);
   }
-});
+};
+
+async function deleteBackup(backup?: Backup) {
+  if (!backup) {
+    addNotification({
+      type: "error",
+      title: "Error deleting backup",
+      text: "Backup is null",
+    });
+    return;
+  }
+
+  try {
+    await props.server.backups?.delete(backup.id);
+    await props.server.refresh();
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    addNotification({
+      type: "error",
+      title: "Error deleting backup",
+      text: message,
+    });
+  }
+}
 </script>
 
 <style scoped>
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options.vue b/apps/frontend/src/pages/servers/manage/[id]/options.vue
index 3716342d..fec9cbd2 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options.vue
@@ -1,7 +1,11 @@
 <template>
-  <UiServersServerSidebar :route="route" :nav-links="navLinks" :server="props.server" />
+  <UiServersServerSidebar
+    :route="route"
+    :nav-links="navLinks"
+    :server="server"
+    :backup-in-progress="backupInProgress"
+  />
 </template>
-
 <script setup lang="ts">
 import {
   InfoIcon,
@@ -14,12 +18,14 @@ import {
   WrenchIcon,
 } from "@modrinth/assets";
 import type { Server } from "~/composables/pyroServers";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
 
 const route = useRoute();
 const serverId = route.params.id as string;
 
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  backupInProgress?: BackupInProgressReason;
 }>();
 
 useHead({
diff --git a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
index fb8c240d..ef45166a 100644
--- a/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
+++ b/apps/frontend/src/pages/servers/manage/[id]/options/loader.vue
@@ -3,6 +3,7 @@
     ref="versionSelectModal"
     :server="props.server"
     :current-loader="data?.loader as Loaders"
+    :backup-in-progress="backupInProgress"
     @reinstall="emit('reinstall', $event)"
   />
 
@@ -93,13 +94,23 @@
         </div>
         <div v-else class="flex w-full flex-col items-center gap-2 sm:w-fit sm:flex-row">
           <ButtonStyled>
-            <nuxt-link class="!w-full sm:!w-auto" :to="`/modpacks?sid=${props.server.serverId}`">
+            <nuxt-link
+              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+              :class="{ disabled: backupInProgress }"
+              class="!w-full sm:!w-auto"
+              :to="`/modpacks?sid=${props.server.serverId}`"
+            >
               <CompassIcon class="size-4" /> Find a modpack
             </nuxt-link>
           </ButtonStyled>
           <span class="hidden sm:block">or</span>
           <ButtonStyled>
-            <button class="!w-full sm:!w-auto" @click="mrpackModal.show()">
+            <button
+              v-tooltip="backupInProgress ? formatMessage(backupInProgress.tooltip) : undefined"
+              :disabled="!!backupInProgress"
+              class="!w-full sm:!w-auto"
+              @click="mrpackModal.show()"
+            >
               <UploadIcon class="size-4" /> Upload .mrpack file
             </button>
           </ButtonStyled>
@@ -143,9 +154,13 @@ import { ButtonStyled, NewProjectCard } from "@modrinth/ui";
 import { TransferIcon, UploadIcon, InfoIcon, CompassIcon, SettingsIcon } from "@modrinth/assets";
 import type { Server } from "~/composables/pyroServers";
 import type { Loaders } from "~/types/servers";
+import type { BackupInProgressReason } from "~/pages/servers/manage/[id].vue";
+
+const { formatMessage } = useVIntl();
 
 const props = defineProps<{
   server: Server<["general", "content", "backups", "network", "startup", "ws", "fs"]>;
+  backupInProgress?: BackupInProgressReason;
 }>();
 
 const emit = defineEmits<{
diff --git a/apps/frontend/src/types/servers.ts b/apps/frontend/src/types/servers.ts
index 8f76f594..eb94f6bd 100644
--- a/apps/frontend/src/types/servers.ts
+++ b/apps/frontend/src/types/servers.ts
@@ -212,6 +212,18 @@ export interface WSNewModEvent {
   event: "new-mod";
 }
 
+export type WSBackupTask = "file" | "create" | "restore";
+export type WSBackupState = "ongoing" | "done" | "failed" | "cancelled" | "unchanged";
+
+export interface WSBackupProgressEvent {
+  event: "backup-progress";
+  task: WSBackupTask;
+  id: string;
+  progress: number; // percentage
+  state: WSBackupState;
+  ready: boolean;
+}
+
 export type WSEvent =
   | WSLogEvent
   | WSStatsEvent
@@ -221,7 +233,8 @@ export type WSEvent =
   | WSInstallationResultEvent
   | WSAuthOkEvent
   | WSUptimeEvent
-  | WSNewModEvent;
+  | WSNewModEvent
+  | WSBackupProgressEvent;
 
 export interface Servers {
   servers: Server[];
diff --git a/packages/assets/icons/bot.svg b/packages/assets/icons/bot.svg
new file mode 100644
index 00000000..812ca349
--- /dev/null
+++ b/packages/assets/icons/bot.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-bot-icon lucide-bot"><path d="M12 8V4H8"/><rect width="16" height="12" x="4" y="8" rx="2"/><path d="M2 14h2"/><path d="M20 14h2"/><path d="M15 13v2"/><path d="M9 13v2"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/folder-archive.svg b/packages/assets/icons/folder-archive.svg
new file mode 100644
index 00000000..e29a2b4e
--- /dev/null
+++ b/packages/assets/icons/folder-archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-folder-archive-icon lucide-folder-archive"><circle cx="15" cy="19" r="2"/><path d="M20.9 19.8A2 2 0 0 0 22 18V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13a2 2 0 0 0 2 2h5.1"/><path d="M15 11v-1"/><path d="M15 17v-2"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/rotate-ccw.svg b/packages/assets/icons/rotate-ccw.svg
new file mode 100644
index 00000000..99d7e6b3
--- /dev/null
+++ b/packages/assets/icons/rotate-ccw.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-rotate-ccw-icon lucide-rotate-ccw"><path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8"/><path d="M3 3v5h5"/></svg>
\ No newline at end of file
diff --git a/packages/assets/icons/rotate-cw.svg b/packages/assets/icons/rotate-cw.svg
new file mode 100644
index 00000000..f857d60a
--- /dev/null
+++ b/packages/assets/icons/rotate-cw.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-rotate-cw-icon lucide-rotate-cw"><path d="M21 12a9 9 0 1 1-9-9c2.52 0 4.93 1 6.74 2.74L21 8"/><path d="M21 3v5h-5"/></svg>
\ No newline at end of file
diff --git a/packages/assets/index.ts b/packages/assets/index.ts
index 45480f69..1b7f51da 100644
--- a/packages/assets/index.ts
+++ b/packages/assets/index.ts
@@ -40,6 +40,7 @@ import _BellRingIcon from './icons/bell-ring.svg?component'
 import _BookIcon from './icons/book.svg?component'
 import _BookTextIcon from './icons/book-text.svg?component'
 import _BookmarkIcon from './icons/bookmark.svg?component'
+import _BotIcon from './icons/bot.svg?component'
 import _BoxIcon from './icons/box.svg?component'
 import _BoxImportIcon from './icons/box-import.svg?component'
 import _BracesIcon from './icons/braces.svg?component'
@@ -76,6 +77,7 @@ import _FileIcon from './icons/file.svg?component'
 import _FileTextIcon from './icons/file-text.svg?component'
 import _FilterIcon from './icons/filter.svg?component'
 import _FilterXIcon from './icons/filter-x.svg?component'
+import _FolderArchiveIcon from './icons/folder-archive.svg?component'
 import _FolderOpenIcon from './icons/folder-open.svg?component'
 import _FolderSearchIcon from './icons/folder-search.svg?component'
 import _GapIcon from './icons/gap.svg?component'
@@ -137,6 +139,8 @@ import _ReplyIcon from './icons/reply.svg?component'
 import _ReportIcon from './icons/report.svg?component'
 import _RestoreIcon from './icons/restore.svg?component'
 import _RightArrowIcon from './icons/right-arrow.svg?component'
+import _RotateCounterClockwiseIcon from './icons/rotate-ccw.svg?component'
+import _RotateClockwiseIcon from './icons/rotate-cw.svg?component'
 import _SaveIcon from './icons/save.svg?component'
 import _ScaleIcon from './icons/scale.svg?component'
 import _ScanEyeIcon from './icons/scan-eye.svg?component'
@@ -238,6 +242,7 @@ export const BellRingIcon = _BellRingIcon
 export const BookIcon = _BookIcon
 export const BookTextIcon = _BookTextIcon
 export const BookmarkIcon = _BookmarkIcon
+export const BotIcon = _BotIcon
 export const BoxIcon = _BoxIcon
 export const BoxImportIcon = _BoxImportIcon
 export const BracesIcon = _BracesIcon
@@ -274,6 +279,7 @@ export const FileIcon = _FileIcon
 export const FileTextIcon = _FileTextIcon
 export const FilterIcon = _FilterIcon
 export const FilterXIcon = _FilterXIcon
+export const FolderArchiveIcon = _FolderArchiveIcon
 export const FolderOpenIcon = _FolderOpenIcon
 export const FolderSearchIcon = _FolderSearchIcon
 export const GapIcon = _GapIcon
@@ -335,6 +341,8 @@ export const ReplyIcon = _ReplyIcon
 export const ReportIcon = _ReportIcon
 export const RestoreIcon = _RestoreIcon
 export const RightArrowIcon = _RightArrowIcon
+export const RotateCounterClockwiseIcon = _RotateCounterClockwiseIcon
+export const RotateClockwiseIcon = _RotateClockwiseIcon
 export const SaveIcon = _SaveIcon
 export const ScaleIcon = _ScaleIcon
 export const ScanEyeIcon = _ScanEyeIcon
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index 15212344..abcbd755 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -195,7 +195,7 @@ const colorVariables = computed(() => {
   > *:first-child
   > *:first-child
   > :is(button, a, .button-like):first-child {
-  @apply flex cursor-pointer flex-row items-center justify-center border-solid border-2 border-transparent bg-[--_bg] text-[--_text] h-[--_height] min-w-[--_width] rounded-[--_radius] px-[--_padding-x] py-[--_padding-y] gap-[--_gap] font-[--_font-weight];
+  @apply flex cursor-pointer flex-row items-center justify-center border-solid border-2 border-transparent bg-[--_bg] text-[--_text] h-[--_height] min-w-[--_width] rounded-[--_radius] px-[--_padding-x] py-[--_padding-y] gap-[--_gap] font-[--_font-weight] whitespace-nowrap;
   transition:
     scale 0.125s ease-in-out,
     background-color 0.25s ease-in-out,
@@ -204,6 +204,7 @@ const colorVariables = computed(() => {
   svg:first-child {
     color: var(--_icon, var(--_text));
     transition: color 0.25s ease-in-out;
+    flex-shrink: 0;
   }
 
   &[disabled],
diff --git a/packages/ui/src/components/base/ProgressBar.vue b/packages/ui/src/components/base/ProgressBar.vue
new file mode 100644
index 00000000..a5dfd409
--- /dev/null
+++ b/packages/ui/src/components/base/ProgressBar.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+
+const props = withDefaults(
+  defineProps<{
+    progress: number
+    max?: number
+    color?: 'brand' | 'green' | 'red' | 'orange' | 'blue' | 'purple' | 'gray'
+    waiting?: boolean
+  }>(),
+  {
+    max: 1,
+    color: 'brand',
+    waiting: false,
+  },
+)
+
+const colors = {
+  brand: {
+    fg: 'bg-brand',
+    bg: 'bg-brand-highlight',
+  },
+  green: {
+    fg: 'bg-green',
+    bg: 'bg-bg-green',
+  },
+  red: {
+    fg: 'bg-red',
+    bg: 'bg-bg-red',
+  },
+  orange: {
+    fg: 'bg-orange',
+    bg: 'bg-bg-orange',
+  },
+  blue: {
+    fg: 'bg-blue',
+    bg: 'bg-bg-blue',
+  },
+  purple: {
+    fg: 'bg-purple',
+    bg: 'bg-bg-purple',
+  },
+  gray: {
+    fg: 'bg-gray',
+    bg: 'bg-bg-gray',
+  },
+}
+
+const percent = computed(() => props.progress / props.max)
+</script>
+<template>
+  <div class="flex w-[15rem] h-1 rounded-full overflow-hidden" :class="colors[props.color].bg">
+    <div
+      class="rounded-full progress-bar"
+      :class="[colors[props.color].fg, { 'progress-bar--waiting': waiting }]"
+      :style="!waiting ? { width: `${percent * 100}%` } : {}"
+    ></div>
+  </div>
+</template>
+<style scoped lang="scss">
+.progress-bar {
+  transition: width 0.2s ease-in-out;
+}
+
+.progress-bar--waiting {
+  animation: progress-bar-waiting 1s linear infinite;
+  position: relative;
+}
+
+@keyframes progress-bar-waiting {
+  0% {
+    left: -50%;
+    width: 20%;
+  }
+  50% {
+    width: 60%;
+  }
+  100% {
+    left: 100%;
+    width: 20%;
+  }
+}
+</style>
diff --git a/packages/ui/src/components/index.ts b/packages/ui/src/components/index.ts
index 1c4ee40b..9aae805a 100644
--- a/packages/ui/src/components/index.ts
+++ b/packages/ui/src/components/index.ts
@@ -26,6 +26,7 @@ export { default as Page } from './base/Page.vue'
 export { default as Pagination } from './base/Pagination.vue'
 export { default as PopoutMenu } from './base/PopoutMenu.vue'
 export { default as PreviewSelectButton } from './base/PreviewSelectButton.vue'
+export { default as ProgressBar } from './base/ProgressBar.vue'
 export { default as ProjectCard } from './base/ProjectCard.vue'
 export { default as RadialHeader } from './base/RadialHeader.vue'
 export { default as RadioButtons } from './base/RadioButtons.vue'
@@ -98,3 +99,6 @@ export { default as VersionSummary } from './version/VersionSummary.vue'
 
 // Settings
 export { default as ThemeSelector } from './settings/ThemeSelector.vue'
+
+// Servers
+export { default as BackupWarning } from './servers/backups/BackupWarning.vue'
diff --git a/packages/ui/src/components/modal/ConfirmModal.vue b/packages/ui/src/components/modal/ConfirmModal.vue
index 42115e27..e9925d43 100644
--- a/packages/ui/src/components/modal/ConfirmModal.vue
+++ b/packages/ui/src/components/modal/ConfirmModal.vue
@@ -5,26 +5,28 @@
         <span class="font-extrabold text-contrast text-lg">{{ title }}</span>
       </slot>
     </template>
-    <div>
-      <div class="markdown-body max-w-[35rem]" v-html="renderString(description)" />
-      <label v-if="hasToType" for="confirmation" class="confirmation-label">
+    <div class="flex flex-col gap-4">
+      <div
+        v-if="description"
+        class="markdown-body max-w-[35rem]"
+        v-html="renderString(description)"
+      />
+      <slot />
+      <label v-if="hasToType" for="confirmation">
         <span>
-          <strong>To verify, type</strong>
-          <em class="confirmation-text"> {{ confirmationText }} </em>
-          <strong>below:</strong>
+          To confirm you want to proceed, type
+          <span class="italic font-bold">{{ confirmationText }}</span> below:
         </span>
       </label>
-      <div class="confirmation-input">
-        <input
-          v-if="hasToType"
-          id="confirmation"
-          v-model="confirmation_typed"
-          type="text"
-          placeholder="Type here..."
-          @input="type"
-        />
-      </div>
-      <div class="flex gap-2 mt-6">
+      <input
+        v-if="hasToType"
+        id="confirmation"
+        v-model="confirmation_typed"
+        type="text"
+        placeholder="Type here..."
+        class="max-w-[20rem]"
+      />
+      <div class="flex gap-2">
         <ButtonStyled :color="danger ? 'red' : 'brand'">
           <button :disabled="action_disabled" @click="proceed">
             <component :is="proceedIcon" />
@@ -65,8 +67,8 @@ const props = defineProps({
   },
   description: {
     type: String,
-    default: 'No description defined',
-    required: true,
+    default: undefined,
+    required: false,
   },
   proceedIcon: {
     type: Object,
@@ -95,21 +97,20 @@ const props = defineProps({
 const emit = defineEmits(['proceed'])
 const modal = ref(null)
 
-const action_disabled = ref(props.hasToType)
 const confirmation_typed = ref('')
 
+const action_disabled = computed(
+  () =>
+    props.hasToType &&
+    confirmation_typed.value.toLowerCase() !== props.confirmationText.toLowerCase(),
+)
+
 function proceed() {
   modal.value.hide()
+  confirmation_typed.value = ''
   emit('proceed')
 }
 
-function type() {
-  if (props.hasToType) {
-    action_disabled.value =
-      confirmation_typed.value.toLowerCase() !== props.confirmationText.toLowerCase()
-  }
-}
-
 function show() {
   modal.value.show()
 }
diff --git a/packages/ui/src/components/servers/backups/BackupWarning.vue b/packages/ui/src/components/servers/backups/BackupWarning.vue
new file mode 100644
index 00000000..1a9671b7
--- /dev/null
+++ b/packages/ui/src/components/servers/backups/BackupWarning.vue
@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { IssuesIcon } from '@modrinth/assets'
+import AutoLink from '../../base/AutoLink.vue'
+
+defineProps<{
+  backupLink: string
+}>()
+</script>
+<template>
+  <div
+    class="flex gap-3 rounded-2xl border-2 border-solid border-orange bg-bg-orange px-4 py-3 font-medium text-contrast"
+  >
+    <IssuesIcon class="mt-1 h-5 w-5 shrink-0 text-orange" />
+    <span class="leading-normal">
+      You may want to
+      <AutoLink
+        :to="backupLink"
+        class="font-semibold text-orange hover:underline active:brightness-125"
+        >create a backup</AutoLink
+      >
+      before proceeding, as this process is irreversible and may permanently alter your world or the
+      files on your server.
+    </span>
+  </div>
+</template>
diff --git a/packages/ui/src/locales/en-US/index.json b/packages/ui/src/locales/en-US/index.json
index c0fe5dbc..1995738d 100644
--- a/packages/ui/src/locales/en-US/index.json
+++ b/packages/ui/src/locales/en-US/index.json
@@ -11,6 +11,12 @@
   "button.create-a-project": {
     "defaultMessage": "Create a project"
   },
+  "button.download": {
+    "defaultMessage": "Download"
+  },
+  "button.downloading": {
+    "defaultMessage": "Downloading"
+  },
   "button.edit": {
     "defaultMessage": "Edit"
   },
@@ -422,6 +428,9 @@
   "servers.notice.level.info.name": {
     "defaultMessage": "Info"
   },
+  "servers.notice.level.survey.name": {
+    "defaultMessage": "Survey"
+  },
   "servers.notice.level.warn.name": {
     "defaultMessage": "Warning"
   },
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 4bc4490a..30605b7f 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -49,6 +49,14 @@ export const commonMessages = defineMessages({
     id: 'label.description',
     defaultMessage: 'Description',
   },
+  downloadButton: {
+    id: 'button.download',
+    defaultMessage: 'Download',
+  },
+  downloadingButton: {
+    id: 'button.downloading',
+    defaultMessage: 'Downloading',
+  },
   editButton: {
     id: 'button.edit',
     defaultMessage: 'Edit',
diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 0a6e8f61..5d672b10 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,18 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-04-17T01:30:00-07:00`,
+    product: 'servers',
+    body: `### Improvements
+- Completely overhauled the Backups interface and fixed them being non-functional.
+  - Backups will now show progress when creating and restoring.
+  - Backups now have a "Prepare download" phase, which will prepare a backup file for downloading.
+  - You can now cancel a backup in progress and retry a failed backup.
+- When a backup is in progress, you will no longer be allowed to modify the modpack or loader.
+- Removed the ability to create backups on install automatically, and replaced with a notice that you may want to create a backup before installing a new modpack or loader. This is because the previous implementation of backup on install was unreliable and buggy. We are working on a better implementation for this feature and plan for it to return in the future.
+- Temporarily disabled auto backups button, since they are currently not working.`,
+  },
   {
     date: `2025-04-15T16:35:00-07:00`,
     product: 'servers',

From 0c43eb0d22153ee03adcaab2fa8743144b61c3db Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Thu, 17 Apr 2025 02:19:06 -0700
Subject: [PATCH 18/28] Update changelog date

---
 packages/utils/changelog.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index 5d672b10..eaf6fc35 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -11,7 +11,7 @@ export type VersionEntry = {
 
 const VERSIONS: VersionEntry[] = [
   {
-    date: `2025-04-17T01:30:00-07:00`,
+    date: `2025-04-17T02:25:00-07:00`,
     product: 'servers',
     body: `### Improvements
 - Completely overhauled the Backups interface and fixed them being non-functional.

From d6a74b0cfeba40d8a7e21314cc6be4a727697cdc Mon Sep 17 00:00:00 2001
From: Prospector <prospectordev@gmail.com>
Date: Thu, 17 Apr 2025 02:56:26 -0700
Subject: [PATCH 19/28] Fix prepare initiating overriding states, and add
 handling of failed file prep

---
 .../src/components/ui/servers/BackupItem.vue  | 30 +++++++++++++++----
 apps/frontend/src/locales/en-US/index.json    |  6 ++++
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/apps/frontend/src/components/ui/servers/BackupItem.vue b/apps/frontend/src/components/ui/servers/BackupItem.vue
index 064ab699..3b2ee84b 100644
--- a/apps/frontend/src/components/ui/servers/BackupItem.vue
+++ b/apps/frontend/src/components/ui/servers/BackupItem.vue
@@ -83,11 +83,13 @@ const initiatedPrepare = ref(false);
 const preparingFile = computed(() => {
   const task = props.backup.task?.file;
   return (
-    initiatedPrepare.value || (task && task.progress < 1 && !inactiveStates.includes(task.state))
+    (!task && initiatedPrepare.value) ||
+    (task && task.progress < 1 && !inactiveStates.includes(task.state))
   );
 });
 
 const failedToRestore = computed(() => props.backup.task?.restore?.state === "failed");
+const failedToPrepareFile = computed(() => props.backup.task?.file?.state === "failed");
 
 const messages = defineMessages({
   locked: {
@@ -122,6 +124,10 @@ const messages = defineMessages({
     id: "servers.backups.item.prepare-download",
     defaultMessage: "Prepare download",
   },
+  prepareDownloadAgain: {
+    id: "servers.backups.item.prepare-download-again",
+    defaultMessage: "Try preparing again",
+  },
   alreadyPreparing: {
     id: "servers.backups.item.already-preparing",
     defaultMessage: "Already preparing backup for download",
@@ -142,6 +148,10 @@ const messages = defineMessages({
     id: "servers.backups.item.failed-to-restore-backup",
     defaultMessage: "Failed to restore from backup",
   },
+  failedToPrepareFile: {
+    id: "servers.backups.item.failed-to-prepare-backup",
+    defaultMessage: "Failed to prepare download",
+  },
   automated: {
     id: "servers.backups.item.automated",
     defaultMessage: "Automated",
@@ -175,7 +185,7 @@ const messages = defineMessages({
       <span class="font-bold text-contrast">
         {{ backup.name }}
       </span>
-      <div class="flex items-center gap-2 text-sm">
+      <div class="flex flex-wrap items-center gap-2 text-sm">
         <span v-if="backup.locked" class="flex items-center gap-1 text-sm text-secondary">
           <LockIcon /> {{ formatMessage(messages.locked) }}
         </span>
@@ -185,13 +195,17 @@ const messages = defineMessages({
         </span>
         <span v-if="(failedToCreate || failedToRestore) && (automated || backup.locked)">•</span>
         <span
-          v-if="failedToCreate || failedToRestore"
+          v-if="failedToCreate || failedToRestore || failedToPrepareFile"
           class="flex items-center gap-1 text-sm text-red"
         >
           <XIcon />
           {{
             formatMessage(
-              failedToCreate ? messages.failedToCreateBackup : messages.failedToRestoreBackup,
+              failedToCreate
+                ? messages.failedToCreateBackup
+                : failedToRestore
+                  ? messages.failedToRestoreBackup
+                  : messages.failedToPrepareFile,
             )
           }}
         </span>
@@ -274,7 +288,13 @@ const messages = defineMessages({
             <SpinnerIcon v-if="preparingFile" class="animate-spin" />
             <DownloadIcon v-else />
             {{
-              formatMessage(preparingFile ? messages.preparingDownload : messages.prepareDownload)
+              formatMessage(
+                preparingFile
+                  ? messages.preparingDownload
+                  : failedToPrepareFile
+                    ? messages.prepareDownloadAgain
+                    : messages.prepareDownload,
+              )
             }}
           </button>
         </ButtonStyled>
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index a059cb77..a8cb4682 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -977,6 +977,9 @@
   "servers.backups.item.failed-to-create-backup": {
     "message": "Failed to create backup"
   },
+  "servers.backups.item.failed-to-prepare-backup": {
+    "message": "Failed to prepare download"
+  },
   "servers.backups.item.failed-to-restore-backup": {
     "message": "Failed to restore from backup"
   },
@@ -989,6 +992,9 @@
   "servers.backups.item.prepare-download": {
     "message": "Prepare download"
   },
+  "servers.backups.item.prepare-download-again": {
+    "message": "Try preparing again"
+  },
   "servers.backups.item.preparing-download": {
     "message": "Preparing download..."
   },

From d0aef27f7bf20d14ee541de56ceb2dc948af743f Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sat, 19 Apr 2025 00:38:54 -0400
Subject: [PATCH 20/28] Fix deleting a user that has a prior subscription
 (#3533)

(for real this time)
---
 ...25b7e70db2e920ef1f2be77aa06f76da200fe.json | 15 +++++++++++++
 ...e0368ee972ed20bd4d4b2490c655fde999dda.json | 15 -------------
 .../labrinth/src/database/models/user_item.rs | 22 ++++++++++++++++++-
 3 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-79bdf720ec3631954c06fbba1da25b7e70db2e920ef1f2be77aa06f76da200fe.json
 delete mode 100644 apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json

diff --git a/apps/labrinth/.sqlx/query-79bdf720ec3631954c06fbba1da25b7e70db2e920ef1f2be77aa06f76da200fe.json b/apps/labrinth/.sqlx/query-79bdf720ec3631954c06fbba1da25b7e70db2e920ef1f2be77aa06f76da200fe.json
new file mode 100644
index 00000000..aa865087
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-79bdf720ec3631954c06fbba1da25b7e70db2e920ef1f2be77aa06f76da200fe.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n                UPDATE users_subscriptions\n                SET user_id = $1\n                WHERE user_id = $2\n                ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8",
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "79bdf720ec3631954c06fbba1da25b7e70db2e920ef1f2be77aa06f76da200fe"
+}
diff --git a/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json b/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json
deleted file mode 100644
index f2104ac6..00000000
--- a/apps/labrinth/.sqlx/query-f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n                UPDATE charges\n                SET user_id = $1\n                WHERE user_id = $2\n                ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Int8"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "f1f93419f4394c702f256fe3e5de0368ee972ed20bd4d4b2490c655fde999dda"
-}
diff --git a/apps/labrinth/src/database/models/user_item.rs b/apps/labrinth/src/database/models/user_item.rs
index 05db1992..8c3ec18b 100644
--- a/apps/labrinth/src/database/models/user_item.rs
+++ b/apps/labrinth/src/database/models/user_item.rs
@@ -1,8 +1,11 @@
 use super::ids::{ProjectId, UserId};
 use super::{CollectionId, ReportId, ThreadId};
 use crate::database::models;
+use crate::database::models::charge_item::ChargeItem;
+use crate::database::models::user_subscription_item::UserSubscriptionItem;
 use crate::database::models::{DatabaseError, OrganizationId};
 use crate::database::redis::RedisPool;
+use crate::models::billing::ChargeStatus;
 use crate::models::users::Badges;
 use ariadne::ids::base62_impl::{parse_base62, to_base62};
 use chrono::{DateTime, Utc};
@@ -657,9 +660,26 @@ impl User {
             .execute(&mut **transaction)
             .await?;
 
+            let open_subscriptions =
+                UserSubscriptionItem::get_all_user(id, &mut **transaction)
+                    .await?;
+
+            for x in open_subscriptions {
+                let charge =
+                    ChargeItem::get_open_subscription(x.id, &mut **transaction)
+                        .await?;
+                if let Some(mut charge) = charge {
+                    charge.status = ChargeStatus::Cancelled;
+                    charge.due = Utc::now();
+                    charge.user_id = deleted_user;
+
+                    charge.upsert(transaction).await?;
+                }
+            }
+
             sqlx::query!(
                 "
-                UPDATE charges
+                UPDATE users_subscriptions
                 SET user_id = $1
                 WHERE user_id = $2
                 ",

From 84a28e045beff088d439477e45ea0eb26c5d22c1 Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sat, 19 Apr 2025 00:39:18 -0400
Subject: [PATCH 21/28] Allow servers to be unprovisioned without issuing a
 refund (#3534)

* Allow servers to be unprovisioned without issuing a refund

for very specific weird circumstances where a server gets stuck/etc; useful for support

* still create a charge

* Fix compile
---
 .../frontend/src/pages/admin/billing/[id].vue |  2 +-
 apps/labrinth/src/routes/internal/billing.rs  | 86 ++++++++++---------
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/apps/frontend/src/pages/admin/billing/[id].vue b/apps/frontend/src/pages/admin/billing/[id].vue
index 235c9a53..79bbdf2a 100644
--- a/apps/frontend/src/pages/admin/billing/[id].vue
+++ b/apps/frontend/src/pages/admin/billing/[id].vue
@@ -277,7 +277,7 @@ const refunding = ref(false);
 const refundModal = ref();
 const selectedCharge = ref(null);
 const refundType = ref("full");
-const refundTypes = ref(["full", "partial"]);
+const refundTypes = ref(["full", "partial", "none"]);
 const refundAmount = ref(0);
 const unprovision = ref(false);
 
diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index a92a5166..7ef81028 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -135,6 +135,7 @@ pub async fn subscriptions(
 pub enum ChargeRefundAmount {
     Full,
     Partial { amount: u64 },
+    None,
 }
 
 #[derive(Deserialize)]
@@ -189,6 +190,7 @@ pub async fn refund_charge(
         let refund_amount = match body.0.amount {
             ChargeRefundAmount::Full => refundable,
             ChargeRefundAmount::Partial { amount } => amount as i64,
+            ChargeRefundAmount::None => 0,
         };
 
         if charge.status != ChargeStatus::Succeeded {
@@ -197,55 +199,61 @@ pub async fn refund_charge(
             ));
         }
 
-        if (refundable - refund_amount) < 0 || refund_amount == 0 {
+        if (refundable - refund_amount) < 0 {
             return Err(ApiError::InvalidInput(
                 "You cannot refund more than the amount of the charge!"
                     .to_string(),
             ));
         }
 
-        let (id, net) = match charge.payment_platform {
-            PaymentPlatform::Stripe => {
-                if let Some(payment_platform_id) = charge
-                    .payment_platform_id
-                    .and_then(|x| stripe::PaymentIntentId::from_str(&x).ok())
-                {
-                    let mut metadata = HashMap::new();
+        let (id, net) = if refund_amount != 0 {
+            (None, None)
+        } else {
+            match charge.payment_platform {
+                PaymentPlatform::Stripe => {
+                    if let Some(payment_platform_id) =
+                        charge.payment_platform_id.and_then(|x| {
+                            stripe::PaymentIntentId::from_str(&x).ok()
+                        })
+                    {
+                        let mut metadata = HashMap::new();
 
-                    metadata.insert(
-                        "modrinth_user_id".to_string(),
-                        to_base62(user.id.0),
-                    );
-                    metadata.insert(
-                        "modrinth_charge_id".to_string(),
-                        to_base62(charge.id.0 as u64),
-                    );
+                        metadata.insert(
+                            "modrinth_user_id".to_string(),
+                            to_base62(user.id.0),
+                        );
+                        metadata.insert(
+                            "modrinth_charge_id".to_string(),
+                            to_base62(charge.id.0 as u64),
+                        );
 
-                    let refund = stripe::Refund::create(
-                        &stripe_client,
-                        CreateRefund {
-                            amount: Some(refund_amount),
-                            metadata: Some(metadata),
-                            payment_intent: Some(payment_platform_id),
+                        let refund = stripe::Refund::create(
+                            &stripe_client,
+                            CreateRefund {
+                                amount: Some(refund_amount),
+                                metadata: Some(metadata),
+                                payment_intent: Some(payment_platform_id),
 
-                            expand: &["balance_transaction"],
+                                expand: &["balance_transaction"],
 
-                            ..Default::default()
-                        },
-                    )
-                    .await?;
+                                ..Default::default()
+                            },
+                        )
+                        .await?;
 
-                    (
-                        refund.id.to_string(),
-                        refund
-                            .balance_transaction
-                            .and_then(|x| x.into_object())
-                            .map(|x| x.net),
-                    )
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "Charge does not have attached payment id!".to_string(),
-                    ));
+                        (
+                            Some(refund.id.to_string()),
+                            refund
+                                .balance_transaction
+                                .and_then(|x| x.into_object())
+                                .map(|x| x.net),
+                        )
+                    } else {
+                        return Err(ApiError::InvalidInput(
+                            "Charge does not have attached payment id!"
+                                .to_string(),
+                        ));
+                    }
                 }
             }
         };
@@ -266,7 +274,7 @@ pub async fn refund_charge(
             subscription_id: charge.subscription_id,
             subscription_interval: charge.subscription_interval,
             payment_platform: charge.payment_platform,
-            payment_platform_id: Some(id),
+            payment_platform_id: id,
             parent_charge_id: Some(charge.id),
             net,
         }

From 1903980b718e3a8ac9457f2ab749c28cb56cf178 Mon Sep 17 00:00:00 2001
From: Prospector <6166773+Prospector@users.noreply.github.com>
Date: Fri, 18 Apr 2025 22:23:30 -0700
Subject: [PATCH 22/28] Update Servers marketing page (#3535)

* Update Servers marketing page

* Add burst FAQ

* Updated phrasing again

* Fix servers page when not logged in

* Update changelog
---
 .../servers/marketing/ServerPlanSelector.vue  | 187 ++++++++++
 apps/frontend/src/composables/pyroFetch.ts    |  13 +-
 apps/frontend/src/locales/en-US/index.json    |  27 ++
 apps/frontend/src/pages/servers/index.vue     | 322 +++++-------------
 .../src/pages/settings/billing/index.vue      |   5 +-
 .../ui/src/components/base/ButtonStyled.vue   |  42 ++-
 .../src/components/billing/PurchaseModal.vue  |  47 ++-
 packages/utils/changelog.ts                   |   6 +
 8 files changed, 393 insertions(+), 256 deletions(-)
 create mode 100644 apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue

diff --git a/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
new file mode 100644
index 00000000..7c08bdf9
--- /dev/null
+++ b/apps/frontend/src/components/ui/servers/marketing/ServerPlanSelector.vue
@@ -0,0 +1,187 @@
+<script setup lang="ts">
+import { ButtonStyled } from "@modrinth/ui";
+import { RightArrowIcon, SparklesIcon, UnknownIcon } from "@modrinth/assets";
+import type { MessageDescriptor } from "@vintl/vintl";
+
+const { formatMessage } = useVIntl();
+
+const emit = defineEmits<{
+  (e: "select" | "scroll-to-faq"): void;
+}>();
+
+type Plan = "small" | "medium" | "large";
+
+const plans: Record<
+  Plan,
+  {
+    buttonColor: "blue" | "green" | "purple";
+    accentText: string;
+    accentBg: string;
+    name: MessageDescriptor;
+    symbol: MessageDescriptor;
+    description: MessageDescriptor;
+  }
+> = {
+  small: {
+    buttonColor: "blue",
+    accentText: "text-blue",
+    accentBg: "bg-bg-blue",
+    name: defineMessage({
+      id: "servers.plan.small.name",
+      defaultMessage: "Small",
+    }),
+    symbol: defineMessage({
+      id: "servers.plan.small.symbol",
+      defaultMessage: "S",
+    }),
+    description: defineMessage({
+      id: "servers.plan.small.description",
+      defaultMessage:
+        "Perfect for vanilla multiplayer, small friend groups, SMPs, and light modding.",
+    }),
+  },
+  medium: {
+    buttonColor: "green",
+    accentText: "text-green",
+    accentBg: "bg-bg-green",
+    name: defineMessage({
+      id: "servers.plan.medium.name",
+      defaultMessage: "Medium",
+    }),
+    symbol: defineMessage({
+      id: "servers.plan.medium.symbol",
+      defaultMessage: "M",
+    }),
+    description: defineMessage({
+      id: "servers.plan.medium.description",
+      defaultMessage: "Great for modded multiplayer and small communities.",
+    }),
+  },
+  large: {
+    buttonColor: "purple",
+    accentText: "text-purple",
+    accentBg: "bg-bg-purple",
+    name: defineMessage({
+      id: "servers.plan.large.name",
+      defaultMessage: "Large",
+    }),
+    symbol: defineMessage({
+      id: "servers.plan.large.symbol",
+      defaultMessage: "L",
+    }),
+    description: defineMessage({
+      id: "servers.plan.large.description",
+      defaultMessage: "Ideal for larger communities, modpacks, and heavy modding.",
+    }),
+  },
+};
+
+const props = defineProps<{
+  capacity?: number;
+  plan: Plan;
+  ram: number;
+  storage: number;
+  cpus: number;
+  price: number;
+}>();
+
+const outOfStock = computed(() => {
+  return !props.capacity || props.capacity === 0;
+});
+
+const lowStock = computed(() => {
+  return !props.capacity || props.capacity < 8;
+});
+
+const formattedRam = computed(() => {
+  return props.ram / 1024;
+});
+
+const formattedStorage = computed(() => {
+  return props.storage / 1024;
+});
+
+const sharedCpus = computed(() => {
+  return props.cpus / 2;
+});
+</script>
+
+<template>
+  <li class="relative flex w-full flex-col justify-between pt-12 lg:w-1/3">
+    <div
+      v-if="lowStock"
+      class="absolute left-0 right-0 top-[-2px] rounded-t-2xl p-4 text-center font-bold"
+      :class="outOfStock ? 'bg-bg-red' : 'bg-bg-orange'"
+    >
+      <template v-if="outOfStock"> Out of stock! </template>
+      <template v-else> Only {{ capacity }} left in stock! </template>
+    </div>
+    <div
+      :style="
+        plan === 'medium'
+          ? {
+              background: `radial-gradient(
+                  86.12% 101.64% at 95.97% 94.07%,
+                  rgba(27, 217, 106, 0.23) 0%,
+                  rgba(14, 115, 56, 0.2) 100%
+                )`,
+              border: `1px solid rgba(12, 107, 52, 0.55)`,
+              'box-shadow': `0px 12px 38.1px rgba(27, 217, 106, 0.13)`,
+            }
+          : undefined
+      "
+      class="flex w-full flex-col justify-between gap-4 rounded-2xl bg-bg p-8 text-left"
+      :class="{ '!rounded-t-none': lowStock }"
+    >
+      <div class="flex flex-col gap-4">
+        <div class="flex flex-row items-center justify-between">
+          <h1 class="m-0">{{ formatMessage(plans[plan].name) }}</h1>
+          <div
+            class="grid size-8 place-content-center rounded-full text-xs font-bold"
+            :class="`${plans[plan].accentBg} ${plans[plan].accentText}`"
+          >
+            {{ formatMessage(plans[plan].symbol) }}
+          </div>
+        </div>
+        <p class="m-0">{{ formatMessage(plans[plan].description) }}</p>
+        <div
+          class="flex flex-row flex-wrap items-center gap-2 text-nowrap text-secondary xl:justify-between"
+        >
+          <p class="m-0">{{ formattedRam }} GB RAM</p>
+          <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
+          <p class="m-0">{{ formattedStorage }} GB SSD</p>
+          <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
+          <p class="m-0">{{ sharedCpus }} Shared CPUs</p>
+        </div>
+        <div class="flex items-center gap-2 text-secondary">
+          <SparklesIcon /> Bursts up to {{ cpus }} CPUs
+          <nuxt-link
+            v-tooltip="
+              `CPU bursting allows your server to temporarily use additional threads to help mitigate TPS spikes. Click for more info.`
+            "
+            to="/servers#cpu-burst"
+            @click="() => emit('scroll-to-faq')"
+          >
+            <UnknownIcon class="h-4 w-4 text-secondary opacity-80" />
+          </nuxt-link>
+        </div>
+        <span class="m-0 text-2xl font-bold text-contrast">
+          ${{ price / 100 }}<span class="text-lg font-semibold text-secondary">/month</span>
+        </span>
+      </div>
+      <ButtonStyled
+        :color="plans[plan].buttonColor"
+        :type="plan === 'medium' ? 'standard' : 'highlight-colored-text'"
+        size="large"
+      >
+        <span v-if="outOfStock" class="button-like disabled"> Out of Stock </span>
+        <button v-else @click="() => emit('select')">
+          Get Started
+          <RightArrowIcon class="shrink-0" />
+        </button>
+      </ButtonStyled>
+    </div>
+  </li>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/apps/frontend/src/composables/pyroFetch.ts b/apps/frontend/src/composables/pyroFetch.ts
index 0d0da31b..1c2e45a9 100644
--- a/apps/frontend/src/composables/pyroFetch.ts
+++ b/apps/frontend/src/composables/pyroFetch.ts
@@ -10,6 +10,7 @@ interface PyroFetchOptions {
     token?: string;
   };
   retry?: boolean;
+  bypassAuth?: boolean;
 }
 
 export class PyroFetchError extends Error {
@@ -28,7 +29,7 @@ export async function usePyroFetch<T>(path: string, options: PyroFetchOptions =
   const auth = await useAuth();
   const authToken = auth.value?.token;
 
-  if (!authToken) {
+  if (!authToken && !options.bypassAuth) {
     throw new PyroFetchError("Cannot pyrofetch without auth", 10000);
   }
 
@@ -52,9 +53,15 @@ export async function usePyroFetch<T>(path: string, options: PyroFetchOptions =
 
   type HeadersRecord = Record<string, string>;
 
+  const authHeader: HeadersRecord = options.bypassAuth
+    ? {}
+    : {
+        Authorization: `Bearer ${override?.token ?? authToken}`,
+        "Access-Control-Allow-Headers": "Authorization",
+      };
+
   const headers: HeadersRecord = {
-    Authorization: `Bearer ${override?.token ?? authToken}`,
-    "Access-Control-Allow-Headers": "Authorization",
+    ...authHeader,
     "User-Agent": "Pyro/1.0 (https://pyro.host)",
     Vary: "Accept, Origin",
     "Content-Type": contentType,
diff --git a/apps/frontend/src/locales/en-US/index.json b/apps/frontend/src/locales/en-US/index.json
index a8cb4682..79fbaf58 100644
--- a/apps/frontend/src/locales/en-US/index.json
+++ b/apps/frontend/src/locales/en-US/index.json
@@ -1043,6 +1043,33 @@
   "servers.notices.no-notices": {
     "message": "No notices"
   },
+  "servers.plan.large.description": {
+    "message": "Ideal for larger communities, modpacks, and heavy modding."
+  },
+  "servers.plan.large.name": {
+    "message": "Large"
+  },
+  "servers.plan.large.symbol": {
+    "message": "L"
+  },
+  "servers.plan.medium.description": {
+    "message": "Great for modded multiplayer and small communities."
+  },
+  "servers.plan.medium.name": {
+    "message": "Medium"
+  },
+  "servers.plan.medium.symbol": {
+    "message": "M"
+  },
+  "servers.plan.small.description": {
+    "message": "Perfect for vanilla multiplayer, small friend groups, SMPs, and light modding."
+  },
+  "servers.plan.small.name": {
+    "message": "Small"
+  },
+  "servers.plan.small.symbol": {
+    "message": "S"
+  },
   "settings.billing.modal.cancel.action": {
     "message": "Cancel subscription"
   },
diff --git a/apps/frontend/src/pages/servers/index.vue b/apps/frontend/src/pages/servers/index.vue
index 1b5c6cd4..695bed55 100644
--- a/apps/frontend/src/pages/servers/index.vue
+++ b/apps/frontend/src/pages/servers/index.vue
@@ -211,7 +211,7 @@
             <h2 class="m-0 text-lg font-bold">Experience modern, reliable hosting</h2>
             <h3 class="m-0 text-base font-normal text-secondary">
               Modrinth Servers are hosted on
-              <span class="text-contrast">2023 Ryzen 7/9 CPUs with DDR5 RAM</span>, running on
+              <span class="text-contrast">high-performance AMD CPUs with DDR5 RAM</span>, running on
               custom-built software to ensure your server performs smoothly.
             </h3>
           </div>
@@ -329,27 +329,6 @@
               alt=""
               class="absolute -bottom-12 -right-[15%] hidden max-w-2xl rounded-2xl bg-brand p-4 lg:block"
             />
-            <div class="flex flex-row items-center gap-3">
-              <div
-                aria-hidden="true"
-                class="max-w-fit rounded-full bg-brand p-4 text-sm font-bold text-[var(--color-accent-contrast)] lg:absolute lg:bottom-8 lg:right-8 lg:block"
-              >
-                8.49 GB used
-              </div>
-              <div
-                aria-hidden="true"
-                class="flex w-fit items-center gap-2 rounded-full bg-button-bg p-3 lg:hidden"
-              >
-                <SortAscendingIcon class="h-6 w-6" />
-                Sort
-              </div>
-              <div
-                aria-hidden="true"
-                class="flex w-fit items-center rounded-full bg-button-bg p-3 lg:hidden"
-              >
-                <SearchIcon class="h-6 w-6" />
-              </div>
-            </div>
           </div>
         </div>
         <div class="grid w-full grid-cols-1 gap-8 lg:grid-cols-2">
@@ -418,9 +397,24 @@
                 </span>
                 What kind of CPUs do Modrinth Servers run on?
               </summary>
-              <p class="m-0 !leading-[190%]">
-                Modrinth Servers use 2023 Ryzen 7 and Ryzen 9 CPUs at 4+ GHz, paired with DDR5
-                memory.
+              <p class="m-0 ml-6 leading-[160%]">
+                Modrinth Servers are powered by AMD Ryzen 7900 and 7950X3D equivalent CPUs at 5+
+                GHz, paired with with DDR5 memory.
+              </p>
+            </details>
+            <details pyro-hash="cpu-burst" class="group" :open="$route.hash === '#cpu-burst'">
+              <summary class="flex cursor-pointer items-center py-3 font-medium text-contrast">
+                <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
+                  <RightArrowIcon />
+                </span>
+                How do CPU burst threads work?
+              </summary>
+              <p class="m-0 ml-6 leading-[160%]">
+                When your server is under heavy load, we temporarily give it access to additional
+                CPU threads to help mitigate lag spikes and instability. This helps prevent the TPS
+                from going below 20, ensuring the smoothest experience possible. Since those extra
+                CPU threads are only shortly available during high load periods, they might not show
+                up in Spark reports or other profiling tools.
               </p>
             </details>
 
@@ -431,10 +425,12 @@
                 </span>
                 Do Modrinth Servers have DDoS protection?
               </summary>
-              <p class="m-0 !leading-[190%]">
-                Yes. All Modrinth Servers come with DDoS protection. Protection is powered by a
-                combination of in-house network filtering as well as with our data center provider.
-                Your server is safe on Modrinth.
+              <p class="m-0 ml-6 leading-[160%]">
+                Yes. All Modrinth Servers come with DDoS protection powered by
+                <a href="https://us.ovhcloud.com/security/anti-ddos/" target="_blank"
+                  >OVHcloud® Anti-DDoS infrastructure</a
+                >
+                which has over 17Tbps capacity. Your server is safe on Modrinth.
               </p>
             </details>
 
@@ -445,11 +441,9 @@
                 </span>
                 Where are Modrinth Servers located? Can I choose a region?
               </summary>
-              <p class="m-0 !leading-[190%]">
-                Currently, Modrinth Servers are located throughout the United States in New York,
-                Los Angelas, Dallas, Miami, and Spokane. More regions are coming soon! Your server's
-                location is currently chosen algorithmically, but you will be able to choose a
-                region in the future.
+              <p class="m-0 ml-6 leading-[160%]">
+                Currently, Modrinth Servers are located on the east coast of the United States in
+                Vint Hill, Virginia. More regions to come in the future!
               </p>
             </details>
 
@@ -460,7 +454,7 @@
                 </span>
                 Can I increase the storage on my server?
               </summary>
-              <p class="m-0 !leading-[190%]">
+              <p class="m-0 ml-6 leading-[160%]">
                 Yes, storage can be increased on your server at no additional cost. If you need more
                 storage, reach out to Modrinth Support.
               </p>
@@ -471,13 +465,19 @@
                 <span class="mr-2 transition-transform duration-200 group-open:rotate-90">
                   <RightArrowIcon />
                 </span>
-                How fast are Modrinth Servers? How many players can they handle?
+                How fast are Modrinth Servers?
               </summary>
-              <p class="m-0 !leading-[190%]">
-                During the Modrinth "Emergency SMP" test, we had over 80 players on a server running
-                on the Large plan. The server ran smoothly and was only limited by RAM. We're
-                confident that Modrinth Servers can handle a large number of players, with any kind
-                of modpack.
+              <p class="m-0 ml-6 leading-[160%]">
+                Modrinth Servers are hosted on very modern high-performance hardware, but it's tough
+                to say how exactly that will translate into how fast your server will run because
+                there are so many factors that affect it, such as the mods, data packs, or plugins
+                you're running on your server, and even user behavior.
+              </p>
+              <p class="mb-0 ml-6 mt-3 leading-[160%]">
+                Most performance issues that arise tend to be the fault of an unoptimized modpack,
+                mod, data pack, or plugin that causes the server to lag. Since our servers are very
+                high-end, you shouldn't run into much trouble as long as you pick an appropriate
+                plan for the content you're running on the server.
               </p>
             </details>
           </div>
@@ -486,6 +486,7 @@
     </section>
 
     <section
+      v-if="false"
       class="relative mt-24 flex flex-col bg-[radial-gradient(65%_50%_at_50%_-10%,var(--color-brand-highlight)_0%,var(--color-accent-contrast)_100%)] px-3 pt-24 md:mt-48 md:pt-48"
     >
       <div class="faded-brand-line absolute left-0 top-0 h-[1px] w-full"></div>
@@ -596,182 +597,49 @@
         </h2>
 
         <ul class="m-0 mt-8 flex w-full flex-col gap-8 p-0 lg:flex-row">
-          <li class="relative flex w-full flex-col justify-between pt-12 lg:w-1/3">
-            <div
-              v-if="isSmallLowStock"
-              class="absolute left-0 right-0 top-[-2px] rounded-t-2xl bg-yellow-500/20 p-4 text-center font-bold"
-            >
-              Only {{ capacityStatuses?.small?.available }} left in stock!
-            </div>
-            <div
-              class="flex w-full flex-col justify-between gap-4 rounded-2xl bg-bg p-8 text-left"
-              :class="{ '!rounded-t-none': isSmallLowStock }"
-            >
-              <div class="flex flex-col gap-4">
-                <div class="flex flex-row items-center justify-between">
-                  <h1 class="m-0">Small</h1>
-                  <div
-                    class="grid size-8 place-content-center rounded-full bg-highlight-blue text-xs font-bold text-blue"
-                  >
-                    S
-                  </div>
-                </div>
-                <p class="m-0">
-                  Perfect for vanilla multiplayer, small friend groups, SMPs, and light modding.
-                </p>
-                <div class="flex flex-row flex-wrap items-center gap-3 text-nowrap">
-                  <p class="m-0">4 GB RAM</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">4 vCPUs</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">32 GB Storage</p>
-                </div>
-                <h2 class="m-0 text-3xl text-contrast">
-                  $12<span class="text-sm font-normal text-secondary">/month</span>
-                </h2>
-              </div>
-              <ButtonStyled color="blue" size="large">
-                <a
-                  v-if="!loggedOut && isSmallAtCapacity"
-                  :href="outOfStockUrl"
-                  target="_blank"
-                  class="flex items-center gap-2 !bg-highlight-blue !font-medium !text-blue"
-                >
-                  Out of Stock
-                  <ExternalIcon class="!min-h-4 !min-w-4 !text-blue" />
-                </a>
-                <button
-                  v-else
-                  class="!bg-highlight-blue !font-medium !text-blue"
-                  @click="selectProduct('small')"
-                >
-                  Get Started
-                  <RightArrowIcon class="!min-h-4 !min-w-4 !text-blue" />
-                </button>
-              </ButtonStyled>
-            </div>
-          </li>
-
-          <li class="relative flex w-full flex-col justify-between pt-12 lg:w-1/3">
-            <div
-              v-if="isMediumLowStock"
-              class="absolute left-0 right-0 top-[-2px] rounded-t-2xl bg-yellow-500/20 p-4 text-center font-bold"
-            >
-              Only {{ capacityStatuses?.medium?.available }} left in stock!
-            </div>
-            <div
-              style="
-                background: radial-gradient(
-                  86.12% 101.64% at 95.97% 94.07%,
-                  rgba(27, 217, 106, 0.23) 0%,
-                  rgba(14, 115, 56, 0.2) 100%
-                );
-                border: 1px solid rgba(12, 107, 52, 0.55);
-                box-shadow: 0px 12px 38.1px rgba(27, 217, 106, 0.13);
-              "
-              class="flex w-full flex-col justify-between gap-4 rounded-2xl p-8 text-left"
-              :class="{ '!rounded-t-none': isMediumLowStock }"
-            >
-              <div class="flex flex-col gap-4">
-                <div class="flex flex-row items-center justify-between">
-                  <h1 class="m-0">Medium</h1>
-                  <div
-                    class="grid size-8 place-content-center rounded-full bg-highlight-green text-xs font-bold text-brand"
-                  >
-                    M
-                  </div>
-                </div>
-                <p class="m-0">Great for modded multiplayer and small communities.</p>
-                <div class="flex flex-row flex-wrap items-center gap-3 text-nowrap">
-                  <p class="m-0">6 GB RAM</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">6 vCPUs</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">48 GB Storage</p>
-                </div>
-                <h2 class="m-0 text-3xl text-contrast">
-                  $18<span class="text-sm font-normal text-secondary">/month</span>
-                </h2>
-              </div>
-              <ButtonStyled color="brand" size="large">
-                <a
-                  v-if="!loggedOut && isMediumAtCapacity"
-                  :href="outOfStockUrl"
-                  target="_blank"
-                  class="flex items-center gap-2 !bg-highlight-green !font-medium !text-green"
-                >
-                  Out of Stock
-                  <ExternalIcon class="!min-h-4 !min-w-4 !text-green" />
-                </a>
-                <button
-                  v-else
-                  class="!bg-highlight-green !font-medium !text-green"
-                  @click="selectProduct('medium')"
-                >
-                  Get Started
-                  <RightArrowIcon class="!min-h-4 !min-w-4 !text-green" />
-                </button>
-              </ButtonStyled>
-            </div>
-          </li>
-
-          <li class="relative flex w-full flex-col justify-between pt-12 lg:w-1/3">
-            <div
-              v-if="isLargeLowStock"
-              class="absolute left-0 right-0 top-[-2px] rounded-t-2xl bg-yellow-500/20 p-4 text-center font-bold"
-            >
-              Only {{ capacityStatuses?.large?.available }} left in stock!
-            </div>
-            <div
-              class="flex w-full flex-col justify-between gap-4 rounded-2xl bg-bg p-8 text-left"
-              :class="{ '!rounded-t-none': isLargeLowStock }"
-            >
-              <div class="flex flex-col gap-4">
-                <div class="flex flex-row items-center justify-between">
-                  <h1 class="m-0">Large</h1>
-                  <div
-                    class="grid size-8 place-content-center rounded-full bg-highlight-purple text-xs font-bold text-purple"
-                  >
-                    L
-                  </div>
-                </div>
-                <p class="m-0">Ideal for larger communities, modpacks, and heavy modding.</p>
-                <div class="flex flex-row flex-wrap items-center gap-3 text-nowrap">
-                  <p class="m-0">8 GB RAM</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">8 vCPUs</p>
-                  <div class="size-1.5 rounded-full bg-secondary opacity-25"></div>
-                  <p class="m-0">64 GB Storage</p>
-                </div>
-                <h2 class="m-0 text-3xl text-contrast">
-                  $24<span class="text-sm font-normal text-secondary">/month</span>
-                </h2>
-              </div>
-              <ButtonStyled color="brand" size="large">
-                <a
-                  v-if="!loggedOut && isLargeAtCapacity"
-                  :href="outOfStockUrl"
-                  target="_blank"
-                  class="flex items-center gap-2 !bg-highlight-purple !font-medium !text-purple"
-                >
-                  Out of Stock
-                  <ExternalIcon class="!min-h-4 !min-w-4 !text-purple" />
-                </a>
-                <button
-                  v-else
-                  class="!bg-highlight-purple !font-medium !text-purple"
-                  @click="selectProduct('large')"
-                >
-                  Get Started
-                  <RightArrowIcon class="!min-h-4 !min-w-4 !text-purple" />
-                </button>
-              </ButtonStyled>
-            </div>
-          </li>
+          <ServerPlanSelector
+            :capacity="capacityStatuses?.small?.available"
+            plan="small"
+            :ram="plans.small.metadata.ram"
+            :storage="plans.small.metadata.storage"
+            :cpus="plans.small.metadata.cpu"
+            :price="
+              plans.small?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
+                ?.monthly
+            "
+            @select="selectProduct('small')"
+            @scroll-to-faq="scrollToFaq()"
+          />
+          <ServerPlanSelector
+            :capacity="capacityStatuses?.medium?.available"
+            plan="medium"
+            :ram="plans.medium.metadata.ram"
+            :storage="plans.medium.metadata.storage"
+            :cpus="plans.medium.metadata.cpu"
+            :price="
+              plans.medium?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
+                ?.monthly
+            "
+            @select="selectProduct('medium')"
+            @scroll-to-faq="scrollToFaq()"
+          />
+          <ServerPlanSelector
+            :capacity="capacityStatuses?.large?.available"
+            :ram="plans.large.metadata.ram"
+            :storage="plans.large.metadata.storage"
+            :cpus="plans.large.metadata.cpu"
+            :price="
+              plans.large?.prices?.find((x) => x.currency_code === 'USD')?.prices?.intervals
+                ?.monthly
+            "
+            plan="large"
+            @select="selectProduct('large')"
+            @scroll-to-faq="scrollToFaq()"
+          />
         </ul>
 
         <div
-          class="mb-4 flex w-full flex-col items-start justify-between gap-4 rounded-2xl bg-bg p-8 text-left lg:flex-row lg:gap-0"
+          class="mb-24 flex w-full flex-col items-start justify-between gap-4 rounded-2xl bg-bg p-8 text-left lg:flex-row lg:gap-0"
         >
           <div class="flex flex-col gap-4">
             <h1 class="m-0">Build your own</h1>
@@ -781,11 +649,13 @@
             </h2>
           </div>
 
-          <div class="flex w-full flex-col-reverse gap-2 md:w-auto md:flex-col md:items-center">
+          <div
+            class="experimental-styles-within flex w-full flex-col-reverse gap-2 md:w-auto md:flex-col md:items-center"
+          >
             <ButtonStyled color="standard" size="large">
               <button class="w-full md:w-fit" @click="selectProduct('custom')">
                 Build your own
-                <RightArrowIcon class="!min-h-4 !min-w-4" />
+                <RightArrowIcon class="shrink-0" />
               </button>
             </ButtonStyled>
             <p class="m-0 text-sm">Starting at $3/GB RAM</p>
@@ -802,9 +672,6 @@ import {
   BoxIcon,
   GameIcon,
   RightArrowIcon,
-  SearchIcon,
-  SortAscendingIcon,
-  ExternalIcon,
   TerminalSquareIcon,
   TransferIcon,
   VersionIcon,
@@ -813,6 +680,7 @@ import {
 import { products } from "~/generated/state.json";
 import LoaderIcon from "~/components/ui/servers/icons/LoaderIcon.vue";
 import Globe from "~/components/ui/servers/Globe.vue";
+import ServerPlanSelector from "~/components/ui/servers/marketing/ServerPlanSelector.vue";
 
 const pyroProducts = products.filter((p) => p.metadata.type === "pyro");
 const pyroPlanProducts = pyroProducts.filter(
@@ -893,6 +761,7 @@ async function fetchCapacityStatuses(customProduct = null) {
           swap_mb: product.metadata.swap,
           storage_mb: product.metadata.storage,
         },
+        bypassAuth: true,
       }),
     );
 
@@ -931,21 +800,6 @@ const isMediumAtCapacity = computed(() => capacityStatuses.value?.medium?.availa
 const isLargeAtCapacity = computed(() => capacityStatuses.value?.large?.available === 0);
 const isCustomAtCapacity = computed(() => capacityStatuses.value?.custom?.available === 0);
 
-const isSmallLowStock = computed(() => {
-  const available = capacityStatuses.value?.small?.available;
-  return available !== undefined && available > 0 && available < 8;
-});
-
-const isMediumLowStock = computed(() => {
-  const available = capacityStatuses.value?.medium?.available;
-  return available !== undefined && available > 0 && available < 8;
-});
-
-const isLargeLowStock = computed(() => {
-  const available = capacityStatuses.value?.large?.available;
-  return available !== undefined && available > 0 && available < 8;
-});
-
 const startTyping = () => {
   const currentWord = words[currentWordIndex.value];
   if (isDeleting.value) {
diff --git a/apps/frontend/src/pages/settings/billing/index.vue b/apps/frontend/src/pages/settings/billing/index.vue
index 29e93f7c..893721eb 100644
--- a/apps/frontend/src/pages/settings/billing/index.vue
+++ b/apps/frontend/src/pages/settings/billing/index.vue
@@ -196,7 +196,10 @@
                 <div class="mt-2 flex flex-col gap-2">
                   <div class="flex items-center gap-2">
                     <CheckCircleIcon class="h-5 w-5 text-brand" />
-                    <span> {{ getPyroProduct(subscription)?.metadata?.cpu }} vCores (CPU) </span>
+                    <span>
+                      {{ getPyroProduct(subscription)?.metadata?.cpu / 2 }} Shared CPUs (Bursts up
+                      to {{ getPyroProduct(subscription)?.metadata?.cpu }} CPUs)
+                    </span>
                   </div>
                   <div class="flex items-center gap-2">
                     <CheckCircleIcon class="h-5 w-5 text-brand" />
diff --git a/packages/ui/src/components/base/ButtonStyled.vue b/packages/ui/src/components/base/ButtonStyled.vue
index abcbd755..4be4a2fc 100644
--- a/packages/ui/src/components/base/ButtonStyled.vue
+++ b/packages/ui/src/components/base/ButtonStyled.vue
@@ -6,7 +6,7 @@ const props = withDefaults(
     color?: 'standard' | 'brand' | 'red' | 'orange' | 'green' | 'blue' | 'purple'
     size?: 'standard' | 'large'
     circular?: boolean
-    type?: 'standard' | 'outlined' | 'transparent' | 'highlight'
+    type?: 'standard' | 'outlined' | 'transparent' | 'highlight' | 'highlight-colored-text'
     colorFill?: 'auto' | 'background' | 'text' | 'none'
     hoverColorFill?: 'auto' | 'background' | 'text' | 'none'
     highlightedStyle?: 'main-nav-primary' | 'main-nav-secondary'
@@ -24,20 +24,40 @@ const props = withDefaults(
   },
 )
 
+const highlightedColorVar = computed(() => {
+  switch (props.color) {
+    case 'brand':
+      return 'var(--color-brand-highlight)'
+    case 'red':
+      return 'var(--color-red-highlight)'
+    case 'orange':
+      return 'var(--color-orange-highlight)'
+    case 'green':
+      return 'var(--color-green-highlight)'
+    case 'blue':
+      return 'var(--color-blue-highlight)'
+    case 'purple':
+      return 'var(--color-purple-highlight)'
+    case 'standard':
+    default:
+      return null
+  }
+})
+
 const colorVar = computed(() => {
   switch (props.color) {
     case 'brand':
-      return props.type === 'highlight' ? 'var(--color-brand-highlight)' : 'var(--color-brand)'
+      return 'var(--color-brand)'
     case 'red':
-      return props.type === 'highlight' ? 'var(--color-red-highlight)' : 'var(--color-red)'
+      return 'var(--color-red)'
     case 'orange':
-      return props.type === 'highlight' ? 'var(--color-orange-highlight)' : 'var(--color-orange)'
+      return 'var(--color-orange)'
     case 'green':
-      return props.type === 'highlight' ? 'var(--color-green-highlight)' : 'var(--color-green)'
+      return 'var(--color-green)'
     case 'blue':
-      return props.type === 'highlight' ? 'var(--color-blue-highlight)' : 'var(--color-blue)'
+      return 'var(--color-blue)'
     case 'purple':
-      return props.type === 'highlight' ? 'var(--color-purple-highlight)' : 'var(--color-purple)'
+      return 'var(--color-purple)'
     case 'standard':
     default:
       return null
@@ -111,10 +131,14 @@ function setColorFill(
 ): { bg: string; text: string } {
   if (colorVar.value) {
     if (fill === 'background') {
-      colors.bg = colorVar.value
-      if (props.type === 'highlight') {
+      if (props.type === 'highlight' && highlightedColorVar.value) {
+        colors.bg = highlightedColorVar.value
         colors.text = 'var(--color-contrast)'
+      } else if (props.type === 'highlight-colored-text' && highlightedColorVar.value) {
+        colors.bg = highlightedColorVar.value
+        colors.text = colorVar.value
       } else {
+        colors.bg = colorVar.value
         colors.text = 'var(--color-accent-contrast)'
       }
     } else if (fill === 'text') {
diff --git a/packages/ui/src/components/billing/PurchaseModal.vue b/packages/ui/src/components/billing/PurchaseModal.vue
index 00d6710b..65d92dae 100644
--- a/packages/ui/src/components/billing/PurchaseModal.vue
+++ b/packages/ui/src/components/billing/PurchaseModal.vue
@@ -106,13 +106,16 @@
           </p>
           <IssuesIcon
             v-if="customServerConfig.ramInGb < 4"
-            v-tooltip="'This might not be enough resources for your Minecraft server.'"
+            v-tooltip="'This might not be powerful enough for your Minecraft server.'"
             class="h-6 w-6 text-orange"
           />
         </div>
         <p v-if="existingPlan" class="mt-1 mb-2 text-secondary">
           Your current plan has <strong>{{ existingPlan.metadata.ram / 1024 }} GB RAM</strong> and
-          <strong>{{ existingPlan.metadata.cpu }} vCPUs</strong>.
+          <strong
+            >{{ existingPlan.metadata.cpu / 2 }} shared CPUs (bursts up to
+            {{ existingPlan.metadata.cpu }} CPUs)</strong
+          >.
         </p>
         <div class="flex flex-col gap-4">
           <div class="flex w-full gap-2 items-center">
@@ -131,12 +134,28 @@
             class="flex sm:flex-row flex-col gap-4 w-full"
           >
             <div class="flex flex-col w-full gap-2">
-              <div class="font-semibold">vCPUs</div>
-              <input v-model="mutatedProduct.metadata.cpu" disabled class="input" />
+              <div class="font-semibold">Shared CPUs</div>
+              <input :value="sharedCpus" disabled class="input w-full" />
+            </div>
+            <div class="flex flex-col w-full gap-2">
+              <div class="font-semibold flex items-center gap-1">
+                Max Burst CPUs
+                <UnknownIcon
+                  v-tooltip="
+                    'CPU bursting allows your server to temporarily use additional threads to help mitigate TPS spikes. See Modrinth Servers FAQ for more info.'
+                  "
+                  class="h-4 w-4text-secondary opacity-60"
+                />
+              </div>
+              <input :value="mutatedProduct.metadata.cpu" disabled class="input w-full" />
             </div>
             <div class="flex flex-col w-full gap-2">
               <div class="font-semibold">Storage</div>
-              <input v-model="customServerConfig.storageGbFormatted" disabled class="input" />
+              <input
+                v-model="customServerConfig.storageGbFormatted"
+                disabled
+                class="input w-full"
+              />
             </div>
           </div>
           <Admonition
@@ -153,10 +172,11 @@
             later, or try a different amount.
           </Admonition>
 
-          <div class="flex items-center gap-2">
-            <InfoIcon class="hidden sm:block" />
+          <div class="flex gap-2">
+            <InfoIcon class="hidden sm:block shrink-0 mt-1" />
             <span class="text-sm text-secondary">
-              Storage and vCPUs are currently not configurable.
+              Storage and shared CPU count are currently not configurable independently, and are
+              based on the amount of RAM you select.
             </span>
           </div>
         </div>
@@ -500,6 +520,7 @@
 import { ref, computed, nextTick, reactive, watch } from 'vue'
 import NewModal from '../modal/NewModal.vue'
 import {
+  UnknownIcon,
   SpinnerIcon,
   CardIcon,
   CheckCircleIcon,
@@ -765,7 +786,11 @@ function updateRamValues() {
   customMinRam.value = Math.min(...ramValues)
   customMaxRam.value = Math.max(...ramValues)
 
-  customServerConfig.ramInGb = customMinRam.value
+  if (props.product.some((product) => product.metadata.ram / 1024 === 4)) {
+    customServerConfig.ramInGb = 4
+  } else {
+    customServerConfig.ramInGb = customMinRam.value
+  }
 }
 
 if (props.customServer) {
@@ -832,6 +857,10 @@ const metadata = computed(() => {
   return null
 })
 
+const sharedCpus = computed(() => {
+  return (mutatedProduct.value?.metadata?.cpu ?? 0) / 2
+})
+
 function nextStep() {
   if (
     mutatedProduct.value.metadata.type === 'pyro' &&
diff --git a/packages/utils/changelog.ts b/packages/utils/changelog.ts
index eaf6fc35..4da01f34 100644
--- a/packages/utils/changelog.ts
+++ b/packages/utils/changelog.ts
@@ -10,6 +10,12 @@ export type VersionEntry = {
 }
 
 const VERSIONS: VersionEntry[] = [
+  {
+    date: `2025-04-18T22:30:00-07:00`,
+    product: 'web',
+    body: `### Improvements
+- Updated Modrinth Servers marketing page to be accurate to post-Pyro infrastructure.`,
+  },
   {
     date: `2025-04-17T02:25:00-07:00`,
     product: 'servers',

From 3cd6718384fa5fa172d026aa932245d097312688 Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sat, 19 Apr 2025 08:25:43 -0400
Subject: [PATCH 23/28] Fix inverted condition with refunds (#3539)

Signed-off-by: Emma Alexia <emma@modrinth.com>
---
 apps/labrinth/src/routes/internal/billing.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/labrinth/src/routes/internal/billing.rs b/apps/labrinth/src/routes/internal/billing.rs
index 7ef81028..8eefe0f2 100644
--- a/apps/labrinth/src/routes/internal/billing.rs
+++ b/apps/labrinth/src/routes/internal/billing.rs
@@ -206,7 +206,7 @@ pub async fn refund_charge(
             ));
         }
 
-        let (id, net) = if refund_amount != 0 {
+        let (id, net) = if refund_amount == 0 {
             (None, None)
         } else {
             match charge.payment_platform {

From 5c1f1983979b8719466e9e416cbcc97ae9418551 Mon Sep 17 00:00:00 2001
From: Emma Alexia <emma@modrinth.com>
Date: Sat, 19 Apr 2025 08:49:23 -0400
Subject: [PATCH 24/28] Add ability to delete user icon (#3383)

* Add user icon delete route

By request of moderation, but also just generally nice to have

* Add relevant docs and frontend

* Add v2 version
---
 apps/docs/public/openapi.yaml                 | 20 ++++++-
 apps/frontend/src/pages/settings/profile.vue  | 21 +++++++-
 ...cfcb9e6a117a4efc070438606e4c94103a9a4.json | 14 +++++
 apps/labrinth/src/routes/v2/users.rs          | 23 ++++++++
 apps/labrinth/src/routes/v3/users.rs          | 54 +++++++++++++++++++
 packages/ui/src/utils/common-messages.ts      |  4 ++
 6 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 apps/labrinth/.sqlx/query-483cb875ba81c7563a2f7220158cfcb9e6a117a4efc070438606e4c94103a9a4.json

diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index da9504ae..94332db3 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: '3.0.0'
 
 info:
-  version: v2.7.0/15cf3fc
+  version: v2.7.0/366f528
   title: Labrinth
   termsOfService: https://modrinth.com/legal/terms
   contact:
@@ -3018,6 +3018,24 @@ paths:
                 $ref: '#/components/schemas/InvalidInputError'
         '404':
           description: The requested item(s) were not found or no authorization to access the requested item(s)
+    delete:
+      summary: Remove user's avatar
+      operationId: deleteUserIcon
+      tags:
+        - users
+      security:
+        - TokenAuth: ['USER_WRITE']
+      responses:
+        '204':
+          description: Expected response to a valid request
+        '400':
+          description: Request was invalid, see given error
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/InvalidInputError'
+        '404':
+          description: The requested item(s) were not found or no authorization to access the requested item(s)
   /user/{id|username}/projects:
     parameters:
       - $ref: '#/components/parameters/UserIdentifier'
diff --git a/apps/frontend/src/pages/settings/profile.vue b/apps/frontend/src/pages/settings/profile.vue
index 1fd3e4e0..7395c1d4 100644
--- a/apps/frontend/src/pages/settings/profile.vue
+++ b/apps/frontend/src/pages/settings/profile.vue
@@ -32,6 +32,10 @@
           >
             <UploadIcon />
           </FileInput>
+          <Button v-if="avatarUrl !== null" :action="removePreviewImage">
+            <TrashIcon />
+            {{ formatMessage(commonMessages.removeImageButton) }}
+          </Button>
           <Button
             v-if="previewImage"
             :action="
@@ -86,7 +90,7 @@
 </template>
 
 <script setup>
-import { UserIcon, SaveIcon, UploadIcon, UndoIcon, XIcon } from "@modrinth/assets";
+import { UserIcon, SaveIcon, UploadIcon, UndoIcon, XIcon, TrashIcon } from "@modrinth/assets";
 import { Avatar, FileInput, Button, commonMessages } from "@modrinth/ui";
 
 useHead({
@@ -142,6 +146,7 @@ const bio = ref(auth.value.user.bio);
 const avatarUrl = ref(auth.value.user.avatar_url);
 const icon = shallowRef(null);
 const previewImage = shallowRef(null);
+const pendingAvatarDeletion = ref(false);
 const saved = ref(false);
 
 const hasUnsavedChanges = computed(
@@ -160,9 +165,15 @@ function showPreviewImage(files) {
   };
 }
 
+function removePreviewImage() {
+  pendingAvatarDeletion.value = true;
+  previewImage.value = "https://cdn.modrinth.com/placeholder.png";
+}
+
 function cancel() {
   icon.value = null;
   previewImage.value = null;
+  pendingAvatarDeletion.value = false;
   username.value = auth.value.user.username;
   bio.value = auth.value.user.bio;
 }
@@ -170,6 +181,14 @@ function cancel() {
 async function saveChanges() {
   startLoading();
   try {
+    if (pendingAvatarDeletion.value) {
+      await useBaseFetch(`user/${auth.value.user.id}/icon`, {
+        method: "DELETE",
+      });
+      pendingAvatarDeletion.value = false;
+      previewImage.value = null;
+    }
+
     if (icon.value) {
       await useBaseFetch(
         `user/${auth.value.user.id}/icon?ext=${
diff --git a/apps/labrinth/.sqlx/query-483cb875ba81c7563a2f7220158cfcb9e6a117a4efc070438606e4c94103a9a4.json b/apps/labrinth/.sqlx/query-483cb875ba81c7563a2f7220158cfcb9e6a117a4efc070438606e4c94103a9a4.json
new file mode 100644
index 00000000..8fa7eb72
--- /dev/null
+++ b/apps/labrinth/.sqlx/query-483cb875ba81c7563a2f7220158cfcb9e6a117a4efc070438606e4c94103a9a4.json
@@ -0,0 +1,14 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n            UPDATE users\n            SET avatar_url = NULL, raw_avatar_url = NULL\n            WHERE (id = $1)\n            ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "483cb875ba81c7563a2f7220158cfcb9e6a117a4efc070438606e4c94103a9a4"
+}
diff --git a/apps/labrinth/src/routes/v2/users.rs b/apps/labrinth/src/routes/v2/users.rs
index 065a2e14..0fcc4b62 100644
--- a/apps/labrinth/src/routes/v2/users.rs
+++ b/apps/labrinth/src/routes/v2/users.rs
@@ -27,6 +27,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .service(user_delete)
             .service(user_edit)
             .service(user_icon_edit)
+            .service(user_icon_delete)
             .service(user_notifications)
             .service(user_follows),
     );
@@ -223,6 +224,28 @@ pub async fn user_icon_edit(
     .or_else(v2_reroute::flatten_404_error)
 }
 
+#[delete("{id}/icon")]
+pub async fn user_icon_delete(
+    req: HttpRequest,
+    info: web::Path<(String,)>,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    file_host: web::Data<Arc<dyn FileHost + Send + Sync>>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<HttpResponse, ApiError> {
+    // Returns NoContent, so we don't need to convert to V2
+    v3::users::user_icon_delete(
+        req,
+        info,
+        pool,
+        redis,
+        file_host,
+        session_queue,
+    )
+    .await
+    .or_else(v2_reroute::flatten_404_error)
+}
+
 #[delete("{id}")]
 pub async fn user_delete(
     req: HttpRequest,
diff --git a/apps/labrinth/src/routes/v3/users.rs b/apps/labrinth/src/routes/v3/users.rs
index a0f4111a..987bfa52 100644
--- a/apps/labrinth/src/routes/v3/users.rs
+++ b/apps/labrinth/src/routes/v3/users.rs
@@ -38,6 +38,7 @@ pub fn config(cfg: &mut web::ServiceConfig) {
             .route("{user_id}/organizations", web::get().to(orgs_list))
             .route("{id}", web::patch().to(user_edit))
             .route("{id}/icon", web::patch().to(user_icon_edit))
+            .route("{id}/icon", web::delete().to(user_icon_delete))
             .route("{id}", web::delete().to(user_delete))
             .route("{id}/follows", web::get().to(user_follows))
             .route("{id}/notifications", web::get().to(user_notifications))
@@ -623,6 +624,59 @@ pub async fn user_icon_edit(
     }
 }
 
+pub async fn user_icon_delete(
+    req: HttpRequest,
+    info: web::Path<(String,)>,
+    pool: web::Data<PgPool>,
+    redis: web::Data<RedisPool>,
+    file_host: web::Data<Arc<dyn FileHost + Send + Sync>>,
+    session_queue: web::Data<AuthQueue>,
+) -> Result<HttpResponse, ApiError> {
+    let user = get_user_from_headers(
+        &req,
+        &**pool,
+        &redis,
+        &session_queue,
+        Some(&[Scopes::USER_WRITE]),
+    )
+    .await?
+    .1;
+    let id_option = User::get(&info.into_inner().0, &**pool, &redis).await?;
+
+    if let Some(actual_user) = id_option {
+        if user.id != actual_user.id.into() && !user.role.is_mod() {
+            return Err(ApiError::CustomAuthentication(
+                "You don't have permission to edit this user's icon."
+                    .to_string(),
+            ));
+        }
+
+        delete_old_images(
+            actual_user.avatar_url,
+            actual_user.raw_avatar_url,
+            &***file_host,
+        )
+        .await?;
+
+        sqlx::query!(
+            "
+            UPDATE users
+            SET avatar_url = NULL, raw_avatar_url = NULL
+            WHERE (id = $1)
+            ",
+            actual_user.id as crate::database::models::ids::UserId,
+        )
+        .execute(&**pool)
+        .await?;
+
+        User::clear_caches(&[(actual_user.id, None)], &redis).await?;
+
+        Ok(HttpResponse::NoContent().body(""))
+    } else {
+        Err(ApiError::NotFound)
+    }
+}
+
 pub async fn user_delete(
     req: HttpRequest,
     info: web::Path<(String,)>,
diff --git a/packages/ui/src/utils/common-messages.ts b/packages/ui/src/utils/common-messages.ts
index 30605b7f..997c1a9a 100644
--- a/packages/ui/src/utils/common-messages.ts
+++ b/packages/ui/src/utils/common-messages.ts
@@ -153,6 +153,10 @@ export const commonMessages = defineMessages({
     id: 'button.upload-image',
     defaultMessage: 'Upload image',
   },
+  removeImageButton: {
+    id: 'button.remove-image',
+    defaultMessage: 'Remove image',
+  },
   visibilityLabel: {
     id: 'label.visibility',
     defaultMessage: 'Visibility',

From 59e18b31043cde026370b6bc6301df726fee951a Mon Sep 17 00:00:00 2001
From: MikeyPants <michael.a.hazan@gmail.com>
Date: Sat, 19 Apr 2025 16:05:43 +0300
Subject: [PATCH 25/28] fix(apps/frontend): error data can be undefined (#3513)

---
 apps/frontend/src/components/ui/ModalCreation.vue      |  2 +-
 apps/frontend/src/components/ui/NotificationItem.vue   |  2 +-
 .../src/components/ui/OrganizationCreateModal.vue      |  2 +-
 apps/frontend/src/pages/[type]/[id].vue                |  6 +++---
 .../src/pages/[type]/[id]/version/[version].vue        |  2 +-
 apps/frontend/src/pages/collection/[id].vue            |  2 +-
 apps/frontend/src/pages/dashboard/revenue/index.vue    |  2 +-
 .../frontend/src/pages/dashboard/revenue/transfers.vue |  2 +-
 apps/frontend/src/pages/dashboard/revenue/withdraw.vue |  2 +-
 apps/frontend/src/pages/settings/account.vue           | 10 +++++-----
 apps/frontend/src/pages/settings/sessions.vue          |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/apps/frontend/src/components/ui/ModalCreation.vue b/apps/frontend/src/components/ui/ModalCreation.vue
index 1de76a95..bfc5b140 100644
--- a/apps/frontend/src/components/ui/ModalCreation.vue
+++ b/apps/frontend/src/components/ui/ModalCreation.vue
@@ -183,7 +183,7 @@ async function createProject() {
     app.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/components/ui/NotificationItem.vue b/apps/frontend/src/components/ui/NotificationItem.vue
index 329b85fa..1dabdc7b 100644
--- a/apps/frontend/src/components/ui/NotificationItem.vue
+++ b/apps/frontend/src/components/ui/NotificationItem.vue
@@ -430,7 +430,7 @@ async function performAction(notification, actionIndex) {
     app.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/components/ui/OrganizationCreateModal.vue b/apps/frontend/src/components/ui/OrganizationCreateModal.vue
index 958c3fcd..c9e96663 100644
--- a/apps/frontend/src/components/ui/OrganizationCreateModal.vue
+++ b/apps/frontend/src/components/ui/OrganizationCreateModal.vue
@@ -106,7 +106,7 @@ async function createOrganization() {
     addNotification({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index 80f9ff22..f97367cd 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -1346,7 +1346,7 @@ async function setProcessing() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
@@ -1389,7 +1389,7 @@ async function patchProject(resData, quiet = false) {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
     window.scrollTo({ top: 0, behavior: "smooth" });
@@ -1426,7 +1426,7 @@ async function patchIcon(icon) {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
 
diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index b758a7fd..c0d84bcb 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -1136,7 +1136,7 @@ export default defineNuxtComponent({
         this.$notify({
           group: "main",
           title: "An error occurred",
-          text: err.data.description,
+          text: err.data ? err.data.description : err,
           type: "error",
         });
         window.scrollTo({ top: 0, behavior: "smooth" });
diff --git a/apps/frontend/src/pages/collection/[id].vue b/apps/frontend/src/pages/collection/[id].vue
index c820b391..f8c792cd 100644
--- a/apps/frontend/src/pages/collection/[id].vue
+++ b/apps/frontend/src/pages/collection/[id].vue
@@ -697,7 +697,7 @@ async function deleteCollection() {
     addNotification({
       group: "main",
       title: formatMessage(commonMessages.errorNotificationTitle),
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/dashboard/revenue/index.vue b/apps/frontend/src/pages/dashboard/revenue/index.vue
index 91f56cf1..bded3c84 100644
--- a/apps/frontend/src/pages/dashboard/revenue/index.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/index.vue
@@ -205,7 +205,7 @@ async function updateVenmo() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/dashboard/revenue/transfers.vue b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
index d2fc96c7..8325a5ee 100644
--- a/apps/frontend/src/pages/dashboard/revenue/transfers.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/transfers.vue
@@ -158,7 +158,7 @@ async function cancelPayout(id) {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/dashboard/revenue/withdraw.vue b/apps/frontend/src/pages/dashboard/revenue/withdraw.vue
index 01d7a5fd..4f5342da 100644
--- a/apps/frontend/src/pages/dashboard/revenue/withdraw.vue
+++ b/apps/frontend/src/pages/dashboard/revenue/withdraw.vue
@@ -369,7 +369,7 @@ async function withdraw() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/settings/account.vue b/apps/frontend/src/pages/settings/account.vue
index f383684d..a4c535b8 100644
--- a/apps/frontend/src/pages/settings/account.vue
+++ b/apps/frontend/src/pages/settings/account.vue
@@ -463,7 +463,7 @@ async function saveEmail() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
@@ -495,7 +495,7 @@ async function savePassword() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
@@ -532,7 +532,7 @@ async function showTwoFactorModal() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
@@ -622,7 +622,7 @@ async function deleteAccount() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
@@ -652,7 +652,7 @@ async function exportData() {
     data.$notify({
       group: "main",
       title: "An error occurred",
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }
diff --git a/apps/frontend/src/pages/settings/sessions.vue b/apps/frontend/src/pages/settings/sessions.vue
index 5dc0da0e..804256f6 100644
--- a/apps/frontend/src/pages/settings/sessions.vue
+++ b/apps/frontend/src/pages/settings/sessions.vue
@@ -119,7 +119,7 @@ async function revokeSession(id) {
     data.$notify({
       group: "main",
       title: formatMessage(commonMessages.errorNotificationTitle),
-      text: err.data.description,
+      text: err.data ? err.data.description : err,
       type: "error",
     });
   }

From 182119aedff9cfa9f5ff5c1ab3b5b83cb21a3502 Mon Sep 17 00:00:00 2001
From: "Calum H." <hendersoncal117@gmail.com>
Date: Sat, 19 Apr 2025 14:10:34 +0100
Subject: [PATCH 26/28] feat: modrinth maven developer mode additions (#3498)

* feat: modrinth maven copy string in developer mode

* feat: Modrinth maven in versions list dropdown for developer mode.

* fix: lint
---
 .../src/pages/[type]/[id]/version/[version].vue      | 12 ++++++++++++
 apps/frontend/src/pages/[type]/[id]/versions.vue     | 11 +++++++++++
 2 files changed, 23 insertions(+)

diff --git a/apps/frontend/src/pages/[type]/[id]/version/[version].vue b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
index c0d84bcb..fcd5f21e 100644
--- a/apps/frontend/src/pages/[type]/[id]/version/[version].vue
+++ b/apps/frontend/src/pages/[type]/[id]/version/[version].vue
@@ -621,6 +621,12 @@
           <h4>Version ID</h4>
           <CopyCode :text="version.id" />
         </div>
+        <div v-if="!isEditing && flags.developerMode">
+          <h4>Modrinth Maven</h4>
+          <div class="maven-section">
+            <CopyCode :text="`maven.modrinth:${project.id}:${version.id}`" />
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -1545,6 +1551,12 @@ export default defineNuxtComponent({
     margin: 1rem 0 0.25rem 0;
   }
 
+  .maven-section {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+  }
+
   .team-member {
     align-items: center;
     padding: 0.25rem 0.5rem;
diff --git a/apps/frontend/src/pages/[type]/[id]/versions.vue b/apps/frontend/src/pages/[type]/[id]/versions.vue
index 1c4596bb..1e85211d 100644
--- a/apps/frontend/src/pages/[type]/[id]/versions.vue
+++ b/apps/frontend/src/pages/[type]/[id]/versions.vue
@@ -106,6 +106,13 @@
                 },
                 shown: currentMember || flags.developerMode,
               },
+              {
+                id: 'copy-maven',
+                action: () => {
+                  copyToClipboard(`maven.modrinth:${project.slug}:${version.id}`);
+                },
+                shown: flags.developerMode,
+              },
               { divider: true, shown: currentMember },
               {
                 id: 'edit',
@@ -160,6 +167,10 @@
               <ClipboardCopyIcon aria-hidden="true" />
               Copy ID
             </template>
+            <template #copy-maven>
+              <ClipboardCopyIcon aria-hidden="true" />
+              Copy Modrinth Maven
+            </template>
           </OverflowMenu>
         </ButtonStyled>
       </template>

From 42731521f1496f087768fa8ad0103f6179a12896 Mon Sep 17 00:00:00 2001
From: Magnus Jensen <magnushjensen.mail@gmail.com>
Date: Sat, 19 Apr 2025 15:44:46 +0200
Subject: [PATCH 27/28] fix: instance project author link not checking for
 organizations (#3315)

Co-authored-by: Emma Alexia <emma@modrinth.com>
---
 apps/app-frontend/src/pages/instance/Mods.vue | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/apps/app-frontend/src/pages/instance/Mods.vue b/apps/app-frontend/src/pages/instance/Mods.vue
index e49f2d9c..b70f0139 100644
--- a/apps/app-frontend/src/pages/instance/Mods.vue
+++ b/apps/app-frontend/src/pages/instance/Mods.vue
@@ -66,10 +66,10 @@
 
           if (x.author) {
             item.creator = {
-              name: x.author,
-              type: 'user',
-              id: x.author,
-              link: 'https://modrinth.com/user/' + x.author,
+              name: x.author.name,
+              type: x.author.type,
+              id: x.author.slug,
+              link: `https://modrinth.com/${x.author.type}/${x.author.slug}`,
               linkProps: { target: '_blank' },
             }
           }
@@ -329,6 +329,28 @@ const props = defineProps({
   },
 })
 
+type ProjectListEntryAuthor = {
+  name: string
+  slug: string
+  type: 'user' | 'organization'
+}
+
+type ProjectListEntry = {
+  path: string
+  name: string
+  slug?: string
+  author: ProjectListEntryAuthor | null
+  version: string | null
+  file_name: string
+  icon: string | null
+  disabled: boolean
+  updateVersion?: string
+  outdated: boolean
+  updated: dayjs.Dayjs
+  project_type: string
+  id?: string
+}
+
 const isPackLocked = computed(() => {
   return props.instance.linked_data && props.instance.linked_data.locked
 })
@@ -338,7 +360,7 @@ const canUpdatePack = computed(() => {
 })
 const exportModal = ref(null)
 
-const projects = ref([])
+const projects = ref<ProjectListEntry[]>([])
 const selectedFiles = ref([])
 const selectedProjects = computed(() =>
   projects.value.filter((x) => selectedFiles.value.includes(x.file_name)),
@@ -347,7 +369,7 @@ const selectedProjects = computed(() =>
 const selectionMap = ref(new Map())
 
 const initProjects = async (cacheBehaviour?) => {
-  const newProjects = []
+  const newProjects: ProjectListEntry[] = []
 
   const profileProjects = await get_projects(props.instance.path, cacheBehaviour)
   const fetchProjects = []
@@ -384,21 +406,29 @@ const initProjects = async (cacheBehaviour?) => {
 
         const team = modrinthTeams.find((x) => x[0].team_id === project.team)
 
-        let owner
-
+        let author: ProjectListEntryAuthor | null
         if (org) {
-          owner = org.name
+          author = {
+            name: org.name,
+            slug: org.slug,
+            type: 'organization',
+          }
         } else if (team) {
-          owner = team.find((x) => x.is_owner).user.username
+          const teamMember = team.find((x) => x.is_owner)
+          author = {
+            name: teamMember.user.username,
+            slug: teamMember.user.username,
+            type: 'user',
+          }
         } else {
-          owner = null
+          author = null
         }
 
         newProjects.push({
           path,
           name: project.title,
           slug: project.slug,
-          author: owner,
+          author,
           version: version.version_number,
           file_name: file.file_name,
           icon: project.icon_url,
@@ -417,7 +447,7 @@ const initProjects = async (cacheBehaviour?) => {
     newProjects.push({
       path,
       name: file.file_name.replace('.disabled', ''),
-      author: '',
+      author: null,
       version: null,
       file_name: file.file_name,
       icon: null,

From daf699911104207a477751916b36a371ee8f7e38 Mon Sep 17 00:00:00 2001
From: Erb3 <49862976+Erb3@users.noreply.github.com>
Date: Sat, 19 Apr 2025 15:51:01 +0200
Subject: [PATCH 28/28] Document usage of OAuth (#3342)

* docs: hitchhiker's guide to OAuth

* docs: remove old OAuth guide from OpenApi spec

* fixup! docs: remove old OAuth guide from OpenApi spec

* docs: mention /user endpoint in oauth

* docs: oauth flow overview

* docs: mention PAT

* docs: fix reviews

* docs: support portal over github issue

Signed-off-by: Erb3 <49862976+Erb3@users.noreply.github.com>

---------

Signed-off-by: Erb3 <49862976+Erb3@users.noreply.github.com>
---
 apps/docs/astro.config.mjs                |  4 +
 apps/docs/public/openapi.yaml             | 30 +------
 apps/docs/src/content/docs/guide/oauth.md | 95 +++++++++++++++++++++++
 3 files changed, 100 insertions(+), 29 deletions(-)
 create mode 100644 apps/docs/src/content/docs/guide/oauth.md

diff --git a/apps/docs/astro.config.mjs b/apps/docs/astro.config.mjs
index 4fcf82fa..3baeb6f4 100644
--- a/apps/docs/astro.config.mjs
+++ b/apps/docs/astro.config.mjs
@@ -44,6 +44,10 @@ export default defineConfig({
           label: 'Contributing to Modrinth',
           autogenerate: { directory: 'contributing' },
         },
+        {
+          label: 'Guides',
+          autogenerate: { directory: 'guide' },
+        },
         // Add the generated sidebar group to the sidebar.
         ...openAPISidebarGroups,
       ],
diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index 94332db3..73b2b05b 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -51,35 +51,7 @@ info:
     Please note that certain scopes and requests cannot be completed with a personal access token or using OAuth.
     For example, deleting a user account can only be done through Modrinth's frontend.
 
-    ### OAuth2
-    Applications interacting with an authenticated API should create an OAuth2 application.
-    You can do this in [the developer settings](https://modrinth.com/settings/applications).
-
-    Make sure to save your application secret, as you will not be able to access it after you leave the page.
-
-    Once you have created a client, use the following URL to have a user authorize your client:
-    ```
-    https://modrinth.com/auth/authorize?client_id=<CLIENT_ID>&redirect_uri=<CALLBACK_URL>&scope=<SCOPE_ONE>+<SCOPE_TWO>+<SCOPE_THREE>
-    ```
-    > You can get a list of all scope names [here](https://github.com/modrinth/code/tree/main/apps/labrinth/src/models/v3/pats.rs).
-
-    Then, send a `POST` request to the following URL to get the token:
-
-    ```
-    https://api.modrinth.com/_internal/oauth/token
-    ```
-
-    > Note that you will need to provide your application's secret under the Authorization header.
-
-    In the body of your request, make sure to include the following:
-    - `code`: The code generated when authorizing your client
-    - `client_id`: Your client ID (found in developer settings)
-    - `redirect_uri`: A valid redirect URI provided in your application's settings
-    - `grant_type`: This will need to be `authorization_code`.
-
-    If your token request fails for any reason, you will need to get another code from the authorization process.
-
-    This route will be changed in the future to move the `_internal` part to `v3`.
+    A detailed guide on OAuth has been published in [Modrinth's technical documentation](https://docs.modrinth.com/guide/oauth).
 
     ### Personal access tokens
     Personal access tokens (PATs) can be generated in from [the user settings](https://modrinth.com/settings/account).
diff --git a/apps/docs/src/content/docs/guide/oauth.md b/apps/docs/src/content/docs/guide/oauth.md
new file mode 100644
index 00000000..a7833b10
--- /dev/null
+++ b/apps/docs/src/content/docs/guide/oauth.md
@@ -0,0 +1,95 @@
+---
+title: The hitchhiker's guide to OAuth
+description: Guide for using Modrinth OAuth to interact with the API on users' behalf.
+---
+
+Modrinth allows developers to create applications which, once authorized by a Modrinth user, let the developer interact with the API on their behalf. The flow used to get an API token is based on the OAuth 2 protocol. It is recommended that most people use an existing OAuth library to handle the authentication. If you want to implement it from scratch, you will need to look into [RFC 6749]. If the only user of the application is yourself, a personal access token (PAT) may be a better fit.
+
+If you're familiar with OAuth 2, these are the URLs you will need:
+
+| Name               | URL                                              |
+|--------------------|--------------------------------------------------|
+| Authorization page | `https://modrinth.com/auth/authorize`            |
+| Token exchange     | `https://api.modrinth.com/_internal/oauth/token` |
+
+The flow will generally look like this:
+
+1. User is redirected to Modrinth to authorize your application
+2. User is redirected back to your site after authorizing, with an authorization code
+3. Your backend exchanges this code for an access token
+
+## Register your application
+
+To start off, you need to [register an application] in Modrinth's systems. The settings chosen here can always be changed later. You need to select what permissions you need, called scopes. For security reasons you will want to select only the scopes you need. See the [principle of least privilege].
+
+In addition to name and scopes, you will also need to add one or more redirect URIs. These are the URIs that the user can be redirected to after they authorize your application.
+
+After you've registered your application, it is important that you take note of the client secret somewhere safe. If the client secret is to ever leak, it is important that you regenerate it to ensure the security of your authorized users. If your client secret or access tokens are found exposed in the wild, your application may be disabled without prior notice.
+
+## Getting authorization
+
+Once the user is ready to authorize your application, you need to construct a URL to redirect them to. The authorization URL for Modrinth is `https://api.modrinth.com/_internal/oauth/token`. Supply the following query parameters:
+
+| Query parameter | Description                                                                               |
+|-----------------|-------------------------------------------------------------------------------------------|
+| `response_type` | In Modrinth this always needs to be `code`, since only code grants are supported          |
+| `client_id`     | The application identifier found in the settings                                          |
+| `scope`         | The permissions you need access to                                                        |
+| `state`         | A mechanism to prevent certain attacks. Explained further below. Recommended but optional |
+| `redirect_uri`  | The URI the user is redirect to after finishing authorization                             |
+
+You might have noticed the `state` parameter. [CSRF] (Cross-site request forgery), and [clickjacking] are security vulnerabilities that you're recommended to protect against. In OAuth2 this is usually done with the `state` parameter. When the user initiates a request to start authorization, you include a `state` which is unique to this request. This can, for example, be saved in localStorge or a cookie. When the redirect URI is called, you verify that the `state` parameter is the same. Using `state` is optional, but recommended.
+
+The scope identifiers are currently best found in the backend source code located at [`apps/labrinth/src/models/v3/pats.rs`]. The scope parameter is an array of scope identifiers, seperated by a plus sign (`+`).
+
+The redirect URI is the endpoint on your server that will receive the code which can eventually be used to act on the user's behalf. For security reasons the redirect URI used has to be allowlisted in your application settings. The redirect will contain the following query parameters:
+
+| Query parameter | Description                                        |
+|-----------------|----------------------------------------------------|
+| `code`          | The code that can be exchanged for an access token |
+| `client_id`     | Your client id                                     |
+| `redirect_uri`  | The redirect URI which was used                    |
+| `grant_type`    | Always `authorization_code` in Modrinth            |
+
+## Exchanging tokens
+
+If you've followed the previous section on getting authorization, you should now have an authorization code. Before you can access the API, you need to exchange this code for an access token. This is done by sending a POST request to the exchange token endpoint, `https://api.modrinth.com/_internal/oauth/token`. This request has to be of type urlencoded form. Make sure the `Content-Type` header is set to `application/x-www-form-urlencoded`. To authenticate this request you need to place your client secret in the `Authorization` header.
+
+In the body use these fields:
+
+| Field          | Description                                                  |
+|----------------|--------------------------------------------------------------|
+| `code`         | The authorization code                                       |
+| `client_id`    | Your client id, the same as in the authorization request     |
+| `redirect_uri` | The redirect URI which was redirected to after authorization |
+| `grant_type`   | Always `authorization_code` in Modrinth                      |
+
+If the request succeeds, you should receive a JSON payload with these fields:
+
+| Field          | Description                                          |
+|----------------|------------------------------------------------------|
+| `access_token` | The access token you can use to access the API       |
+| `token_type`   | Currently only `Bearer`                              |
+| `expires_in`   | The amount of seconds until the access token expires |
+
+To use this access token, you attach it to API requests in the `Authorization` header. To get basic information about the authorizer, you can use the [`/user` endpoint], which automatically gets the user from the header.
+
+If you have any questions, you're welcome to ask in #api-development in the [Discord guild], or create a ticket on the [support portal].
+
+[RFC 6749]: https://datatracker.ietf.org/doc/html/rfc6749
+
+[register an application]: https://modrinth.com/settings/applications
+
+[principle of least privilege]: https://en.wikipedia.org/wiki/Principle_of_least_privilege
+
+[`apps/labrinth/src/models/v3/pats.rs`]: https://github.com/modrinth/code/blob/main/apps/labrinth/src/models/v3/pats.rs
+
+[CSRF]: https://en.wikipedia.org/wiki/Cross-site_request_forgery
+
+[Clickjacking]: https://en.wikipedia.org/wiki/Clickjacking
+
+[`/user` endpoint]: https://docs.modrinth.com/api/operations/getuserfromauth/
+
+[Discord guild]: https://discord.modrinth.com
+
+[support portal]: https://support.modrinth.com/en/