Misc Cargo.lock updates

Cargo.toml

@@ -25,31 +25,31 @@ actix-ws = "0.3.0"
 argon2 = { version = "0.5.3", features = ["std"] }
 ariadne = { path = "packages/ariadne" }
 async_zip = "0.0.17"
-async-compression = { version = "0.4.25", default-features = false }
+async-compression = { version = "0.4.27", default-features = false }
 async-recursion = "1.1.1"
 async-stripe = { version = "0.41.0", default-features = false, features = [
   "runtime-tokio-hyper-rustls",
 ] }
 async-trait = "0.1.88"
-async-tungstenite = { version = "0.29.1", default-features = false, features = [
+async-tungstenite = { version = "0.30.0", default-features = false, features = [
   "futures-03-sink",
 ] }
 async-walkdir = "2.1.0"
 base64 = "0.22.1"
 bitflags = "2.9.1"
-bytemuck = "1.23.0"
+bytemuck = "1.23.1"
 bytes = "1.10.1"
 censor = "0.3.0"
 chardetng = "0.1.17"
 chrono = "0.4.41"
-clap = "4.5.40"
+clap = "4.5.43"
 clickhouse = "0.13.3"
 color-thief = "0.2.2"
 console-subscriber = "0.4.1"
 daedalus = { path = "packages/daedalus" }
 dashmap = "6.1.0"
 data-url = "0.3.1"
-deadpool-redis = "0.21.1"
+deadpool-redis = "0.22.0"
 dirs = "6.0.0"
 discord-rich-presence = "0.2.5"
 dotenv-build = "0.1.1"
@@ -57,7 +57,7 @@ dotenvy = "0.15.7"
 dunce = "1.0.5"
 either = "1.15.0"
 encoding_rs = "0.8.35"
-enumset = "1.1.6"
+enumset = "1.1.7"
 flate2 = "1.1.2"
 fs4 = { version = "0.13.1", default-features = false }
 futures = { version = "0.3.31", default-features = false }
@@ -74,15 +74,15 @@ hyper-rustls = { version = "0.27.7", default-features = false, features = [
   "ring",
   "tls12",
 ] }
-hyper-util = "0.1.14"
+hyper-util = "0.1.16"
 iana-time-zone = "0.1.63"
 image = { version = "0.25.6", default-features = false, features = ["rayon"] }
-indexmap = "2.9.0"
-indicatif = "0.17.11"
+indexmap = "2.10.0"
+indicatif = "0.18.0"
 itertools = "0.14.0"
-jemalloc_pprof = "0.7.0"
+jemalloc_pprof = "0.8.1"
 json-patch = { version = "4.0.0", default-features = false }
-lettre = { version = "0.11.17", default-features = false, features = [
+lettre = { version = "0.11.18", default-features = false, features = [
   "builder",
   "hostname",
   "pool",
@@ -92,24 +92,24 @@ lettre = { version = "0.11.17", default-features = false, features = [
   "smtp-transport",
 ] }
 maxminddb = "0.26.0"
-meilisearch-sdk = { version = "0.28.0", default-features = false }
+meilisearch-sdk = { version = "0.29.1", default-features = false }
 murmur2 = "0.1.0"
 native-dialog = "0.9.0"
-notify = { version = "8.0.0", default-features = false }
-notify-debouncer-mini = { version = "0.6.0", default-features = false }
+notify = { version = "8.2.0", default-features = false }
+notify-debouncer-mini = { version = "0.7.0", default-features = false }
 p256 = "0.13.2"
 paste = "1.0.15"
 phf = { version = "0.12.1", features = ["macros"] }
 png = "0.17.16"
 prometheus = "0.14.0"
 quartz_nbt = "0.2.9"
-quick-xml = "0.37.5"
+quick-xml = "0.38.1"
 rand = "=0.8.5"  # Locked on 0.8 until argon2 and p256 update to 0.9
 rand_chacha = "=0.3.1"  # Locked on 0.3 until we can update rand to 0.9
-redis = "=0.31.0"  # Locked on 0.31 until deadpool-redis updates to 0.32
+redis = "0.32.4"
 regex = "1.11.1"
-reqwest = { version = "0.12.20", default-features = false }
-rgb = "0.8.50"
+reqwest = { version = "0.12.22", default-features = false }
+rgb = "0.8.52"
 rust_decimal = { version = "1.37.2", features = [
   "serde-with-float",
   "serde-with-str",
@@ -121,7 +121,7 @@ rust-s3 = { version = "0.35.1", default-features = false, features = [
   "tokio-rustls-tls",
 ] }
 rusty-money = "0.4.1"
-sentry = { version = "0.41.0", default-features = false, features = [
+sentry = { version = "0.42.0", default-features = false, features = [
   "backtrace",
   "contexts",
   "debug-images",
@@ -129,45 +129,45 @@ sentry = { version = "0.41.0", default-features = false, features = [
   "reqwest",
   "rustls",
 ] }
-sentry-actix = "0.41.0"
+sentry-actix = "0.42.0"
 serde = "1.0.219"
 serde_bytes = "0.11.17"
 serde_cbor = "0.11.2"
 serde_ini = "0.2.0"
-serde_json = "1.0.140"
-serde_with = "3.13.0"
+serde_json = "1.0.142"
+serde_with = "3.14.0"
 serde-xml-rs = "0.8.1"  # Also an XML (de)serializer, consider dropping yaserde in favor of this
 sha1 = "0.10.6"
 sha1_smol = { version = "1.0.1", features = ["std"] }
 sha2 = "0.10.9"
-spdx = "0.10.8"
+spdx = "0.10.9"
 sqlx = { version = "0.8.6", default-features = false }
-sysinfo = { version = "0.35.2", default-features = false }
+sysinfo = { version = "0.36.1", default-features = false }
 tar = "0.4.44"
-tauri = "2.6.1"
-tauri-build = "2.3.0"
-tauri-plugin-deep-link = "2.4.0"
-tauri-plugin-dialog = "2.3.0"
-tauri-plugin-http = "2.5.0"
+tauri = "2.7.0"
+tauri-build = "2.3.1"
+tauri-plugin-deep-link = "2.4.1"
+tauri-plugin-dialog = "2.3.2"
+tauri-plugin-http = "2.5.1"
 tauri-plugin-opener = "2.4.0"
 tauri-plugin-os = "2.3.0"
-tauri-plugin-single-instance = "2.3.0"
+tauri-plugin-single-instance = "2.3.2"
 tauri-plugin-updater = { version = "2.9.0", default-features = false, features = [
   "rustls-tls",
   "zip",
 ] }
-tauri-plugin-window-state = "2.3.0"
+tauri-plugin-window-state = "2.4.0"
 tempfile = "3.20.0"
 theseus = { path = "packages/app-lib" }
 thiserror = "2.0.12"
 tikv-jemalloc-ctl = "0.6.0"
 tikv-jemallocator = "0.6.0"
-tokio = "1.45.1"
+tokio = "1.47.1"
 tokio-stream = "0.1.17"
-tokio-util = "0.7.15"
+tokio-util = "0.7.16"
 totp-rs = "5.7.0"
 tracing = "0.1.41"
-tracing-actix-web = "0.7.18"
+tracing-actix-web = "0.7.19"
 tracing-error = "0.2.1"
 tracing-subscriber = "0.3.19"
 url = "2.5.4"
@@ -179,7 +179,7 @@ whoami = "1.6.0"
 winreg = "0.55.0"
 woothee = "0.13.0"
 yaserde = "0.12.0"
-zip = { version = "4.2.0", default-features = false, features = [
+zip = { version = "4.3.0", default-features = false, features = [
   "bzip2",
   "deflate",
   "deflate64",
@@ -226,7 +226,7 @@ wildcard_dependencies = "warn"
 warnings = "deny"
 
 [patch.crates-io]
-wry = { git = "https://github.com/modrinth/wry", rev = "21db186" }
+wry = { git = "https://github.com/modrinth/wry", rev = "f2ce0b0" }
 
 # Optimize for speed and reduce size on release builds
 [profile.release]

apps/app/src/api/ads.rs

@@ -197,15 +197,13 @@ pub async fn open_link<R: Runtime>(
 
     if url::Url::parse(&path).is_ok()
         && !state.malicious_origins.contains(&origin)
+        && let Some(last_click) = state.last_click
+        && last_click.elapsed() < Duration::from_millis(100)
     {
-        if let Some(last_click) = state.last_click {
-            if last_click.elapsed() < Duration::from_millis(100) {
-                let _ = app.opener().open_url(&path, None::<String>);
-                state.last_click = None;
+        let _ = app.opener().open_url(&path, None::<String>);
+        state.last_click = None;
 
-                return Ok(());
-            }
-        }
+        return Ok(());
     }
 
     tracing::info!("Malicious click: {path} origin {origin}");

apps/app/src/api/auth.rs

@@ -59,16 +59,13 @@ pub async fn login<R: Runtime>(
             .url()?
             .as_str()
             .starts_with("https://login.live.com/oauth20_desktop.srf")
-        {
-            if let Some((_, code)) =
+            && let Some((_, code)) =
                 window.url()?.query_pairs().find(|x| x.0 == "code")
-            {
-                window.close()?;
-                let val =
-                    minecraft_auth::finish_login(&code.clone(), flow).await?;
+        {
+            window.close()?;
+            let val = minecraft_auth::finish_login(&code.clone(), flow).await?;
 
-                return Ok(Some(val));
-            }
+            return Ok(Some(val));
         }
 
         tokio::time::sleep(std::time::Duration::from_millis(50)).await;

apps/app/src/api/utils.rs

@@ -63,11 +63,11 @@ pub async fn should_disable_mouseover() -> bool {
         // We try to match version to 12.2 or higher. If unrecognizable to pattern or lower, we default to the css with disabled mouseover for safety
         if let tauri_plugin_os::Version::Semantic(major, minor, _) =
             tauri_plugin_os::version()
+            && major >= 12
+            && minor >= 3
         {
-            if major >= 12 && minor >= 3 {
-                // Mac os version is 12.3 or higher, we allow mouseover
-                return false;
-            }
+            // Mac os version is 12.3 or higher, we allow mouseover
+            return false;
         }
         true
     } else {

apps/app/src/main.rs

@@ -233,10 +233,10 @@ fn main() {
             });
 
             #[cfg(not(target_os = "linux"))]
-            if let Some(window) = app.get_window("main") {
-                if let Err(e) = window.set_shadow(true) {
-                    tracing::warn!("Failed to set window shadow: {e}");
-                }
+            if let Some(window) = app.get_window("main")
+                && let Err(e) = window.set_shadow(true)
+            {
+                tracing::warn!("Failed to set window shadow: {e}");
             }
 
             Ok(())

apps/daedalus_client/src/forge.rs

@@ -506,27 +506,25 @@ async fn fetch(
 
                             return Ok(lib);
                         }
-                    } else if let Some(url) = &lib.url {
-                        if !url.is_empty() {
-                            insert_mirrored_artifact(
-                                &lib.name,
-                                None,
-                                vec![
-                                    url.clone(),
-                                    "https://libraries.minecraft.net/"
-                                        .to_string(),
-                                    "https://maven.creeperhost.net/"
-                                        .to_string(),
-                                    maven_url.to_string(),
-                                ],
-                                false,
-                                mirror_artifacts,
-                            )?;
+                    } else if let Some(url) = &lib.url
+                        && !url.is_empty()
+                    {
+                        insert_mirrored_artifact(
+                            &lib.name,
+                            None,
+                            vec![
+                                url.clone(),
+                                "https://libraries.minecraft.net/".to_string(),
+                                "https://maven.creeperhost.net/".to_string(),
+                                maven_url.to_string(),
+                            ],
+                            false,
+                            mirror_artifacts,
+                        )?;
 
-                            lib.url = Some(format_url("maven/"));
+                        lib.url = Some(format_url("maven/"));
 
-                            return Ok(lib);
-                        }
+                        return Ok(lib);
                     }
 
                     // Other libraries are generally available in the "maven" directory of the installer. If they are

apps/daedalus_client/src/main.rs

@@ -93,22 +93,22 @@ async fn main() -> Result<()> {
         .ok()
         .and_then(|x| x.parse::<bool>().ok())
         .unwrap_or(false)
+        && let Ok(token) = dotenvy::var("CLOUDFLARE_TOKEN")
+        && let Ok(zone_id) = dotenvy::var("CLOUDFLARE_ZONE_ID")
     {
-        if let Ok(token) = dotenvy::var("CLOUDFLARE_TOKEN") {
-            if let Ok(zone_id) = dotenvy::var("CLOUDFLARE_ZONE_ID") {
-                let cache_clears = upload_files
+        let cache_clears = upload_files
+            .into_iter()
+            .map(|x| format_url(&x.0))
+            .chain(
+                mirror_artifacts
                     .into_iter()
-                    .map(|x| format_url(&x.0))
-                    .chain(
-                        mirror_artifacts
-                            .into_iter()
-                            .map(|x| format_url(&format!("maven/{}", x.0))),
-                    )
-                    .collect::<Vec<_>>();
+                    .map(|x| format_url(&format!("maven/{}", x.0))),
+            )
+            .collect::<Vec<_>>();
 
-                // Cloudflare ratelimits cache clears to 500 files per request
-                for chunk in cache_clears.chunks(500) {
-                    REQWEST_CLIENT.post(format!("https://api.cloudflare.com/client/v4/zones/{zone_id}/purge_cache"))
+        // Cloudflare ratelimits cache clears to 500 files per request
+        for chunk in cache_clears.chunks(500) {
+            REQWEST_CLIENT.post(format!("https://api.cloudflare.com/client/v4/zones/{zone_id}/purge_cache"))
                         .bearer_auth(&token)
                         .json(&serde_json::json!({
                         "files": chunk
@@ -128,8 +128,6 @@ async fn main() -> Result<()> {
                                 item: "cloudflare clear cache".to_string(),
                             }
                         })?;
-                }
-            }
         }
     }
 

apps/daedalus_client/src/util.rs

@@ -167,20 +167,18 @@ pub async fn download_file(
                 let bytes = x.bytes().await;
 
                 if let Ok(bytes) = bytes {
-                    if let Some(sha1) = sha1 {
-                        if &*sha1_async(bytes.clone()).await? != sha1 {
-                            if attempt <= 3 {
-                                continue;
-                            } else {
-                                return Err(
-                                    crate::ErrorKind::ChecksumFailure {
-                                        hash: sha1.to_string(),
-                                        url: url.to_string(),
-                                        tries: attempt,
-                                    }
-                                    .into(),
-                                );
+                    if let Some(sha1) = sha1
+                        && &*sha1_async(bytes.clone()).await? != sha1
+                    {
+                        if attempt <= 3 {
+                            continue;
+                        } else {
+                            return Err(crate::ErrorKind::ChecksumFailure {
+                                hash: sha1.to_string(),
+                                url: url.to_string(),
+                                tries: attempt,
                             }
+                            .into());
                         }
                     }
 

apps/frontend/nuxt.config.ts

@@ -143,8 +143,13 @@ export default defineNuxtConfig({
         state.lastGenerated &&
         new Date(state.lastGenerated).getTime() + TTL > new Date().getTime() &&
         // ...but only if the API URL is the same
-        state.apiUrl === API_URL
+        state.apiUrl === API_URL &&
+        // ...and if no errors were caught during the last generation
+        (state.errors ?? []).length === 0
       ) {
+        console.log(
+          "Tags already recently generated. Delete apps/frontend/generated/state.json to force regeneration.",
+        );
         return;
       }
 

apps/frontend/src/components/ui/ProjectMemberHeader.vue

@@ -1,481 +1,510 @@
 <template>
-  <div v-if="showInvitation" class="universal-card information invited my-4">
-    <h2>{{ getFormattedMessage(messages.invitationTitle) }}</h2>
-    <p v-if="currentMember?.project_role">
-      {{ formatMessage(messages.invitationWithRole, { role: currentMember.project_role }) }}
+  <div v-if="showInvitation" class="universal-card information invited">
+    <h2>Invitation to join project</h2>
+    <p>
+      You've been invited be a member of this project with the role of '{{ currentMember.role }}'.
     </p>
-    <p v-else>{{ getFormattedMessage(messages.invitationNoRole) }}</p>
     <div class="input-group">
-      <ButtonStyled color="brand">
-        <button class="brand-button" @click="acceptInvite()">
-          <CheckIcon />
-          {{ getFormattedMessage(messages.accept) }}
-        </button>
-      </ButtonStyled>
-      <ButtonStyled color="red">
-        <button @click="declineInvite">
-          <XIcon />
-          {{ getFormattedMessage(messages.decline) }}
-        </button>
-      </ButtonStyled>
+      <button class="iconified-button brand-button" @click="acceptInvite()">
+        <CheckIcon />
+        Accept
+      </button>
+      <button class="iconified-button danger-button" @click="declineInvite()">
+        <XIcon />
+        Decline
+      </button>
     </div>
   </div>
   <div
     v-if="
       currentMember &&
-      visibleNags.length > 0 &&
+      nags.filter((x) => x.condition).length > 0 &&
       (project.status === 'draft' || tags.rejectedStatuses.includes(project.status))
     "
-    class="universal-card my-4"
+    class="author-actions universal-card mb-4"
   >
-    <div class="flex max-w-full flex-wrap items-center gap-x-6 gap-y-4">
-      <div class="flex flex-auto flex-wrap items-center gap-x-6 gap-y-4">
-        <h2 class="my-0 mr-auto">{{ getFormattedMessage(messages.publishingChecklist) }}</h2>
-        <div class="flex flex-row gap-2">
-          <div class="flex items-center gap-1">
-            <AsteriskIcon class="size-4 text-red" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.required) }}</span>
-          </div>
-          |
-          <div class="flex items-center gap-1">
-            <TriangleAlertIcon class="size-4 text-orange" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.warning) }}</span>
-          </div>
-          |
-          <div class="flex items-center gap-1">
-            <LightBulbIcon class="size-4 text-purple" />
-            <span class="text-secondary">{{ getFormattedMessage(messages.suggestion) }}</span>
+    <div class="header__row">
+      <div class="header__title">
+        <h2>Publishing checklist</h2>
+        <div class="checklist">
+          <span class="checklist__title">Progress:</span>
+          <div class="checklist__items">
+            <div
+              v-for="nag in nags"
+              :key="`checklist-${nag.id}`"
+              v-tooltip="nag.title"
+              :aria-label="nag.title"
+              :class="'circle ' + (!nag.condition ? 'done' : '') + nag.status"
+              class="circle"
+            >
+              <CheckIcon v-if="!nag.condition" />
+              <AsteriskIcon v-else-if="nag.status === 'required'" />
+              <LightBulbIcon v-else-if="nag.status === 'suggestion'" />
+              <ScaleIcon v-else-if="nag.status === 'review'" />
+            </div>
           </div>
         </div>
       </div>
       <div class="input-group">
-        <ButtonStyled circular>
-          <button :class="!collapsed && '[&>svg]:rotate-180'" @click="toggleCollapsed()">
-            <DropdownIcon class="duration-250 transition-transform ease-in-out" />
-          </button>
-        </ButtonStyled>
+        <button
+          :class="{ 'not-collapsed': !collapsed }"
+          class="square-button"
+          @click="toggleCollapsed()"
+        >
+          <DropdownIcon />
+        </button>
       </div>
     </div>
-    <div v-if="!collapsed" class="grid-display width-16 mt-4">
-      <div v-for="nag in visibleNags" :key="nag.id" class="grid-display__item">
-        <span class="flex items-center gap-2 font-semibold">
-          <component
-            :is="nag.icon || getDefaultIcon(nag.status)"
-            v-tooltip="getStatusTooltip(nag.status)"
-            :class="[
-              'size-4',
-              nag.status === 'required' && 'text-red',
-              nag.status === 'warning' && 'text-orange',
-              nag.status === 'suggestion' && 'text-purple',
-            ]"
-            :aria-label="getStatusTooltip(nag.status)"
+    <div v-if="!collapsed" class="grid-display width-16">
+      <div
+        v-for="nag in nags.filter((x) => x.condition && !x.hide)"
+        :key="nag.id"
+        class="grid-display__item"
+      >
+        <span class="label">
+          <AsteriskIcon
+            v-if="nag.status === 'required'"
+            v-tooltip="'Required'"
+            :class="nag.status"
+            aria-label="Required"
           />
-          {{ getFormattedMessage(nag.title) }}
-        </span>
-        {{ getNagDescription(nag) }}
+          <LightBulbIcon
+            v-else-if="nag.status === 'suggestion'"
+            v-tooltip="'Suggestion'"
+            :class="nag.status"
+            aria-label="Suggestion"
+          />
+          <ScaleIcon
+            v-else-if="nag.status === 'review'"
+            v-tooltip="'Review'"
+            :class="nag.status"
+            aria-label="Review"
+          />{{ nag.title }}</span
+        >
+        {{ nag.description }}
         <NuxtLink
-          v-if="nag.link && shouldShowLink(nag)"
+          v-if="nag.link"
+          :class="{ invisible: nag.link.hide }"
           :to="`/${project.project_type}/${project.slug ? project.slug : project.id}/${
             nag.link.path
           }`"
           class="goto-link"
         >
-          {{ getFormattedMessage(nag.link.title) }}
+          {{ nag.link.title }}
           <ChevronRightIcon aria-hidden="true" class="featured-header-chevron" />
         </NuxtLink>
-        <ButtonStyled
-          v-if="nag.status === 'special-submit-action' && nag.id === 'submit-for-review'"
-          color="orange"
-          @click="submitForReview"
+        <button
+          v-else-if="nag.action"
+          :disabled="nag.action.disabled()"
+          class="btn btn-orange"
+          @click="nag.action.onClick"
         >
-          <button
-            :disabled="!canSubmitForReview"
-            v-tooltip="
-              !canSubmitForReview ? getFormattedMessage(messages.submitChecklistTooltip) : undefined
-            "
-          >
-            <SendIcon />
-            {{ getFormattedMessage(messages.submitForReview) }}
-          </button>
-        </ButtonStyled>
+          <SendIcon />
+          {{ nag.action.title }}
+        </button>
       </div>
     </div>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
 import {
   ChevronRightIcon,
   CheckIcon,
   XIcon,
   AsteriskIcon,
   LightBulbIcon,
-  TriangleAlertIcon,
-  DropdownIcon,
   SendIcon,
   ScaleIcon,
-  InfoIcon,
+  DropdownIcon,
 } from "@modrinth/assets";
+import { formatProjectType } from "@modrinth/utils";
 import { acceptTeamInvite, removeTeamMember } from "~/helpers/teams.js";
-import { nags } from "@modrinth/moderation";
-import { ButtonStyled } from "@modrinth/ui";
-import { useVIntl, defineMessages, type MessageDescriptor } from "@vintl/vintl";
-import type { Nag, NagContext, NagStatus } from "@modrinth/moderation";
-import type { Project, User, Version } from "@modrinth/utils";
-import type { Component } from "vue";
 
-interface Tags {
-  rejectedStatuses: string[];
-}
+const props = defineProps({
+  project: {
+    type: Object,
+    required: true,
+  },
+  versions: {
+    type: Array,
+    default() {
+      return [];
+    },
+  },
+  currentMember: {
+    type: Object,
+    default: null,
+  },
+  allMembers: {
+    type: Object,
+    default: null,
+  },
+  isSettings: {
+    type: Boolean,
+    default: false,
+  },
+  collapsed: {
+    type: Boolean,
+    default: false,
+  },
+  routeName: {
+    type: String,
+    default: "",
+  },
+  auth: {
+    type: Object,
+    required: true,
+  },
+  tags: {
+    type: Object,
+    required: true,
+  },
+  setProcessing: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "setProcessing function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+  toggleCollapsed: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "toggleCollapsed function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+  updateMembers: {
+    type: Function,
+    default() {
+      return () => {
+        addNotification({
+          group: "main",
+          title: "An error occurred",
+          text: "updateMembers function not found",
+          type: "error",
+        });
+      };
+    },
+  },
+});
 
-interface Auth {
-  user: {
-    id: string;
-  };
-}
+const featuredGalleryImage = computed(() => props.project.gallery.find((img) => img.featured));
 
-interface Member {
-  accepted?: boolean;
-  project_role?: string;
-  user?: Partial<User>;
-}
-
-interface Props {
-  project: Project;
-  versions?: Version[];
-  currentMember?: Member | null;
-  allMembers?: Member[] | null;
-  isSettings?: boolean;
-  collapsed?: boolean;
-  routeName?: string;
-  auth: Auth;
-  tags: Tags;
-  setProcessing?: (processing: boolean) => void;
-  toggleCollapsed?: () => void;
-  updateMembers?: () => void | Promise<void>;
-}
-
-const messages = defineMessages({
-  invitationTitle: {
-    id: "project-member-header.invitation-title",
-    defaultMessage: "Invitation to join project",
+const nags = computed(() => [
+  {
+    condition: props.versions.length < 1,
+    title: "Upload a version",
+    id: "upload-version",
+    description: "At least one version is required for a project to be submitted for review.",
+    status: "required",
+    link: {
+      path: "versions",
+      title: "Visit versions page",
+      hide: props.routeName === "type-id-versions",
+    },
   },
-  invitationWithRole: {
-    id: "project-member-header.invitation-with-role",
-    defaultMessage: "You've been invited be a member of this project with the role of '{role}'.",
+  {
+    condition:
+      props.project.body === "" || props.project.body.startsWith("# Placeholder description"),
+    title: "Add a description",
+    id: "add-description",
+    description:
+      "A description that clearly describes the project's purpose and function is required.",
+    status: "required",
+    link: {
+      path: "settings/description",
+      title: "Visit description settings",
+      hide: props.routeName === "type-id-settings-description",
+    },
   },
-  invitationNoRole: {
-    id: "project-member-header.invitation-no-role",
-    defaultMessage:
-      "You've been invited to join this project. Please accept or decline the invitation.",
+  {
+    condition: !props.project.icon_url,
+    title: "Add an icon",
+    id: "add-icon",
+    description:
+      "Your project should have a nice-looking icon to uniquely identify your project at a glance.",
+    status: "suggestion",
+    link: {
+      path: "settings",
+      title: "Visit general settings",
+      hide: props.routeName === "type-id-settings",
+    },
   },
-  accept: {
-    id: "project-member-header.accept",
-    defaultMessage: "Accept",
+  {
+    condition: props.project.gallery.length === 0 || !featuredGalleryImage,
+    title: "Feature a gallery image",
+    id: "feature-gallery-image",
+    description: "Featured gallery images may be the first impression of many users.",
+    status: "suggestion",
+    link: {
+      path: "gallery",
+      title: "Visit gallery page",
+      hide: props.routeName === "type-id-gallery",
+    },
   },
-  decline: {
-    id: "project-member-header.decline",
-    defaultMessage: "Decline",
+  {
+    hide: props.project.versions.length === 0,
+    condition: props.project.categories.length < 1,
+    title: "Select tags",
+    id: "select-tags",
+    description: "Select all tags that apply to your project.",
+    status: "suggestion",
+    link: {
+      path: "settings/tags",
+      title: "Visit tag settings",
+      hide: props.routeName === "type-id-settings-tags",
+    },
   },
-  publishingChecklist: {
-    id: "project-member-header.publishing-checklist",
-    defaultMessage: "Publishing checklist",
+  {
+    condition: !(
+      props.project.issues_url ||
+      props.project.source_url ||
+      props.project.wiki_url ||
+      props.project.discord_url ||
+      props.project.donation_urls.length > 0
+    ),
+    title: "Add external links",
+    id: "add-links",
+    description:
+      "Add any relevant links targeted outside of Modrinth, such as sources, issues, or a Discord invite.",
+    status: "suggestion",
+    link: {
+      path: "settings/links",
+      title: "Visit links settings",
+      hide: props.routeName === "type-id-settings-links",
+    },
   },
-  submitForReview: {
-    id: "project-member-header.submit-for-review",
-    defaultMessage: "Submit for review",
+  {
+    hide:
+      props.project.versions.length === 0 ||
+      props.project.project_type === "resourcepack" ||
+      props.project.project_type === "plugin" ||
+      props.project.project_type === "shader" ||
+      props.project.project_type === "datapack",
+    condition:
+      props.project.client_side === "unknown" ||
+      props.project.server_side === "unknown" ||
+      (props.project.client_side === "unsupported" && props.project.server_side === "unsupported"),
+    title: "Select supported environments",
+    id: "select-environments",
+    description: `Select if the ${formatProjectType(
+      props.project.project_type,
+    ).toLowerCase()} functions on the client-side and/or server-side.`,
+    status: "required",
+    link: {
+      path: "settings",
+      title: "Visit general settings",
+      hide: props.routeName === "type-id-settings",
+    },
   },
-  submitForReviewDesc: {
-    id: "project-member-header.submit-for-review-desc",
-    defaultMessage:
+  {
+    condition: props.project.license.id === "LicenseRef-Unknown",
+    title: "Select license",
+    id: "select-license",
+    description: `Select the license your ${formatProjectType(
+      props.project.project_type,
+    ).toLowerCase()} is distributed under.`,
+    status: "required",
+    link: {
+      path: "settings/license",
+      title: "Visit license settings",
+      hide: props.routeName === "type-id-settings-license",
+    },
+  },
+  {
+    condition: props.project.status === "draft",
+    title: "Submit for review",
+    id: "submit-for-review",
+    description:
       "Your project is only viewable by members of the project. It must be reviewed by moderators in order to be published.",
+    status: "review",
+    link: null,
+    action: {
+      onClick: submitForReview,
+      title: "Submit for review",
+      disabled: () => nags.value.filter((x) => x.condition && x.status === "required").length > 0,
+    },
   },
-  resubmitForReview: {
-    id: "project-member-header.resubmit-for-review",
-    defaultMessage: "Resubmit for review",
+  {
+    hide: props.project.stats === "draft",
+    condition: props.tags.rejectedStatuses.includes(props.project.status),
+    title: "Resubmit for review",
+    id: "resubmit-for-review",
+    description: `Your project has been ${props.project.status} by
+            Modrinth's staff. In most cases, you can resubmit for review after
+            addressing the staff's message.`,
+    status: "review",
+    link: {
+      path: "moderation",
+      title: "Visit moderation page",
+      hide: props.routeName === "type-id-moderation",
+    },
   },
-  resubmitForReviewDesc: {
-    id: "project-member-header.resubmit-for-review-desc",
-    defaultMessage:
-      "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message.",
-  },
-  showKey: {
-    id: "project-member-header.show-key",
-    defaultMessage: "Toggle key",
-  },
-  keyTitle: {
-    id: "project-member-header.key-title",
-    defaultMessage: "Status Key",
-  },
-  action: {
-    id: "project-member-header.action",
-    defaultMessage: "Action",
-  },
-  visitModerationPage: {
-    id: "project-member-header.visit-moderation-page",
-    defaultMessage: "Visit moderation page",
-  },
-  submitChecklistTooltip: {
-    id: "project-member-header.submit-checklist-tooltip",
-    defaultMessage: "You must complete the required steps in the publishing checklist!",
-  },
-  successJoin: {
-    id: "project-member-header.success-join",
-    defaultMessage: "You have joined the project team",
-  },
-  errorJoin: {
-    id: "project-member-header.error-join",
-    defaultMessage: "Failed to accept team invitation",
-  },
-  successDecline: {
-    id: "project-member-header.success-decline",
-    defaultMessage: "You have declined the team invitation",
-  },
-  errorDecline: {
-    id: "project-member-header.error-decline",
-    defaultMessage: "Failed to decline team invitation",
-  },
-  success: {
-    id: "project-member-header.success",
-    defaultMessage: "Success",
-  },
-  error: {
-    id: "project-member-header.error",
-    defaultMessage: "Error",
-  },
-  required: {
-    id: "project-member-header.required",
-    defaultMessage: "Required",
-  },
-  warning: {
-    id: "project-member-header.warning",
-    defaultMessage: "Warning",
-  },
-  suggestion: {
-    id: "project-member-header.suggestion",
-    defaultMessage: "Suggestion",
-  },
-});
+]);
 
-const { formatMessage } = useVIntl();
-
-function getNagDescription(nag: Nag): string {
-  if (typeof nag.description === "function") {
-    return nag.description(nagContext.value);
-  }
-  return formatMessage(nag.description);
-}
-
-function getFormattedMessage(message: string | MessageDescriptor): string {
-  if (typeof message === "string") {
-    return message;
-  }
-  return formatMessage(message);
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  versions: () => [],
-  currentMember: null,
-  allMembers: null,
-  isSettings: false,
-  collapsed: false,
-  routeName: "",
-});
-
-const emit = defineEmits<{
-  toggleCollapsed: [];
-  updateMembers: [];
-  setProcessing: [processing: boolean];
-}>();
-
-const nagContext = computed<NagContext>(() => ({
-  project: props.project,
-  versions: props.versions,
-  currentMember: props.currentMember as User,
-  currentRoute: props.routeName,
-  tags: props.tags,
-  submitProject: submitForReview,
-}));
-
-const showKey = ref(false);
-function toggleKey(): void {
-  showKey.value = !showKey.value;
-}
-
-const canSubmitForReview = computed(() => {
-  return (
-    applicableNags.value.filter((nag) => nag.status === "required" && !isNagComplete(nag))
-      .length === 0
-  );
-});
-
-async function submitForReview() {
-  if (canSubmitForReview) {
-    await setProcessing(true);
-  }
-}
-
-const applicableNags = computed<Nag[]>(() => {
-  return nags.filter((nag) => {
-    return nag.shouldShow(nagContext.value);
-  });
-});
-
-function isNagComplete(nag: Nag): boolean {
-  const context = nagContext.value;
-  return !nag.shouldShow(context);
-}
-
-const visibleNags = computed<Nag[]>(() => {
-  const finalNags = applicableNags.value.filter((nag) => !isNagComplete(nag));
-
-  if (props.project.status === "draft") {
-    finalNags.push({
-      id: "submit-for-review",
-      title: messages.submitForReview,
-      description: () => formatMessage(messages.submitForReviewDesc),
-      status: "special-submit-action",
-      shouldShow: (ctx) => ctx.project.status === "draft",
-    });
-  }
-
-  if (props.tags.rejectedStatuses.includes(props.project.status)) {
-    finalNags.push({
-      id: "resubmit-for-review",
-      title: messages.resubmitForReview,
-      description: (ctx) =>
-        formatMessage(messages.resubmitForReviewDesc, { status: ctx.project.status }),
-      status: "special-submit-action",
-      shouldShow: (ctx) => ctx.tags.rejectedStatuses.includes(ctx.project.status),
-      link: {
-        path: "moderation",
-        title: messages.visitModerationPage,
-        shouldShow: () => props.routeName !== "type-id-moderation",
-      },
-    });
-  }
-
-  finalNags.sort((a, b) => {
-    const statusOrder = { required: 0, warning: 1, suggestion: 2, "special-submit-action": 3 };
-    return statusOrder[a.status] - statusOrder[b.status];
-  });
-
-  return finalNags;
-});
-
-function shouldShowLink(nag: Nag): boolean {
-  return nag.link?.shouldShow ? nag.link.shouldShow(nagContext.value) : false;
-}
-
-function getDefaultIcon(status: NagStatus): Component {
-  switch (status) {
-    case "required":
-      return AsteriskIcon;
-    case "warning":
-      return TriangleAlertIcon;
-    case "suggestion":
-      return LightBulbIcon;
-    case "special-submit-action":
-      return ScaleIcon;
-    default:
-      return AsteriskIcon;
-  }
-}
-
-function getStatusTooltip(status: NagStatus): string {
-  switch (status) {
-    case "required":
-      return formatMessage(messages.required);
-    case "warning":
-      return formatMessage(messages.warning);
-    case "suggestion":
-      return formatMessage(messages.suggestion);
-    default:
-      return formatMessage(messages.required);
-  }
-}
-
-const showInvitation = computed<boolean>(() => {
+const showInvitation = computed(() => {
   if (props.allMembers && props.auth) {
-    const member = props.allMembers.find((x) => x?.user?.id === props.auth.user.id);
-    return !!member && !member.accepted;
+    const member = props.allMembers.find((x) => x.user.id === props.auth.user.id);
+    return member && !member.accepted;
   }
   return false;
 });
 
-function toggleCollapsed(): void {
-  if (props.toggleCollapsed) {
-    props.toggleCollapsed();
-  } else {
-    emit("toggleCollapsed");
-  }
-}
+const acceptInvite = () => {
+  acceptTeamInvite(props.project.team);
+  props.updateMembers();
+};
 
-async function updateMembers(): Promise<void> {
-  if (props.updateMembers) {
-    await props.updateMembers();
-  } else {
-    emit("updateMembers");
-  }
-}
+const declineInvite = () => {
+  removeTeamMember(props.project.team, props.auth.user.id);
+  props.updateMembers();
+};
 
-function setProcessing(processing: boolean): void {
-  if (props.setProcessing) {
-    props.setProcessing(processing);
-  } else {
-    emit("setProcessing", processing);
+const submitForReview = async () => {
+  if (
+    !props.acknowledgedMessage ||
+    nags.value.filter((x) => x.condition && x.status === "required").length === 0
+  ) {
+    await props.setProcessing();
   }
-}
-
-async function acceptInvite(): Promise<void> {
-  try {
-    setProcessing(true);
-    await acceptTeamInvite(props.project.team);
-    await updateMembers();
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.success),
-      text: formatMessage(messages.successJoin),
-      type: "success",
-    });
-  } catch (error) {
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.error),
-      text: formatMessage(messages.errorJoin),
-      type: "error",
-    });
-  } finally {
-    setProcessing(false);
-  }
-}
-
-async function declineInvite(): Promise<void> {
-  try {
-    setProcessing(true);
-    await removeTeamMember(props.project.team, props.auth.user.id);
-    await updateMembers();
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.success),
-      text: formatMessage(messages.successDecline),
-      type: "success",
-    });
-  } catch (error) {
-    addNotification({
-      group: "main",
-      title: formatMessage(messages.error),
-      text: formatMessage(messages.errorDecline),
-      type: "error",
-    });
-  } finally {
-    setProcessing(false);
-  }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-.duration-250 {
-  transition-duration: 250ms;
+.invited {
+}
+
+.author-actions {
+  margin-top: var(--spacing-card-md);
+
+  &:empty {
+    display: none;
+  }
+
+  .invisible {
+    visibility: hidden;
+  }
+
+  .header__row {
+    align-items: center;
+    column-gap: var(--spacing-card-lg);
+    row-gap: var(--spacing-card-md);
+    max-width: 100%;
+
+    .header__title {
+      display: flex;
+      flex-wrap: wrap;
+      align-items: center;
+      column-gap: var(--spacing-card-lg);
+      row-gap: var(--spacing-card-md);
+      flex-basis: min-content;
+
+      h2 {
+        margin: 0 auto 0 0;
+      }
+    }
+
+    button {
+      svg {
+        transition: transform 0.25s ease-in-out;
+      }
+
+      &.not-collapsed svg {
+        transform: rotate(180deg);
+      }
+    }
+  }
+
+  .grid-display__item .label {
+    display: flex;
+    gap: var(--spacing-card-xs);
+    align-items: center;
+
+    .required {
+      color: var(--color-red);
+    }
+
+    .suggestion {
+      color: var(--color-purple);
+    }
+
+    .review {
+      color: var(--color-orange);
+    }
+  }
+
+  .checklist {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    gap: var(--spacing-card-xs);
+    width: fit-content;
+    flex-wrap: wrap;
+    max-width: 100%;
+
+    .checklist__title {
+      font-weight: bold;
+      margin-right: var(--spacing-card-xs);
+      color: var(--color-text-dark);
+    }
+
+    .checklist__items {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      gap: var(--spacing-card-xs);
+      width: fit-content;
+      max-width: 100%;
+    }
+
+    .circle {
+      --circle-size: 2rem;
+      --background-color: var(--color-bg);
+      --content-color: var(--color-gray);
+      width: var(--circle-size);
+      height: var(--circle-size);
+      border-radius: 50%;
+      background-color: var(--background-color);
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      svg {
+        color: var(--content-color);
+        width: calc(var(--circle-size) / 2);
+        height: calc(var(--circle-size) / 2);
+      }
+
+      &.required {
+        --content-color: var(--color-red);
+      }
+
+      &.suggestion {
+        --content-color: var(--color-purple);
+      }
+
+      &.review {
+        --content-color: var(--color-orange);
+      }
+
+      &.done {
+        --background-color: var(--color-green);
+        --content-color: var(--color-brand-inverted);
+      }
+    }
+  }
 }
 </style>

apps/frontend/src/locales/en-US/index.json

@@ -554,78 +554,6 @@
   "profile.user-id": {
     "message": "User ID: {id}"
   },
-  "project-member-header.accept": {
-    "message": "Accept"
-  },
-  "project-member-header.action": {
-    "message": "Action"
-  },
-  "project-member-header.decline": {
-    "message": "Decline"
-  },
-  "project-member-header.error": {
-    "message": "Error"
-  },
-  "project-member-header.error-decline": {
-    "message": "Failed to decline team invitation"
-  },
-  "project-member-header.error-join": {
-    "message": "Failed to accept team invitation"
-  },
-  "project-member-header.invitation-no-role": {
-    "message": "You've been invited to join this project. Please accept or decline the invitation."
-  },
-  "project-member-header.invitation-title": {
-    "message": "Invitation to join project"
-  },
-  "project-member-header.invitation-with-role": {
-    "message": "You've been invited be a member of this project with the role of '{role}'."
-  },
-  "project-member-header.key-title": {
-    "message": "Status Key"
-  },
-  "project-member-header.publishing-checklist": {
-    "message": "Publishing checklist"
-  },
-  "project-member-header.required": {
-    "message": "Required"
-  },
-  "project-member-header.resubmit-for-review": {
-    "message": "Resubmit for review"
-  },
-  "project-member-header.resubmit-for-review-desc": {
-    "message": "Your project has been {status} by Modrinth's staff. In most cases, you can resubmit for review after addressing the staff's message."
-  },
-  "project-member-header.show-key": {
-    "message": "Toggle key"
-  },
-  "project-member-header.submit-checklist-tooltip": {
-    "message": "You must complete the required steps in the publishing checklist!"
-  },
-  "project-member-header.submit-for-review": {
-    "message": "Submit for review"
-  },
-  "project-member-header.submit-for-review-desc": {
-    "message": "Your project is only viewable by members of the project. It must be reviewed by moderators in order to be published."
-  },
-  "project-member-header.success": {
-    "message": "Success"
-  },
-  "project-member-header.success-decline": {
-    "message": "You have declined the team invitation"
-  },
-  "project-member-header.success-join": {
-    "message": "You have joined the project team"
-  },
-  "project-member-header.suggestion": {
-    "message": "Suggestion"
-  },
-  "project-member-header.visit-moderation-page": {
-    "message": "Visit moderation page"
-  },
-  "project-member-header.warning": {
-    "message": "Warning"
-  },
   "project-type.collection.plural": {
     "message": "Collections"
   },

apps/frontend/src/pages/[type]/[id]/settings/description.vue

@@ -22,10 +22,6 @@
         "
         :on-image-upload="onUploadHandler"
       />
-      <div v-if="descriptionWarning" class="flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ descriptionWarning }}
-      </div>
       <div class="input-group markdown-disclaimer">
         <button
           :disabled="!hasChanges"
@@ -42,8 +38,7 @@
 </template>
 
 <script lang="ts" setup>
-import { SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import { countText, MIN_DESCRIPTION_CHARS } from "@modrinth/moderation";
+import { SaveIcon } from "@modrinth/assets";
 import { MarkdownEditor } from "@modrinth/ui";
 import { type Project, type TeamMember, TeamMemberPermission } from "@modrinth/utils";
 import { computed, ref } from "vue";
@@ -58,17 +53,6 @@ const props = defineProps<{
 
 const description = ref(props.project.body);
 
-const descriptionWarning = computed(() => {
-  const text = description.value?.trim() || "";
-  const charCount = countText(text);
-
-  if (charCount < MIN_DESCRIPTION_CHARS) {
-    return `It's recommended to have a description with at least ${MIN_DESCRIPTION_CHARS} readable characters. (${charCount}/${MIN_DESCRIPTION_CHARS})`;
-  }
-
-  return null;
-});
-
 const patchRequestPayload = computed(() => {
   const payload: {
     body?: string;

apps/frontend/src/pages/[type]/[id]/settings/index.vue

@@ -82,10 +82,6 @@
       <label for="project-summary">
         <span class="label__title">Summary</span>
       </label>
-      <div v-if="summaryWarning" class="my-2 flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ summaryWarning }}
-      </div>
       <div class="textarea-wrapper summary-input">
         <textarea
           id="project-summary"
@@ -244,18 +240,9 @@
 
 <script setup>
 import { formatProjectStatus, formatProjectType } from "@modrinth/utils";
-import {
-  UploadIcon,
-  SaveIcon,
-  TrashIcon,
-  XIcon,
-  IssuesIcon,
-  CheckIcon,
-  TriangleAlertIcon,
-} from "@modrinth/assets";
+import { UploadIcon, SaveIcon, TrashIcon, XIcon, IssuesIcon, CheckIcon } from "@modrinth/assets";
 import { Multiselect } from "vue-multiselect";
 import { ConfirmModal, Avatar } from "@modrinth/ui";
-import { MIN_SUMMARY_CHARS } from "@modrinth/moderation";
 import FileInput from "~/components/ui/FileInput.vue";
 
 const props = defineProps({
@@ -313,17 +300,6 @@ const hasDeletePermission = computed(() => {
   return (props.currentMember.permissions & DELETE_PROJECT) === DELETE_PROJECT;
 });
 
-const summaryWarning = computed(() => {
-  const text = summary.value?.trim() || "";
-  const charCount = text.length;
-
-  if (charCount < MIN_SUMMARY_CHARS) {
-    return `It's recommended to have a summary with at least ${MIN_SUMMARY_CHARS} characters. (${charCount}/${MIN_SUMMARY_CHARS})`;
-  }
-
-  return null;
-});
-
 const sideTypes = ["required", "optional", "unsupported"];
 
 const patchData = computed(() => {

apps/frontend/src/pages/[type]/[id]/settings/links.vue

@@ -7,26 +7,11 @@
           id="project-issue-tracker"
           title="A place for users to report bugs, issues, and concerns about your project."
         >
-          <span class="label__title">Issue tracker </span>
+          <span class="label__title">Issue tracker</span>
           <span class="label__description">
             A place for users to report bugs, issues, and concerns about your project.
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isIssuesLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isIssuesDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isIssuesUrlCommon"
-          v-tooltip="`Link includes a domain which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-issue-tracker"
           v-model="issuesUrl"
@@ -41,26 +26,11 @@
           id="project-source-code"
           title="A page/repository containing the source code for your project"
         >
-          <span class="label__title">Source code </span>
+          <span class="label__title">Source code</span>
           <span class="label__description">
             A page/repository containing the source code for your project
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isSourceLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isSourceDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isSourceUrlCommon"
-          v-tooltip="`Link includes a domain which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-source-code"
           v-model="sourceUrl"
@@ -80,16 +50,6 @@
             A page containing information, documentation, and help for the project.
           </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isWikiLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="isWikiDiscordUrl"
-          v-tooltip="`Discord invites are not appropriate for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-wiki-page"
           v-model="wikiUrl"
@@ -101,19 +61,9 @@
       </div>
       <div class="adjacent-input">
         <label id="project-discord-invite" title="An invitation link to your Discord server.">
-          <span class="label__title">Discord invite </span>
+          <span class="label__title">Discord invite</span>
           <span class="label__description"> An invitation link to your Discord server. </span>
         </label>
-        <TriangleAlertIcon
-          v-if="isDiscordLinkShortener"
-          v-tooltip="`Use of link shorteners is prohibited.`"
-          class="size-6 animate-pulse text-orange"
-        />
-        <TriangleAlertIcon
-          v-else-if="!isDiscordUrlCommon"
-          v-tooltip="`You're using a link which isn't common for this link type.`"
-          class="size-6 animate-pulse text-orange"
-        />
         <input
           id="project-discord-invite"
           v-model="discordUrl"
@@ -173,13 +123,7 @@
 
 <script setup>
 import { DropdownSelect } from "@modrinth/ui";
-import { SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import {
-  isCommonUrl,
-  isDiscordUrl,
-  isLinkShortener,
-  commonLinkDomains,
-} from "@modrinth/moderation";
+import { SaveIcon } from "@modrinth/assets";
 
 const tags = useTags();
 
@@ -209,46 +153,6 @@ const sourceUrl = ref(props.project.source_url);
 const wikiUrl = ref(props.project.wiki_url);
 const discordUrl = ref(props.project.discord_url);
 
-const isIssuesUrlCommon = computed(() => {
-  if (!issuesUrl.value || issuesUrl.value.trim().length === 0) return true;
-  return isCommonUrl(issuesUrl.value, commonLinkDomains.issues);
-});
-
-const isSourceUrlCommon = computed(() => {
-  if (!sourceUrl.value || sourceUrl.value.trim().length === 0) return true;
-  return isCommonUrl(sourceUrl.value, commonLinkDomains.source);
-});
-
-const isDiscordUrlCommon = computed(() => {
-  if (!discordUrl.value || discordUrl.value.trim().length === 0) return true;
-  return isCommonUrl(discordUrl.value, commonLinkDomains.discord);
-});
-
-const isIssuesDiscordUrl = computed(() => {
-  return isDiscordUrl(issuesUrl.value);
-});
-
-const isSourceDiscordUrl = computed(() => {
-  return isDiscordUrl(sourceUrl.value);
-});
-
-const isWikiDiscordUrl = computed(() => {
-  return isDiscordUrl(wikiUrl.value);
-});
-
-const isIssuesLinkShortener = computed(() => {
-  return isLinkShortener(issuesUrl.value);
-});
-const isSourceLinkShortener = computed(() => {
-  return isLinkShortener(sourceUrl.value);
-});
-const isWikiLinkShortener = computed(() => {
-  return isLinkShortener(wikiUrl.value);
-});
-const isDiscordLinkShortener = computed(() => {
-  return isLinkShortener(discordUrl.value);
-});
-
 const rawDonationLinks = JSON.parse(JSON.stringify(props.project.donation_urls));
 rawDonationLinks.push({
   id: null,

apps/frontend/src/pages/[type]/[id]/settings/tags.vue

@@ -6,31 +6,11 @@
           <span class="label__title size-card-header">Tags</span>
         </h3>
       </div>
-
-      <div
-        v-if="tooManyTagsWarning && !allTagsSelectedWarning"
-        class="my-2 flex items-center gap-1.5 text-orange"
-      >
-        <TriangleAlertIcon class="my-auto" />
-        {{ tooManyTagsWarning }}
-      </div>
-
-      <div v-if="multipleResolutionTagsWarning" class="my-2 flex items-center gap-1.5 text-orange">
-        <TriangleAlertIcon class="my-auto" />
-        {{ multipleResolutionTagsWarning }}
-      </div>
-
-      <div v-if="allTagsSelectedWarning" class="my-2 flex items-center gap-1.5 text-red">
-        <TriangleAlertIcon class="my-auto" />
-        <span>{{ allTagsSelectedWarning }}</span>
-      </div>
-
       <p>
         Accurate tagging is important to help people find your
         {{ formatProjectType(project.project_type).toLowerCase() }}. Make sure to select all tags
         that apply.
       </p>
-
       <p v-if="project.versions.length === 0" class="known-errors">
         Please upload a version first in order to select tags!
       </p>
@@ -132,188 +112,145 @@
   </div>
 </template>
 
-<script setup lang="ts">
-import { computed, ref } from "vue";
-import { StarIcon, SaveIcon, TriangleAlertIcon } from "@modrinth/assets";
-import {
-  formatCategory,
-  formatCategoryHeader,
-  formatProjectType,
-  sortedCategories,
-  type Project,
-} from "@modrinth/utils";
+<script>
+import { StarIcon, SaveIcon } from "@modrinth/assets";
+import { formatCategory, formatCategoryHeader, formatProjectType } from "@modrinth/utils";
 import Checkbox from "~/components/ui/Checkbox.vue";
 
-interface Category {
-  name: string;
-  header: string;
-  icon?: string;
-  project_type: string;
-}
+export default defineNuxtComponent({
+  components: {
+    Checkbox,
+    SaveIcon,
+    StarIcon,
+  },
+  props: {
+    project: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    allMembers: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    currentMember: {
+      type: Object,
+      default() {
+        return null;
+      },
+    },
+    patchProject: {
+      type: Function,
+      default() {
+        return () => {
+          this.$notify({
+            group: "main",
+            title: "An error occurred",
+            text: "Patch project function not found",
+            type: "error",
+          });
+        };
+      },
+    },
+  },
+  data() {
+    return {
+      selectedTags: this.$sortedCategories().filter(
+        (x) =>
+          x.project_type === this.project.actualProjectType &&
+          (this.project.categories.includes(x.name) ||
+            this.project.additional_categories.includes(x.name)),
+      ),
+      featuredTags: this.$sortedCategories().filter(
+        (x) =>
+          x.project_type === this.project.actualProjectType &&
+          this.project.categories.includes(x.name),
+      ),
+    };
+  },
+  computed: {
+    categoryLists() {
+      const lists = {};
+      this.$sortedCategories().forEach((x) => {
+        if (x.project_type === this.project.actualProjectType) {
+          const header = x.header;
+          if (!lists[header]) {
+            lists[header] = [];
+          }
+          lists[header].push(x);
+        }
+      });
+      return lists;
+    },
+    patchData() {
+      const data = {};
+      // Promote selected categories to featured if there are less than 3 featured
+      const newFeaturedTags = this.featuredTags.slice();
+      if (newFeaturedTags.length < 1 && this.selectedTags.length > newFeaturedTags.length) {
+        const nonFeaturedCategories = this.selectedTags.filter((x) => !newFeaturedTags.includes(x));
 
-interface Props {
-  project: Project & {
-    actualProjectType: string;
-  };
-  allMembers?: any[];
-  currentMember?: any;
-  patchProject?: (data: any) => void;
-}
+        nonFeaturedCategories
+          .slice(0, Math.min(nonFeaturedCategories.length, 3 - newFeaturedTags.length))
+          .forEach((x) => newFeaturedTags.push(x));
+      }
+      // Convert selected and featured categories to backend-usable arrays
+      const categories = newFeaturedTags.map((x) => x.name);
+      const additionalCategories = this.selectedTags
+        .filter((x) => !newFeaturedTags.includes(x))
+        .map((x) => x.name);
 
-const tags = useTags();
+      if (
+        categories.length !== this.project.categories.length ||
+        categories.some((value) => !this.project.categories.includes(value))
+      ) {
+        data.categories = categories;
+      }
 
-const props = withDefaults(defineProps<Props>(), {
-  allMembers: () => [],
-  currentMember: null,
-  patchProject: () => {
-    addNotification({
-      title: "An error occurred",
-      text: "Patch project function not found",
-      type: "error",
-    });
+      if (
+        additionalCategories.length !== this.project.additional_categories.length ||
+        additionalCategories.some((value) => !this.project.additional_categories.includes(value))
+      ) {
+        data.additional_categories = additionalCategories;
+      }
+
+      return data;
+    },
+    hasChanges() {
+      return Object.keys(this.patchData).length > 0;
+    },
+  },
+  methods: {
+    formatProjectType,
+    formatCategoryHeader,
+    formatCategory,
+    toggleCategory(category) {
+      if (this.selectedTags.includes(category)) {
+        this.selectedTags = this.selectedTags.filter((x) => x !== category);
+        if (this.featuredTags.includes(category)) {
+          this.featuredTags = this.featuredTags.filter((x) => x !== category);
+        }
+      } else {
+        this.selectedTags.push(category);
+      }
+    },
+    toggleFeaturedCategory(category) {
+      if (this.featuredTags.includes(category)) {
+        this.featuredTags = this.featuredTags.filter((x) => x !== category);
+      } else {
+        this.featuredTags.push(category);
+      }
+    },
+    saveChanges() {
+      if (this.hasChanges) {
+        this.patchProject(this.patchData);
+      }
+    },
   },
 });
-
-const selectedTags = ref<Category[]>(
-  sortedCategories(tags.value).filter(
-    (x: Category) =>
-      x.project_type === props.project.actualProjectType &&
-      (props.project.categories.includes(x.name) ||
-        props.project.additional_categories.includes(x.name)),
-  ),
-);
-
-const featuredTags = ref<Category[]>(
-  sortedCategories(tags.value).filter(
-    (x: Category) =>
-      x.project_type === props.project.actualProjectType &&
-      props.project.categories.includes(x.name),
-  ),
-);
-
-const categoryLists = computed(() => {
-  const lists: Record<string, Category[]> = {};
-  sortedCategories(tags.value).forEach((x: Category) => {
-    if (x.project_type === props.project.actualProjectType) {
-      const header = x.header;
-      if (!lists[header]) {
-        lists[header] = [];
-      }
-      lists[header].push(x);
-    }
-  });
-  return lists;
-});
-
-const tooManyTagsWarning = computed(() => {
-  const tagCount = selectedTags.value.length;
-  if (tagCount > 8) {
-    return `You've selected ${tagCount} tags. Consider reducing to 8 or fewer to keep your project focused and easier to discover.`;
-  }
-  return null;
-});
-
-const multipleResolutionTagsWarning = computed(() => {
-  if (props.project.project_type !== "resourcepack") return null;
-
-  const resolutionTags = selectedTags.value.filter((tag) =>
-    ["8x-", "16x", "32x", "48x", "64x", "128x", "256x", "512x+"].includes(tag.name),
-  );
-
-  if (resolutionTags.length > 1) {
-    return `You've selected ${resolutionTags.length} resolution tags (${resolutionTags
-      .map((t) => t.name)
-      .join(", ")
-      .replace("8x-", "8x or lower")
-      .replace(
-        "512x+",
-        "512x or higher",
-      )}). Resource packs should typically only have one resolution tag.`;
-  }
-  return null;
-});
-
-const allTagsSelectedWarning = computed(() => {
-  const categoriesForProjectType = sortedCategories(tags.value).filter(
-    (x: Category) => x.project_type === props.project.actualProjectType,
-  );
-  const totalSelectedTags = selectedTags.value.length;
-
-  if (
-    totalSelectedTags === categoriesForProjectType.length &&
-    categoriesForProjectType.length > 0
-  ) {
-    return `You've selected all ${categoriesForProjectType.length} available tags. Please select only the tags that truly apply to your project.`;
-  }
-  return null;
-});
-
-const patchData = computed(() => {
-  const data: Record<string, string[]> = {};
-
-  // Promote selected categories to featured if there are less than 3 featured
-  const newFeaturedTags = featuredTags.value.slice();
-  if (newFeaturedTags.length < 1 && selectedTags.value.length > newFeaturedTags.length) {
-    const nonFeaturedCategories = selectedTags.value.filter((x) => !newFeaturedTags.includes(x));
-
-    nonFeaturedCategories
-      .slice(0, Math.min(nonFeaturedCategories.length, 3 - newFeaturedTags.length))
-      .forEach((x) => newFeaturedTags.push(x));
-  }
-
-  // Convert selected and featured categories to backend-usable arrays
-  const categories = newFeaturedTags.map((x) => x.name);
-  const additionalCategories = selectedTags.value
-    .filter((x) => !newFeaturedTags.includes(x))
-    .map((x) => x.name);
-
-  if (
-    categories.length !== props.project.categories.length ||
-    categories.some((value) => !props.project.categories.includes(value))
-  ) {
-    data.categories = categories;
-  }
-
-  if (
-    additionalCategories.length !== props.project.additional_categories.length ||
-    additionalCategories.some((value) => !props.project.additional_categories.includes(value))
-  ) {
-    data.additional_categories = additionalCategories;
-  }
-
-  return data;
-});
-
-const hasChanges = computed(() => {
-  return Object.keys(patchData.value).length > 0;
-});
-
-const toggleCategory = (category: Category) => {
-  if (selectedTags.value.includes(category)) {
-    selectedTags.value = selectedTags.value.filter((x) => x !== category);
-    if (featuredTags.value.includes(category)) {
-      featuredTags.value = featuredTags.value.filter((x) => x !== category);
-    }
-  } else {
-    selectedTags.value.push(category);
-  }
-};
-
-const toggleFeaturedCategory = (category: Category) => {
-  if (featuredTags.value.includes(category)) {
-    featuredTags.value = featuredTags.value.filter((x) => x !== category);
-  } else {
-    featuredTags.value.push(category);
-  }
-};
-
-const saveChanges = () => {
-  if (hasChanges.value) {
-    props.patchProject(patchData.value);
-  }
-};
 </script>
-
 <style lang="scss" scoped>
 .label__title {
   display: flex;

apps/labrinth/src/auth/checks.rs

@@ -322,12 +322,11 @@ pub async fn is_visible_collection(
     } else {
         !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())
-        {
-            authorized = true;
-        }
+    if let Some(user) = &user_option
+        && !authorized
+        && (user.role.is_mod() || user.id == collection_data.user_id.into())
+    {
+        authorized = true;
     }
     Ok(authorized)
 }
@@ -356,10 +355,10 @@ pub async fn filter_visible_collections(
 
     for collection in check_collections {
         // Collections are simple- if we are the owner or a mod, we can see it
-        if let Some(user) = user_option {
-            if user.role.is_mod() || user.id == collection.user_id.into() {
-                return_collections.push(collection.into());
-            }
+        if let Some(user) = user_option
+            && (user.role.is_mod() || user.id == collection.user_id.into())
+        {
+            return_collections.push(collection.into());
         }
     }
 

apps/labrinth/src/database/models/flow_item.rs

@@ -95,10 +95,10 @@ impl DBFlow {
         redis: &RedisPool,
     ) -> Result<Option<DBFlow>, DatabaseError> {
         let flow = Self::get(id, redis).await?;
-        if let Some(flow) = flow.as_ref() {
-            if predicate(flow) {
-                Self::remove(id, redis).await?;
-            }
+        if let Some(flow) = flow.as_ref()
+            && predicate(flow)
+        {
+            Self::remove(id, redis).await?;
         }
         Ok(flow)
     }

apps/labrinth/src/database/models/loader_fields.rs

@@ -801,24 +801,24 @@ impl VersionField {
         };
 
         if let Some(count) = countable {
-            if let Some(min) = loader_field.min_val {
-                if count < min {
-                    return Err(format!(
-                        "Provided value '{v}' for {field_name} is less than the minimum of {min}",
-                        v = serde_json::to_string(&value).unwrap_or_default(),
-                        field_name = loader_field.field,
-                    ));
-                }
+            if let Some(min) = loader_field.min_val
+                && count < min
+            {
+                return Err(format!(
+                    "Provided value '{v}' for {field_name} is less than the minimum of {min}",
+                    v = serde_json::to_string(&value).unwrap_or_default(),
+                    field_name = loader_field.field,
+                ));
             }
 
-            if let Some(max) = loader_field.max_val {
-                if count > max {
-                    return Err(format!(
-                        "Provided value '{v}' for {field_name} is greater than the maximum of {max}",
-                        v = serde_json::to_string(&value).unwrap_or_default(),
-                        field_name = loader_field.field,
-                    ));
-                }
+            if let Some(max) = loader_field.max_val
+                && count > max
+            {
+                return Err(format!(
+                    "Provided value '{v}' for {field_name} is greater than the maximum of {max}",
+                    v = serde_json::to_string(&value).unwrap_or_default(),
+                    field_name = loader_field.field,
+                ));
             }
         }
 

apps/labrinth/src/database/models/team_item.rs

@@ -483,20 +483,20 @@ impl DBTeamMember {
             .await?;
         }
 
-        if let Some(accepted) = new_accepted {
-            if accepted {
-                sqlx::query!(
-                    "
+        if let Some(accepted) = new_accepted
+            && accepted
+        {
+            sqlx::query!(
+                "
                     UPDATE team_members
                     SET accepted = TRUE
                     WHERE (team_id = $1 AND user_id = $2)
                     ",
-                    id as DBTeamId,
-                    user_id as DBUserId,
-                )
-                .execute(&mut **transaction)
-                .await?;
-            }
+                id as DBTeamId,
+                user_id as DBUserId,
+            )
+            .execute(&mut **transaction)
+            .await?;
         }
 
         if let Some(payouts_split) = new_payouts_split {

apps/labrinth/src/database/redis.rs

@@ -353,10 +353,10 @@ impl RedisPool {
             };
 
             for (idx, key) in fetch_ids.into_iter().enumerate() {
-                if let Some(locked) = results.get(idx) {
-                    if locked.is_none() {
-                        continue;
-                    }
+                if let Some(locked) = results.get(idx)
+                    && locked.is_none()
+                {
+                    continue;
                 }
 
                 if let Some((key, raw_key)) = ids.remove(&key) {

apps/labrinth/src/models/v2/projects.rs

@@ -334,18 +334,14 @@ impl From<Version> for LegacyVersion {
         // the v2 loaders are whatever the corresponding loader fields are
         let mut loaders =
             data.loaders.into_iter().map(|l| l.0).collect::<Vec<_>>();
-        if loaders.contains(&"mrpack".to_string()) {
-            if let Some((_, mrpack_loaders)) = data
+        if loaders.contains(&"mrpack".to_string())
+            && let Some((_, mrpack_loaders)) = data
                 .fields
                 .into_iter()
                 .find(|(key, _)| key == "mrpack_loaders")
-            {
-                if let Ok(mrpack_loaders) =
-                    serde_json::from_value(mrpack_loaders)
-                {
-                    loaders = mrpack_loaders;
-                }
-            }
+            && let Ok(mrpack_loaders) = serde_json::from_value(mrpack_loaders)
+        {
+            loaders = mrpack_loaders;
         }
         let loaders = loaders.into_iter().map(Loader).collect::<Vec<_>>();
 

apps/labrinth/src/models/v2/search.rs

@@ -43,35 +43,33 @@ impl LegacyResultSearchProject {
     pub fn from(result_search_project: ResultSearchProject) -> Self {
         let mut categories = result_search_project.categories;
         categories.extend(result_search_project.loaders.clone());
-        if categories.contains(&"mrpack".to_string()) {
-            if let Some(mrpack_loaders) = result_search_project
+        if categories.contains(&"mrpack".to_string())
+            && let Some(mrpack_loaders) = result_search_project
                 .project_loader_fields
                 .get("mrpack_loaders")
-            {
-                categories.extend(
-                    mrpack_loaders
-                        .iter()
-                        .filter_map(|c| c.as_str())
-                        .map(String::from),
-                );
-                categories.retain(|c| c != "mrpack");
-            }
+        {
+            categories.extend(
+                mrpack_loaders
+                    .iter()
+                    .filter_map(|c| c.as_str())
+                    .map(String::from),
+            );
+            categories.retain(|c| c != "mrpack");
         }
         let mut display_categories = result_search_project.display_categories;
         display_categories.extend(result_search_project.loaders);
-        if display_categories.contains(&"mrpack".to_string()) {
-            if let Some(mrpack_loaders) = result_search_project
+        if display_categories.contains(&"mrpack".to_string())
+            && let Some(mrpack_loaders) = result_search_project
                 .project_loader_fields
                 .get("mrpack_loaders")
-            {
-                categories.extend(
-                    mrpack_loaders
-                        .iter()
-                        .filter_map(|c| c.as_str())
-                        .map(String::from),
-                );
-                display_categories.retain(|c| c != "mrpack");
-            }
+        {
+            categories.extend(
+                mrpack_loaders
+                    .iter()
+                    .filter_map(|c| c.as_str())
+                    .map(String::from),
+            );
+            display_categories.retain(|c| c != "mrpack");
         }
 
         // Sort then remove duplicates

apps/labrinth/src/models/v3/projects.rs

@@ -166,10 +166,10 @@ impl From<ProjectQueryResult> for Project {
                     Ok(spdx_expr) => {
                         let mut vec: Vec<&str> = Vec::new();
                         for node in spdx_expr.iter() {
-                            if let spdx::expression::ExprNode::Req(req) = node {
-                                if let Some(id) = req.req.license.id() {
-                                    vec.push(id.full_name);
-                                }
+                            if let spdx::expression::ExprNode::Req(req) = node
+                                && let Some(id) = req.req.license.id()
+                            {
+                                vec.push(id.full_name);
                             }
                         }
                         // spdx crate returns AND/OR operations in postfix order

apps/labrinth/src/models/v3/teams.rs

@@ -51,16 +51,16 @@ impl ProjectPermissions {
             return Some(ProjectPermissions::all());
         }
 
-        if let Some(member) = project_team_member {
-            if member.accepted {
-                return Some(member.permissions);
-            }
+        if let Some(member) = project_team_member
+            && member.accepted
+        {
+            return Some(member.permissions);
         }
 
-        if let Some(member) = organization_team_member {
-            if member.accepted {
-                return Some(member.permissions);
-            }
+        if let Some(member) = organization_team_member
+            && member.accepted
+        {
+            return Some(member.permissions);
         }
 
         if role.is_mod() {
@@ -107,10 +107,10 @@ impl OrganizationPermissions {
             return Some(OrganizationPermissions::all());
         }
 
-        if let Some(member) = team_member {
-            if member.accepted {
-                return member.organization_permissions;
-            }
+        if let Some(member) = team_member
+            && member.accepted
+        {
+            return member.organization_permissions;
         }
         if role.is_mod() {
             return Some(

apps/labrinth/src/queue/maxmind.rs

@@ -45,17 +45,15 @@ impl MaxMindIndexer {
 
         if let Ok(entries) = archive.entries() {
             for mut file in entries.flatten() {
-                if let Ok(path) = file.header().path() {
-                    if path.extension().and_then(|x| x.to_str()) == Some("mmdb")
-                    {
-                        let mut buf = Vec::new();
-                        file.read_to_end(&mut buf).unwrap();
+                if let Ok(path) = file.header().path()
+                    && path.extension().and_then(|x| x.to_str()) == Some("mmdb")
+                {
+                    let mut buf = Vec::new();
+                    file.read_to_end(&mut buf).unwrap();
 
-                        let reader =
-                            maxminddb::Reader::from_source(buf).unwrap();
+                    let reader = maxminddb::Reader::from_source(buf).unwrap();
 
-                        return Ok(Some(reader));
-                    }
+                    return Ok(Some(reader));
                 }
             }
         }

apps/labrinth/src/queue/moderation.rs

@@ -371,8 +371,8 @@ impl AutomatedModerationQueue {
                                         for file in
                                         files.iter().filter(|x| x.version_id == version.id.into())
                                         {
-                                            if let Some(hash) = file.hashes.get("sha1") {
-                                                if let Some((index, (sha1, _, file_name, _))) = hashes
+                                            if let Some(hash) = file.hashes.get("sha1")
+                                                && let Some((index, (sha1, _, file_name, _))) = hashes
                                                     .iter()
                                                     .enumerate()
                                                     .find(|(_, (value, _, _, _))| value == hash)
@@ -382,7 +382,6 @@ impl AutomatedModerationQueue {
 
                                                     hashes.remove(index);
                                                 }
-                                            }
                                         }
                                     }
 
@@ -420,12 +419,11 @@ impl AutomatedModerationQueue {
                                         .await?;
 
                                     for row in rows {
-                                        if let Some(sha1) = row.sha1 {
-                                            if let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == &sha1) {
+                                        if let Some(sha1) = row.sha1
+                                            && let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == &sha1) {
                                                 final_hashes.insert(sha1.clone(), IdentifiedFile { file_name: file_name.clone(), status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified) });
                                                 hashes.remove(index);
                                             }
-                                        }
                                     }
 
                                     if hashes.is_empty() {
@@ -499,8 +497,8 @@ impl AutomatedModerationQueue {
                                     let mut insert_ids = Vec::new();
 
                                     for row in rows {
-                                        if let Some((curse_index, (hash, _flame_id))) = flame_files.iter().enumerate().find(|(_, x)| Some(x.1 as i32) == row.flame_project_id) {
-                                            if let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == hash) {
+                                        if let Some((curse_index, (hash, _flame_id))) = flame_files.iter().enumerate().find(|(_, x)| Some(x.1 as i32) == row.flame_project_id)
+                                            && let Some((index, (sha1, _, file_name, _))) = hashes.iter().enumerate().find(|(_, (value, _, _, _))| value == hash) {
                                                 final_hashes.insert(sha1.clone(), IdentifiedFile {
                                                     file_name: file_name.clone(),
                                                     status: ApprovalType::from_string(&row.status).unwrap_or(ApprovalType::Unidentified),
@@ -512,7 +510,6 @@ impl AutomatedModerationQueue {
                                                 hashes.remove(index);
                                                 flame_files.remove(curse_index);
                                             }
-                                        }
                                     }
 
                                     if !insert_ids.is_empty() && !insert_hashes.is_empty() {
@@ -581,8 +578,8 @@ impl AutomatedModerationQueue {
                                     for (sha1, _pack_file, file_name, _mumur2) in hashes {
                                         let flame_file = flame_files.iter().find(|x| x.0 == sha1);
 
-                                        if let Some((_, flame_project_id)) = flame_file {
-                                            if let Some(project) = flame_projects.iter().find(|x| &x.id == flame_project_id) {
+                                        if let Some((_, flame_project_id)) = flame_file
+                                            && let Some(project) = flame_projects.iter().find(|x| &x.id == flame_project_id) {
                                                 missing_metadata.flame_files.insert(sha1, MissingMetadataFlame {
                                                     title: project.name.clone(),
                                                     file_name,
@@ -592,7 +589,6 @@ impl AutomatedModerationQueue {
 
                                                 continue;
                                             }
-                                        }
 
                                         missing_metadata.unknown_files.insert(sha1, file_name);
                                     }

apps/labrinth/src/queue/payouts.rs

@@ -257,31 +257,30 @@ impl PayoutsQueue {
             )
         })?;
 
-        if !status.is_success() {
-            if let Some(obj) = value.as_object() {
-                if let Some(array) = obj.get("errors") {
-                    #[derive(Deserialize)]
-                    struct TremendousError {
-                        message: String,
-                    }
-
-                    let err = serde_json::from_value::<TremendousError>(
-                        array.clone(),
-                    )
-                    .map_err(|_| {
-                        ApiError::Payments(
-                            "could not retrieve Tremendous error json body"
-                                .to_string(),
-                        )
-                    })?;
-
-                    return Err(ApiError::Payments(err.message));
+        if !status.is_success()
+            && let Some(obj) = value.as_object()
+        {
+            if let Some(array) = obj.get("errors") {
+                #[derive(Deserialize)]
+                struct TremendousError {
+                    message: String,
                 }
 
-                return Err(ApiError::Payments(
-                    "could not retrieve Tremendous error body".to_string(),
-                ));
+                let err =
+                    serde_json::from_value::<TremendousError>(array.clone())
+                        .map_err(|_| {
+                            ApiError::Payments(
+                                "could not retrieve Tremendous error json body"
+                                    .to_string(),
+                            )
+                        })?;
+
+                return Err(ApiError::Payments(err.message));
             }
+
+            return Err(ApiError::Payments(
+                "could not retrieve Tremendous error body".to_string(),
+            ));
         }
 
         Ok(serde_json::from_value(value)?)
@@ -449,10 +448,10 @@ impl PayoutsQueue {
                 };
 
                 // we do not support interval gift cards with non US based currencies since we cannot do currency conversions properly
-                if let PayoutInterval::Fixed { .. } = method.interval {
-                    if !product.currency_codes.contains(&"USD".to_string()) {
-                        continue;
-                    }
+                if let PayoutInterval::Fixed { .. } = method.interval
+                    && !product.currency_codes.contains(&"USD".to_string())
+                {
+                    continue;
                 }
 
                 methods.push(method);

apps/labrinth/src/routes/internal/billing.rs

@@ -286,17 +286,17 @@ pub async fn refund_charge(
         .upsert(&mut transaction)
         .await?;
 
-        if body.0.unprovision.unwrap_or(false) {
-            if let Some(subscription_id) = charge.subscription_id {
-                let open_charge =
-                    DBCharge::get_open_subscription(subscription_id, &**pool)
-                        .await?;
-                if let Some(mut open_charge) = open_charge {
-                    open_charge.status = ChargeStatus::Cancelled;
-                    open_charge.due = Utc::now();
+        if body.0.unprovision.unwrap_or(false)
+            && let Some(subscription_id) = charge.subscription_id
+        {
+            let open_charge =
+                DBCharge::get_open_subscription(subscription_id, &**pool)
+                    .await?;
+            if let Some(mut open_charge) = open_charge {
+                open_charge.status = ChargeStatus::Cancelled;
+                open_charge.due = Utc::now();
 
-                    open_charge.upsert(&mut transaction).await?;
-                }
+                open_charge.upsert(&mut transaction).await?;
             }
         }
 
@@ -392,17 +392,16 @@ pub async fn edit_subscription(
             }
         }
 
-        if let Some(interval) = &edit_subscription.interval {
-            if let Price::Recurring { intervals } = &current_price.prices {
-                if let Some(price) = intervals.get(interval) {
-                    open_charge.subscription_interval = Some(*interval);
-                    open_charge.amount = *price as i64;
-                } else {
-                    return Err(ApiError::InvalidInput(
-                        "Interval is not valid for this subscription!"
-                            .to_string(),
-                    ));
-                }
+        if let Some(interval) = &edit_subscription.interval
+            && let Price::Recurring { intervals } = &current_price.prices
+        {
+            if let Some(price) = intervals.get(interval) {
+                open_charge.subscription_interval = Some(*interval);
+                open_charge.amount = *price as i64;
+            } else {
+                return Err(ApiError::InvalidInput(
+                    "Interval is not valid for this subscription!".to_string(),
+                ));
             }
         }
 
@@ -1225,38 +1224,36 @@ pub async fn initiate_payment(
                     }
                 };
 
-                if let Price::Recurring { .. } = price_item.prices {
-                    if product.unitary {
-                        let user_subscriptions =
+                if let Price::Recurring { .. } = price_item.prices
+                    && product.unitary
+                {
+                    let user_subscriptions =
                         user_subscription_item::DBUserSubscription::get_all_user(
                             user.id.into(),
                             &**pool,
                         )
                         .await?;
 
-                        let user_products =
-                            product_item::DBProductPrice::get_many(
-                                &user_subscriptions
-                                    .iter()
-                                    .filter(|x| {
-                                        x.status
-                                            == SubscriptionStatus::Provisioned
-                                    })
-                                    .map(|x| x.price_id)
-                                    .collect::<Vec<_>>(),
-                                &**pool,
-                            )
-                            .await?;
+                    let user_products = product_item::DBProductPrice::get_many(
+                        &user_subscriptions
+                            .iter()
+                            .filter(|x| {
+                                x.status == SubscriptionStatus::Provisioned
+                            })
+                            .map(|x| x.price_id)
+                            .collect::<Vec<_>>(),
+                        &**pool,
+                    )
+                    .await?;
 
-                        if user_products
-                            .into_iter()
-                            .any(|x| x.product_id == product.id)
-                        {
-                            return Err(ApiError::InvalidInput(
-                                "You are already subscribed to this product!"
-                                    .to_string(),
-                            ));
-                        }
+                    if user_products
+                        .into_iter()
+                        .any(|x| x.product_id == product.id)
+                    {
+                        return Err(ApiError::InvalidInput(
+                            "You are already subscribed to this product!"
+                                .to_string(),
+                        ));
                     }
                 }
 
@@ -2004,38 +2001,36 @@ pub async fn stripe_webhook(
             EventType::PaymentMethodAttached => {
                 if let EventObject::PaymentMethod(payment_method) =
                     event.data.object
-                {
-                    if let Some(customer_id) =
+                    && let Some(customer_id) =
                         payment_method.customer.map(|x| x.id())
+                {
+                    let customer = stripe::Customer::retrieve(
+                        &stripe_client,
+                        &customer_id,
+                        &[],
+                    )
+                    .await?;
+
+                    if customer
+                        .invoice_settings
+                        .is_none_or(|x| x.default_payment_method.is_none())
                     {
-                        let customer = stripe::Customer::retrieve(
+                        stripe::Customer::update(
                             &stripe_client,
                             &customer_id,
-                            &[],
+                            UpdateCustomer {
+                                invoice_settings: Some(
+                                    CustomerInvoiceSettings {
+                                        default_payment_method: Some(
+                                            payment_method.id.to_string(),
+                                        ),
+                                        ..Default::default()
+                                    },
+                                ),
+                                ..Default::default()
+                            },
                         )
                         .await?;
-
-                        if customer
-                            .invoice_settings
-                            .is_none_or(|x| x.default_payment_method.is_none())
-                        {
-                            stripe::Customer::update(
-                                &stripe_client,
-                                &customer_id,
-                                UpdateCustomer {
-                                    invoice_settings: Some(
-                                        CustomerInvoiceSettings {
-                                            default_payment_method: Some(
-                                                payment_method.id.to_string(),
-                                            ),
-                                            ..Default::default()
-                                        },
-                                    ),
-                                    ..Default::default()
-                                },
-                            )
-                            .await?;
-                        }
                     }
                 }
             }

apps/labrinth/src/routes/internal/flows.rs

@@ -79,13 +79,12 @@ impl TempUser {
         file_host: &Arc<dyn FileHost + Send + Sync>,
         redis: &RedisPool,
     ) -> Result<crate::database::models::DBUserId, AuthenticationError> {
-        if let Some(email) = &self.email {
-            if crate::database::models::DBUser::get_by_email(email, client)
+        if let Some(email) = &self.email
+            && crate::database::models::DBUser::get_by_email(email, client)
                 .await?
                 .is_some()
-            {
-                return Err(AuthenticationError::DuplicateUser);
-            }
+        {
+            return Err(AuthenticationError::DuplicateUser);
         }
 
         let user_id =
@@ -1269,19 +1268,19 @@ pub async fn delete_auth_provider(
         .update_user_id(user.id.into(), None, &mut transaction)
         .await?;
 
-    if delete_provider.provider != AuthProvider::PayPal {
-        if let Some(email) = user.email {
-            send_email(
-                email,
-                "Authentication method removed",
-                &format!(
-                    "When logging into Modrinth, you can no longer log in using the {} authentication provider.",
-                    delete_provider.provider.as_str()
-                ),
-                "If you did not make this change, please contact us immediately through our support channels on Discord or via email (support@modrinth.com).",
-                None,
-            )?;
-        }
+    if delete_provider.provider != AuthProvider::PayPal
+        && let Some(email) = user.email
+    {
+        send_email(
+            email,
+            "Authentication method removed",
+            &format!(
+                "When logging into Modrinth, you can no longer log in using the {} authentication provider.",
+                delete_provider.provider.as_str()
+            ),
+            "If you did not make this change, please contact us immediately through our support channels on Discord or via email (support@modrinth.com).",
+            None,
+        )?;
     }
 
     transaction.commit().await?;

apps/labrinth/src/routes/internal/moderation.rs

@@ -189,17 +189,16 @@ pub async fn get_project_meta(
                 .iter()
                 .find(|x| Some(x.1.id as i32) == row.flame_project_id)
                 .map(|x| x.0.clone())
+                && let Some(val) = merged.flame_files.remove(&sha1)
             {
-                if let Some(val) = merged.flame_files.remove(&sha1) {
-                    merged.identified.insert(
-                        sha1,
-                        IdentifiedFile {
-                            file_name: val.file_name.clone(),
-                            status: ApprovalType::from_string(&row.status)
-                                .unwrap_or(ApprovalType::Unidentified),
-                        },
-                    );
-                }
+                merged.identified.insert(
+                    sha1,
+                    IdentifiedFile {
+                        file_name: val.file_name.clone(),
+                        status: ApprovalType::from_string(&row.status)
+                            .unwrap_or(ApprovalType::Unidentified),
+                    },
+                );
             }
         }
 

apps/labrinth/src/routes/internal/pats.rs

@@ -185,69 +185,69 @@ pub async fn edit_pat(
     )
     .await?;
 
-    if let Some(pat) = pat {
-        if pat.user_id == user.id.into() {
-            let mut transaction = pool.begin().await?;
+    if let Some(pat) = pat
+        && pat.user_id == user.id.into()
+    {
+        let mut transaction = pool.begin().await?;
 
-            if let Some(scopes) = &info.scopes {
-                if scopes.is_restricted() {
-                    return Err(ApiError::InvalidInput(
-                        "Invalid scopes requested!".to_string(),
-                    ));
-                }
+        if let Some(scopes) = &info.scopes {
+            if scopes.is_restricted() {
+                return Err(ApiError::InvalidInput(
+                    "Invalid scopes requested!".to_string(),
+                ));
+            }
 
-                sqlx::query!(
-                    "
+            sqlx::query!(
+                "
                     UPDATE pats
                     SET scopes = $1
                     WHERE id = $2
                     ",
-                    scopes.bits() as i64,
-                    pat.id.0
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-            if let Some(name) = &info.name {
-                sqlx::query!(
-                    "
+                scopes.bits() as i64,
+                pat.id.0
+            )
+            .execute(&mut *transaction)
+            .await?;
+        }
+        if let Some(name) = &info.name {
+            sqlx::query!(
+                "
                     UPDATE pats
                     SET name = $1
                     WHERE id = $2
                     ",
-                    name,
-                    pat.id.0
-                )
-                .execute(&mut *transaction)
-                .await?;
+                name,
+                pat.id.0
+            )
+            .execute(&mut *transaction)
+            .await?;
+        }
+        if let Some(expires) = &info.expires {
+            if expires < &Utc::now() {
+                return Err(ApiError::InvalidInput(
+                    "Expire date must be in the future!".to_string(),
+                ));
             }
-            if let Some(expires) = &info.expires {
-                if expires < &Utc::now() {
-                    return Err(ApiError::InvalidInput(
-                        "Expire date must be in the future!".to_string(),
-                    ));
-                }
 
-                sqlx::query!(
-                    "
+            sqlx::query!(
+                "
                     UPDATE pats
                     SET expires = $1
                     WHERE id = $2
                     ",
-                    expires,
-                    pat.id.0
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
-
-            transaction.commit().await?;
-            database::models::pat_item::DBPersonalAccessToken::clear_cache(
-                vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
-                &redis,
+                expires,
+                pat.id.0
             )
+            .execute(&mut *transaction)
             .await?;
         }
+
+        transaction.commit().await?;
+        database::models::pat_item::DBPersonalAccessToken::clear_cache(
+            vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
+            &redis,
+        )
+        .await?;
     }
 
     Ok(HttpResponse::NoContent().finish())
@@ -276,21 +276,21 @@ pub async fn delete_pat(
     )
     .await?;
 
-    if let Some(pat) = pat {
-        if pat.user_id == user.id.into() {
-            let mut transaction = pool.begin().await?;
-            database::models::pat_item::DBPersonalAccessToken::remove(
-                pat.id,
-                &mut transaction,
-            )
-            .await?;
-            transaction.commit().await?;
-            database::models::pat_item::DBPersonalAccessToken::clear_cache(
-                vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
-                &redis,
-            )
-            .await?;
-        }
+    if let Some(pat) = pat
+        && pat.user_id == user.id.into()
+    {
+        let mut transaction = pool.begin().await?;
+        database::models::pat_item::DBPersonalAccessToken::remove(
+            pat.id,
+            &mut transaction,
+        )
+        .await?;
+        transaction.commit().await?;
+        database::models::pat_item::DBPersonalAccessToken::clear_cache(
+            vec![(Some(pat.id), Some(pat.access_token), Some(pat.user_id))],
+            &redis,
+        )
+        .await?;
     }
 
     Ok(HttpResponse::NoContent().finish())

apps/labrinth/src/routes/internal/session.rs

@@ -185,21 +185,21 @@ pub async fn delete(
 
     let session = DBSession::get(info.into_inner().0, &**pool, &redis).await?;
 
-    if let Some(session) = session {
-        if session.user_id == current_user.id.into() {
-            let mut transaction = pool.begin().await?;
-            DBSession::remove(session.id, &mut transaction).await?;
-            transaction.commit().await?;
-            DBSession::clear_cache(
-                vec![(
-                    Some(session.id),
-                    Some(session.session),
-                    Some(session.user_id),
-                )],
-                &redis,
-            )
-            .await?;
-        }
+    if let Some(session) = session
+        && session.user_id == current_user.id.into()
+    {
+        let mut transaction = pool.begin().await?;
+        DBSession::remove(session.id, &mut transaction).await?;
+        transaction.commit().await?;
+        DBSession::clear_cache(
+            vec![(
+                Some(session.id),
+                Some(session.session),
+                Some(session.user_id),
+            )],
+            &redis,
+        )
+        .await?;
     }
 
     Ok(HttpResponse::NoContent().body(""))

apps/labrinth/src/routes/internal/statuses.rs

@@ -401,14 +401,13 @@ async fn broadcast_to_known_local_friends(
             friend.user_id
         };
 
-        if friend.accepted {
-            if let Some(socket_ids) =
+        if friend.accepted
+            && let Some(socket_ids) =
                 sockets.sockets_by_user_id.get(&friend_id.into())
-            {
-                for socket_id in socket_ids.iter() {
-                    if let Some(socket) = sockets.sockets.get(&socket_id) {
-                        let _ = send_message(socket.value(), &message).await;
-                    }
+        {
+            for socket_id in socket_ids.iter() {
+                if let Some(socket) = sockets.sockets.get(&socket_id) {
+                    let _ = send_message(socket.value(), &message).await;
                 }
             }
         }

apps/labrinth/src/routes/v3/analytics_get.rs

@@ -387,17 +387,16 @@ pub async fn revenue_get(
         .map(|x| (x.to_string(), HashMap::new()))
         .collect::<HashMap<_, _>>();
     for value in payouts_values {
-        if let Some(mod_id) = value.mod_id {
-            if let Some(amount) = value.amount_sum {
-                if let Some(interval_start) = value.interval_start {
-                    let id_string = to_base62(mod_id as u64);
-                    if !hm.contains_key(&id_string) {
-                        hm.insert(id_string.clone(), HashMap::new());
-                    }
-                    if let Some(hm) = hm.get_mut(&id_string) {
-                        hm.insert(interval_start.timestamp(), amount);
-                    }
-                }
+        if let Some(mod_id) = value.mod_id
+            && let Some(amount) = value.amount_sum
+            && let Some(interval_start) = value.interval_start
+        {
+            let id_string = to_base62(mod_id as u64);
+            if !hm.contains_key(&id_string) {
+                hm.insert(id_string.clone(), HashMap::new());
+            }
+            if let Some(hm) = hm.get_mut(&id_string) {
+                hm.insert(interval_start.timestamp(), amount);
             }
         }
     }

apps/labrinth/src/routes/v3/collections.rs

@@ -192,10 +192,10 @@ pub async fn collection_get(
     .map(|x| x.1)
     .ok();
 
-    if let Some(data) = collection_data {
-        if is_visible_collection(&data, &user_option, false).await? {
-            return Ok(HttpResponse::Ok().json(Collection::from(data)));
-        }
+    if let Some(data) = collection_data
+        && is_visible_collection(&data, &user_option, false).await?
+    {
+        return Ok(HttpResponse::Ok().json(Collection::from(data)));
     }
     Err(ApiError::NotFound)
 }

apps/labrinth/src/routes/v3/payouts.rs

@@ -536,11 +536,9 @@ pub async fn create_payout(
                         Some(true),
                     )
                     .await
+                    && let Some(data) = res.items.first()
                 {
-                    if let Some(data) = res.items.first() {
-                        payout_item.platform_id =
-                            Some(data.payout_item_id.clone());
-                    }
+                    payout_item.platform_id = Some(data.payout_item_id.clone());
                 }
             }
 

apps/labrinth/src/routes/v3/projects.rs

@@ -182,10 +182,10 @@ pub async fn project_get(
     .map(|x| x.1)
     .ok();
 
-    if let Some(data) = project_data {
-        if is_visible_project(&data.inner, &user_option, &pool, false).await? {
-            return Ok(HttpResponse::Ok().json(Project::from(data)));
-        }
+    if let Some(data) = project_data
+        && is_visible_project(&data.inner, &user_option, &pool, false).await?
+    {
+        return Ok(HttpResponse::Ok().json(Project::from(data)));
     }
     Err(ApiError::NotFound)
 }
@@ -403,34 +403,36 @@ pub async fn project_edit(
             .await?;
         }
 
-        if status.is_searchable() && !project_item.inner.webhook_sent {
-            if let Ok(webhook_url) = dotenvy::var("PUBLIC_DISCORD_WEBHOOK") {
-                crate::util::webhook::send_discord_webhook(
-                    project_item.inner.id.into(),
-                    &pool,
-                    &redis,
-                    webhook_url,
-                    None,
-                )
-                .await
-                .ok();
+        if status.is_searchable()
+            && !project_item.inner.webhook_sent
+            && let Ok(webhook_url) = dotenvy::var("PUBLIC_DISCORD_WEBHOOK")
+        {
+            crate::util::webhook::send_discord_webhook(
+                project_item.inner.id.into(),
+                &pool,
+                &redis,
+                webhook_url,
+                None,
+            )
+            .await
+            .ok();
 
-                sqlx::query!(
-                    "
+            sqlx::query!(
+                "
                     UPDATE mods
                     SET webhook_sent = TRUE
                     WHERE id = $1
                     ",
-                    id as db_ids::DBProjectId,
-                )
-                .execute(&mut *transaction)
-                .await?;
-            }
+                id as db_ids::DBProjectId,
+            )
+            .execute(&mut *transaction)
+            .await?;
         }
 
-        if user.role.is_mod() {
-            if let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK") {
-                crate::util::webhook::send_slack_webhook(
+        if user.role.is_mod()
+            && let Ok(webhook_url) = dotenvy::var("MODERATION_SLACK_WEBHOOK")
+        {
+            crate::util::webhook::send_slack_webhook(
                     project_item.inner.id.into(),
                     &pool,
                     &redis,
@@ -449,7 +451,6 @@ pub async fn project_edit(
                 )
                 .await
                 .ok();
-            }
         }
 
         if team_member.is_none_or(|x| !x.accepted) {
@@ -692,45 +693,45 @@ pub async fn project_edit(
         .await?;
     }
 
-    if let Some(links) = &new_project.link_urls {
-        if !links.is_empty() {
-            if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
-                return Err(ApiError::CustomAuthentication(
+    if let Some(links) = &new_project.link_urls
+        && !links.is_empty()
+    {
+        if !perms.contains(ProjectPermissions::EDIT_DETAILS) {
+            return Err(ApiError::CustomAuthentication(
                     "You do not have the permissions to edit the links of this project!"
                         .to_string(),
                 ));
-            }
+        }
 
-            let ids_to_delete = links.keys().cloned().collect::<Vec<String>>();
-            // Deletes all links from hashmap- either will be deleted or be replaced
-            sqlx::query!(
-                "
+        let ids_to_delete = links.keys().cloned().collect::<Vec<String>>();
+        // Deletes all links from hashmap- either will be deleted or be replaced
+        sqlx::query!(
+            "
                 DELETE FROM mods_links
                 WHERE joining_mod_id = $1 AND joining_platform_id IN (
                     SELECT id FROM link_platforms WHERE name = ANY($2)
                 )
                 ",
-                id as db_ids::DBProjectId,
-                &ids_to_delete
-            )
-            .execute(&mut *transaction)
-            .await?;
+            id as db_ids::DBProjectId,
+            &ids_to_delete
+        )
+        .execute(&mut *transaction)
+        .await?;
 
-            for (platform, url) in links {
-                if let Some(url) = url {
-                    let platform_id =
-                        db_models::categories::LinkPlatform::get_id(
-                            platform,
-                            &mut *transaction,
-                        )
-                        .await?
-                        .ok_or_else(|| {
-                            ApiError::InvalidInput(format!(
-                                "Platform {} does not exist.",
-                                platform.clone()
-                            ))
-                        })?;
-                    sqlx::query!(
+        for (platform, url) in links {
+            if let Some(url) = url {
+                let platform_id = db_models::categories::LinkPlatform::get_id(
+                    platform,
+                    &mut *transaction,
+                )
+                .await?
+                .ok_or_else(|| {
+                    ApiError::InvalidInput(format!(
+                        "Platform {} does not exist.",
+                        platform.clone()
+                    ))
+                })?;
+                sqlx::query!(
                         "
                         INSERT INTO mods_links (joining_mod_id, joining_platform_id, url)
                         VALUES ($1, $2, $3)
@@ -741,7 +742,6 @@ pub async fn project_edit(
                     )
                     .execute(&mut *transaction)
                     .await?;
-                }
             }
         }
     }
@@ -2430,7 +2430,7 @@ pub async fn project_get_organization(
             organization,
             team_members,
         );
-        return Ok(HttpResponse::Ok().json(organization));
+        Ok(HttpResponse::Ok().json(organization))
     } else {
         Err(ApiError::NotFound)
     }

apps/labrinth/src/routes/v3/teams.rs

@@ -767,12 +767,13 @@ pub async fn edit_team_member(
                 ));
             }
 
-            if let Some(new_permissions) = edit_member.permissions {
-                if !permissions.contains(new_permissions) {
-                    return Err(ApiError::InvalidInput(
-                        "The new permissions have permissions that you don't have".to_string(),
-                    ));
-                }
+            if let Some(new_permissions) = edit_member.permissions
+                && !permissions.contains(new_permissions)
+            {
+                return Err(ApiError::InvalidInput(
+                    "The new permissions have permissions that you don't have"
+                        .to_string(),
+                ));
             }
 
             if edit_member.organization_permissions.is_some() {
@@ -800,13 +801,12 @@ pub async fn edit_team_member(
             }
 
             if let Some(new_permissions) = edit_member.organization_permissions
+                && !organization_permissions.contains(new_permissions)
             {
-                if !organization_permissions.contains(new_permissions) {
-                    return Err(ApiError::InvalidInput(
+                return Err(ApiError::InvalidInput(
                         "The new organization permissions have permissions that you don't have"
                             .to_string(),
                     ));
-                }
             }
 
             if edit_member.permissions.is_some()
@@ -822,13 +822,13 @@ pub async fn edit_team_member(
         }
     }
 
-    if let Some(payouts_split) = edit_member.payouts_split {
-        if payouts_split < Decimal::ZERO || payouts_split > Decimal::from(5000)
-        {
-            return Err(ApiError::InvalidInput(
-                "Payouts split must be between 0 and 5000!".to_string(),
-            ));
-        }
+    if let Some(payouts_split) = edit_member.payouts_split
+        && (payouts_split < Decimal::ZERO
+            || payouts_split > Decimal::from(5000))
+    {
+        return Err(ApiError::InvalidInput(
+            "Payouts split must be between 0 and 5000!".to_string(),
+        ));
     }
 
     DBTeamMember::edit_team_member(
@@ -883,13 +883,13 @@ pub async fn transfer_ownership(
         DBTeam::get_association(id.into(), &**pool).await?;
     if let Some(TeamAssociationId::Project(pid)) = team_association_id {
         let result = DBProject::get_id(pid, &**pool, &redis).await?;
-        if let Some(project_item) = result {
-            if project_item.inner.organization_id.is_some() {
-                return Err(ApiError::InvalidInput(
+        if let Some(project_item) = result
+            && project_item.inner.organization_id.is_some()
+        {
+            return Err(ApiError::InvalidInput(
                     "You cannot transfer ownership of a project team that is owend by an organization"
                         .to_string(),
                 ));
-            }
         }
     }
 

apps/labrinth/src/routes/v3/threads.rs

@@ -289,36 +289,33 @@ pub async fn thread_get(
     .await?
     .1;
 
-    if let Some(mut data) = thread_data {
-        if is_authorized_thread(&data, &user, &pool).await? {
-            let authors = &mut data.members;
+    if let Some(mut data) = thread_data
+        && is_authorized_thread(&data, &user, &pool).await?
+    {
+        let authors = &mut data.members;
 
-            authors.append(
-                &mut data
-                    .messages
-                    .iter()
-                    .filter_map(|x| {
-                        if x.hide_identity && !user.role.is_mod() {
-                            None
-                        } else {
-                            x.author_id
-                        }
-                    })
-                    .collect::<Vec<_>>(),
-            );
+        authors.append(
+            &mut data
+                .messages
+                .iter()
+                .filter_map(|x| {
+                    if x.hide_identity && !user.role.is_mod() {
+                        None
+                    } else {
+                        x.author_id
+                    }
+                })
+                .collect::<Vec<_>>(),
+        );
 
-            let users: Vec<User> = database::models::DBUser::get_many_ids(
-                authors, &**pool, &redis,
-            )
-            .await?
-            .into_iter()
-            .map(From::from)
-            .collect();
+        let users: Vec<User> =
+            database::models::DBUser::get_many_ids(authors, &**pool, &redis)
+                .await?
+                .into_iter()
+                .map(From::from)
+                .collect();
 
-            return Ok(
-                HttpResponse::Ok().json(Thread::from(data, users, &user))
-            );
-        }
+        return Ok(HttpResponse::Ok().json(Thread::from(data, users, &user)));
     }
     Err(ApiError::NotFound)
 }
@@ -454,33 +451,32 @@ pub async fn thread_send_message(
             )
             .await?;
 
-            if let Some(project) = project {
-                if project.inner.status != ProjectStatus::Processing
-                    && user.role.is_mod()
-                {
-                    let members =
-                        database::models::DBTeamMember::get_from_team_full(
-                            project.inner.team_id,
-                            &**pool,
-                            &redis,
-                        )
-                        .await?;
-
-                    NotificationBuilder {
-                        body: NotificationBody::ModeratorMessage {
-                            thread_id: thread.id.into(),
-                            message_id: id.into(),
-                            project_id: Some(project.inner.id.into()),
-                            report_id: None,
-                        },
-                    }
-                    .insert_many(
-                        members.into_iter().map(|x| x.user_id).collect(),
-                        &mut transaction,
+            if let Some(project) = project
+                && project.inner.status != ProjectStatus::Processing
+                && user.role.is_mod()
+            {
+                let members =
+                    database::models::DBTeamMember::get_from_team_full(
+                        project.inner.team_id,
+                        &**pool,
                         &redis,
                     )
                     .await?;
+
+                NotificationBuilder {
+                    body: NotificationBody::ModeratorMessage {
+                        thread_id: thread.id.into(),
+                        message_id: id.into(),
+                        project_id: Some(project.inner.id.into()),
+                        report_id: None,
+                    },
                 }
+                .insert_many(
+                    members.into_iter().map(|x| x.user_id).collect(),
+                    &mut transaction,
+                    &redis,
+                )
+                .await?;
             }
         } else if let Some(report_id) = thread.report_id {
             let report = database::models::report_item::DBReport::get(

apps/labrinth/src/routes/v3/version_creation.rs

@@ -522,10 +522,10 @@ async fn version_create_inner(
     .fetch_optional(pool)
     .await?;
 
-    if let Some(project_status) = project_status {
-        if project_status.status == ProjectStatus::Processing.as_str() {
-            moderation_queue.projects.insert(project_id.into());
-        }
+    if let Some(project_status) = project_status
+        && project_status.status == ProjectStatus::Processing.as_str()
+    {
+        moderation_queue.projects.insert(project_id.into());
     }
 
     Ok(HttpResponse::Ok().json(response))
@@ -871,16 +871,16 @@ pub async fn upload_file(
         ref format,
         ref files,
     } = validation_result
+        && dependencies.is_empty()
     {
-        if dependencies.is_empty() {
-            let hashes: Vec<Vec<u8>> = format
-                .files
-                .iter()
-                .filter_map(|x| x.hashes.get(&PackFileHash::Sha1))
-                .map(|x| x.as_bytes().to_vec())
-                .collect();
+        let hashes: Vec<Vec<u8>> = format
+            .files
+            .iter()
+            .filter_map(|x| x.hashes.get(&PackFileHash::Sha1))
+            .map(|x| x.as_bytes().to_vec())
+            .collect();
 
-            let res = sqlx::query!(
+        let res = sqlx::query!(
                 "
                     SELECT v.id version_id, v.mod_id project_id, h.hash hash FROM hashes h
                     INNER JOIN files f on h.file_id = f.id
@@ -892,45 +892,44 @@ pub async fn upload_file(
             .fetch_all(&mut **transaction)
             .await?;
 
-            for file in &format.files {
-                if let Some(dep) = res.iter().find(|x| {
-                    Some(&*x.hash)
-                        == file
-                            .hashes
-                            .get(&PackFileHash::Sha1)
-                            .map(|x| x.as_bytes())
-                }) {
-                    dependencies.push(DependencyBuilder {
-                        project_id: Some(models::DBProjectId(dep.project_id)),
-                        version_id: Some(models::DBVersionId(dep.version_id)),
-                        file_name: None,
-                        dependency_type: DependencyType::Embedded.to_string(),
-                    });
-                } else if let Some(first_download) = file.downloads.first() {
-                    dependencies.push(DependencyBuilder {
-                        project_id: None,
-                        version_id: None,
-                        file_name: Some(
-                            first_download
-                                .rsplit('/')
-                                .next()
-                                .unwrap_or(first_download)
-                                .to_string(),
-                        ),
-                        dependency_type: DependencyType::Embedded.to_string(),
-                    });
-                }
+        for file in &format.files {
+            if let Some(dep) = res.iter().find(|x| {
+                Some(&*x.hash)
+                    == file
+                        .hashes
+                        .get(&PackFileHash::Sha1)
+                        .map(|x| x.as_bytes())
+            }) {
+                dependencies.push(DependencyBuilder {
+                    project_id: Some(models::DBProjectId(dep.project_id)),
+                    version_id: Some(models::DBVersionId(dep.version_id)),
+                    file_name: None,
+                    dependency_type: DependencyType::Embedded.to_string(),
+                });
+            } else if let Some(first_download) = file.downloads.first() {
+                dependencies.push(DependencyBuilder {
+                    project_id: None,
+                    version_id: None,
+                    file_name: Some(
+                        first_download
+                            .rsplit('/')
+                            .next()
+                            .unwrap_or(first_download)
+                            .to_string(),
+                    ),
+                    dependency_type: DependencyType::Embedded.to_string(),
+                });
             }
+        }
 
-            for file in files {
-                if !file.is_empty() {
-                    dependencies.push(DependencyBuilder {
-                        project_id: None,
-                        version_id: None,
-                        file_name: Some(file.to_string()),
-                        dependency_type: DependencyType::Embedded.to_string(),
-                    });
-                }
+        for file in files {
+            if !file.is_empty() {
+                dependencies.push(DependencyBuilder {
+                    project_id: None,
+                    version_id: None,
+                    file_name: Some(file.to_string()),
+                    dependency_type: DependencyType::Embedded.to_string(),
+                });
             }
         }
     }
@@ -974,10 +973,10 @@ pub async fn upload_file(
         ));
     }
 
-    if let ValidationResult::Warning(msg) = validation_result {
-        if primary {
-            return Err(CreateError::InvalidInput(msg.to_string()));
-        }
+    if let ValidationResult::Warning(msg) = validation_result
+        && primary
+    {
+        return Err(CreateError::InvalidInput(msg.to_string()));
     }
 
     let url = format!("{cdn_url}/{file_path_encode}");

apps/labrinth/src/routes/v3/version_file.rs

@@ -148,65 +148,55 @@ pub async fn get_update_from_hash(
         &redis,
     )
     .await?
-    {
-        if let Some(project) = database::models::DBProject::get_id(
+        && let Some(project) = database::models::DBProject::get_id(
             file.project_id,
             &**pool,
             &redis,
         )
         .await?
-        {
-            let mut versions = database::models::DBVersion::get_many(
-                &project.versions,
-                &**pool,
-                &redis,
-            )
-            .await?
-            .into_iter()
-            .filter(|x| {
-                let mut bool = true;
-                if let Some(version_types) = &update_data.version_types {
-                    bool &= version_types
-                        .iter()
-                        .any(|y| y.as_str() == x.inner.version_type);
-                }
-                if let Some(loaders) = &update_data.loaders {
-                    bool &= x.loaders.iter().any(|y| loaders.contains(y));
-                }
-                if let Some(loader_fields) = &update_data.loader_fields {
-                    for (key, values) in loader_fields {
-                        bool &= if let Some(x_vf) = x
-                            .version_fields
-                            .iter()
-                            .find(|y| y.field_name == *key)
-                        {
-                            values
-                                .iter()
-                                .any(|v| x_vf.value.contains_json_value(v))
-                        } else {
-                            true
-                        };
-                    }
-                }
-                bool
-            })
-            .sorted();
-
-            if let Some(first) = versions.next_back() {
-                if !is_visible_version(
-                    &first.inner,
-                    &user_option,
-                    &pool,
-                    &redis,
-                )
-                .await?
-                {
-                    return Err(ApiError::NotFound);
-                }
-
-                return Ok(HttpResponse::Ok()
-                    .json(models::projects::Version::from(first)));
+    {
+        let mut versions = database::models::DBVersion::get_many(
+            &project.versions,
+            &**pool,
+            &redis,
+        )
+        .await?
+        .into_iter()
+        .filter(|x| {
+            let mut bool = true;
+            if let Some(version_types) = &update_data.version_types {
+                bool &= version_types
+                    .iter()
+                    .any(|y| y.as_str() == x.inner.version_type);
             }
+            if let Some(loaders) = &update_data.loaders {
+                bool &= x.loaders.iter().any(|y| loaders.contains(y));
+            }
+            if let Some(loader_fields) = &update_data.loader_fields {
+                for (key, values) in loader_fields {
+                    bool &= if let Some(x_vf) =
+                        x.version_fields.iter().find(|y| y.field_name == *key)
+                    {
+                        values.iter().any(|v| x_vf.value.contains_json_value(v))
+                    } else {
+                        true
+                    };
+                }
+            }
+            bool
+        })
+        .sorted();
+
+        if let Some(first) = versions.next_back() {
+            if !is_visible_version(&first.inner, &user_option, &pool, &redis)
+                .await?
+            {
+                return Err(ApiError::NotFound);
+            }
+
+            return Ok(
+                HttpResponse::Ok().json(models::projects::Version::from(first))
+            );
         }
     }
     Err(ApiError::NotFound)
@@ -398,13 +388,12 @@ pub async fn update_files(
         if let Some(version) = versions
             .iter()
             .find(|x| x.inner.project_id == file.project_id)
+            && let Some(hash) = file.hashes.get(&algorithm)
         {
-            if let Some(hash) = file.hashes.get(&algorithm) {
-                response.insert(
-                    hash.clone(),
-                    models::projects::Version::from(version.clone()),
-                );
-            }
+            response.insert(
+                hash.clone(),
+                models::projects::Version::from(version.clone()),
+            );
         }
     }
 
@@ -484,69 +473,59 @@ pub async fn update_individual_files(
 
     for project in projects {
         for file in files.iter().filter(|x| x.project_id == project.inner.id) {
-            if let Some(hash) = file.hashes.get(&algorithm) {
-                if let Some(query_file) =
+            if let Some(hash) = file.hashes.get(&algorithm)
+                && let Some(query_file) =
                     update_data.hashes.iter().find(|x| &x.hash == hash)
-                {
-                    let version = all_versions
-                        .iter()
-                        .filter(|x| x.inner.project_id == file.project_id)
-                        .filter(|x| {
-                            let mut bool = true;
+            {
+                let version = all_versions
+                    .iter()
+                    .filter(|x| x.inner.project_id == file.project_id)
+                    .filter(|x| {
+                        let mut bool = true;
 
-                            if let Some(version_types) =
-                                &query_file.version_types
-                            {
-                                bool &= version_types.iter().any(|y| {
-                                    y.as_str() == x.inner.version_type
-                                });
-                            }
-                            if let Some(loaders) = &query_file.loaders {
-                                bool &= x
-                                    .loaders
-                                    .iter()
-                                    .any(|y| loaders.contains(y));
-                            }
-
-                            if let Some(loader_fields) =
-                                &query_file.loader_fields
-                            {
-                                for (key, values) in loader_fields {
-                                    bool &= if let Some(x_vf) = x
-                                        .version_fields
-                                        .iter()
-                                        .find(|y| y.field_name == *key)
-                                    {
-                                        values.iter().any(|v| {
-                                            x_vf.value.contains_json_value(v)
-                                        })
-                                    } else {
-                                        true
-                                    };
-                                }
-                            }
-                            bool
-                        })
-                        .sorted()
-                        .next_back();
-
-                    if let Some(version) = version {
-                        if is_visible_version(
-                            &version.inner,
-                            &user_option,
-                            &pool,
-                            &redis,
-                        )
-                        .await?
-                        {
-                            response.insert(
-                                hash.clone(),
-                                models::projects::Version::from(
-                                    version.clone(),
-                                ),
-                            );
+                        if let Some(version_types) = &query_file.version_types {
+                            bool &= version_types
+                                .iter()
+                                .any(|y| y.as_str() == x.inner.version_type);
                         }
-                    }
+                        if let Some(loaders) = &query_file.loaders {
+                            bool &=
+                                x.loaders.iter().any(|y| loaders.contains(y));
+                        }
+
+                        if let Some(loader_fields) = &query_file.loader_fields {
+                            for (key, values) in loader_fields {
+                                bool &= if let Some(x_vf) = x
+                                    .version_fields
+                                    .iter()
+                                    .find(|y| y.field_name == *key)
+                                {
+                                    values.iter().any(|v| {
+                                        x_vf.value.contains_json_value(v)
+                                    })
+                                } else {
+                                    true
+                                };
+                            }
+                        }
+                        bool
+                    })
+                    .sorted()
+                    .next_back();
+
+                if let Some(version) = version
+                    && is_visible_version(
+                        &version.inner,
+                        &user_option,
+                        &pool,
+                        &redis,
+                    )
+                    .await?
+                {
+                    response.insert(
+                        hash.clone(),
+                        models::projects::Version::from(version.clone()),
+                    );
                 }
             }
         }

apps/labrinth/src/routes/v3/versions.rs

@@ -106,13 +106,12 @@ pub async fn version_project_get_helper(
                 || x.inner.version_number == id.1
         });
 
-        if let Some(version) = version {
-            if is_visible_version(&version.inner, &user_option, &pool, &redis)
+        if let Some(version) = version
+            && is_visible_version(&version.inner, &user_option, &pool, &redis)
                 .await?
-            {
-                return Ok(HttpResponse::Ok()
-                    .json(models::projects::Version::from(version)));
-            }
+        {
+            return Ok(HttpResponse::Ok()
+                .json(models::projects::Version::from(version)));
         }
     }
 
@@ -190,12 +189,12 @@ pub async fn version_get_helper(
     .map(|x| x.1)
     .ok();
 
-    if let Some(data) = version_data {
-        if is_visible_version(&data.inner, &user_option, &pool, &redis).await? {
-            return Ok(
-                HttpResponse::Ok().json(models::projects::Version::from(data))
-            );
-        }
+    if let Some(data) = version_data
+        && is_visible_version(&data.inner, &user_option, &pool, &redis).await?
+    {
+        return Ok(
+            HttpResponse::Ok().json(models::projects::Version::from(data))
+        );
     }
 
     Err(ApiError::NotFound)

apps/labrinth/src/sync/status.rs

@@ -15,14 +15,12 @@ pub async fn get_user_status(
         return Some(friend_status);
     }
 
-    if let Ok(mut conn) = redis.pool.get().await {
-        if let Ok(mut statuses) =
+    if let Ok(mut conn) = redis.pool.get().await
+        && let Ok(mut statuses) =
             conn.sscan::<_, String>(get_field_name(user)).await
-        {
-            if let Some(status_json) = statuses.next_item().await {
-                return serde_json::from_str::<UserStatus>(&status_json).ok();
-            }
-        }
+        && let Some(status_json) = statuses.next_item().await
+    {
+        return serde_json::from_str::<UserStatus>(&status_json).ok();
     }
 
     None

apps/labrinth/src/util/img.rs

@@ -138,12 +138,11 @@ fn process_image(
     let (orig_width, orig_height) = img.dimensions();
     let aspect_ratio = orig_width as f32 / orig_height as f32;
 
-    if let Some(target_width) = target_width {
-        if img.width() > target_width {
-            let new_height =
-                (target_width as f32 / aspect_ratio).round() as u32;
-            img = img.resize(target_width, new_height, FilterType::Lanczos3);
-        }
+    if let Some(target_width) = target_width
+        && img.width() > target_width
+    {
+        let new_height = (target_width as f32 / aspect_ratio).round() as u32;
+        img = img.resize(target_width, new_height, FilterType::Lanczos3);
     }
 
     if let Some(min_aspect_ratio) = min_aspect_ratio {

apps/labrinth/src/util/ratelimit.rs

@@ -133,12 +133,11 @@ pub async fn rate_limit_middleware(
         .expect("Rate limiter not configured properly")
         .clone();
 
-    if let Some(key) = req.headers().get("x-ratelimit-key") {
-        if key.to_str().ok()
+    if let Some(key) = req.headers().get("x-ratelimit-key")
+        && key.to_str().ok()
             == dotenvy::var("RATE_LIMIT_IGNORE_KEY").ok().as_deref()
-        {
-            return Ok(next.call(req).await?.map_into_left_body());
-        }
+    {
+        return Ok(next.call(req).await?.map_into_left_body());
     }
 
     let conn_info = req.connection_info().clone();

apps/labrinth/src/util/validate.rs

@@ -22,46 +22,47 @@ pub fn validation_errors_to_string(
 
     let key_option = map.keys().next();
 
-    if let Some(field) = key_option {
-        if let Some(error) = map.get(field) {
-            return match error {
-                ValidationErrorsKind::Struct(errors) => {
-                    validation_errors_to_string(
+    if let Some(field) = key_option
+        && let Some(error) = map.get(field)
+    {
+        return match error {
+            ValidationErrorsKind::Struct(errors) => {
+                validation_errors_to_string(
+                    *errors.clone(),
+                    Some(format!("of item {field}")),
+                )
+            }
+            ValidationErrorsKind::List(list) => {
+                if let Some((index, errors)) = list.iter().next() {
+                    output.push_str(&validation_errors_to_string(
                         *errors.clone(),
-                        Some(format!("of item {field}")),
-                    )
+                        Some(format!("of list {field} with index {index}")),
+                    ));
                 }
-                ValidationErrorsKind::List(list) => {
-                    if let Some((index, errors)) = list.iter().next() {
-                        output.push_str(&validation_errors_to_string(
-                            *errors.clone(),
-                            Some(format!("of list {field} with index {index}")),
-                        ));
-                    }
 
-                    output
-                }
-                ValidationErrorsKind::Field(errors) => {
-                    if let Some(error) = errors.first() {
-                        if let Some(adder) = adder {
-                            write!(
+                output
+            }
+            ValidationErrorsKind::Field(errors) => {
+                if let Some(error) = errors.first() {
+                    if let Some(adder) = adder {
+                        write!(
                                 &mut output,
                                 "Field {field} {adder} failed validation with error: {}",
                                 error.code
                             ).unwrap();
-                        } else {
-                            write!(
-                                &mut output,
-                                "Field {field} failed validation with error: {}",
-                                error.code
-                            ).unwrap();
-                        }
+                    } else {
+                        write!(
+                            &mut output,
+                            "Field {field} failed validation with error: {}",
+                            error.code
+                        )
+                        .unwrap();
                     }
-
-                    output
                 }
-            };
-        }
+
+                output
+            }
+        };
     }
 
     String::new()

apps/labrinth/src/util/webhook.rs

@@ -238,17 +238,17 @@ pub async fn send_slack_webhook(
             }
         });
 
-        if let Some(icon_url) = metadata.project_icon_url {
-            if let Some(project_block) = project_block.as_object_mut() {
-                project_block.insert(
-                    "accessory".to_string(),
-                    serde_json::json!({
-                        "type": "image",
-                        "image_url": icon_url,
-                        "alt_text": metadata.project_title
-                    }),
-                );
-            }
+        if let Some(icon_url) = metadata.project_icon_url
+            && let Some(project_block) = project_block.as_object_mut()
+        {
+            project_block.insert(
+                "accessory".to_string(),
+                serde_json::json!({
+                    "type": "image",
+                    "image_url": icon_url,
+                    "alt_text": metadata.project_title
+                }),
+            );
         }
 
         blocks.push(project_block);

apps/labrinth/tests/common/permissions.rs

@@ -222,10 +222,10 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
                 resp.status().as_u16()
             ));
         }
-        if resp.status() == StatusCode::OK {
-            if let Some(failure_json_check) = &self.failure_json_check {
-                failure_json_check(&test::read_body_json(resp).await);
-            }
+        if resp.status() == StatusCode::OK
+            && let Some(failure_json_check) = &self.failure_json_check
+        {
+            failure_json_check(&test::read_body_json(resp).await);
         }
 
         // Failure test- logged in on a non-team user
@@ -246,10 +246,10 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
                 resp.status().as_u16()
             ));
         }
-        if resp.status() == StatusCode::OK {
-            if let Some(failure_json_check) = &self.failure_json_check {
-                failure_json_check(&test::read_body_json(resp).await);
-            }
+        if resp.status() == StatusCode::OK
+            && let Some(failure_json_check) = &self.failure_json_check
+        {
+            failure_json_check(&test::read_body_json(resp).await);
         }
 
         // Failure test- logged in with EVERY non-relevant permission
@@ -270,10 +270,10 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
                 resp.status().as_u16()
             ));
         }
-        if resp.status() == StatusCode::OK {
-            if let Some(failure_json_check) = &self.failure_json_check {
-                failure_json_check(&test::read_body_json(resp).await);
-            }
+        if resp.status() == StatusCode::OK
+            && let Some(failure_json_check) = &self.failure_json_check
+        {
+            failure_json_check(&test::read_body_json(resp).await);
         }
 
         // Patch user's permissions to success permissions
@@ -300,10 +300,10 @@ impl<'a, A: Api> PermissionsTest<'a, A> {
                 resp.status().as_u16()
             ));
         }
-        if resp.status() == StatusCode::OK {
-            if let Some(success_json_check) = &self.success_json_check {
-                success_json_check(&test::read_body_json(resp).await);
-            }
+        if resp.status() == StatusCode::OK
+            && let Some(success_json_check) = &self.success_json_check
+        {
+            success_json_check(&test::read_body_json(resp).await);
         }
 
         // If the remove_user flag is set, remove the user from the project

clippy.toml

@@ -1,2 +1,2 @@
 allow-dbg-in-tests = true
-msrv = "1.88.0"
+msrv = "1.89.0"

package.json

@@ -16,7 +16,6 @@
     "blog:fix": "turbo run fix --filter=@modrinth/blog",
     "pages:build": "NITRO_PRESET=cloudflare-pages pnpm --filter frontend run build",
     "moderation:fix": "turbo run fix --filter=@modrinth/moderation",
-    "moderation:intl:extract": "pnpm run --filter=@modrinth/moderation intl:extract",
     "build": "turbo run build --continue",
     "lint": "turbo run lint --continue",
     "test": "turbo run test --continue",

packages/app-lib/src/api/handler.rs

@@ -50,10 +50,10 @@ pub async fn parse_command(
         // We assume anything else is a filepath to an .mrpack file
         let path = PathBuf::from(command_string);
         let path = io::canonicalize(path)?;
-        if let Some(ext) = path.extension() {
-            if ext == "mrpack" {
-                return Ok(CommandPayload::RunMRPack { path });
-            }
+        if let Some(ext) = path.extension()
+            && ext == "mrpack"
+        {
+            return Ok(CommandPayload::RunMRPack { path });
         }
         emit_warning(&format!(
             "Invalid command, unrecognized filetype: {}",

packages/app-lib/src/api/jre.rs

@@ -106,13 +106,13 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
             })?;
 
         // removes the old installation of java
-        if let Some(file) = archive.file_names().next() {
-            if let Some(dir) = file.split('/').next() {
-                let path = path.join(dir);
+        if let Some(file) = archive.file_names().next()
+            && let Some(dir) = file.split('/').next()
+        {
+            let path = path.join(dir);
 
-                if path.exists() {
-                    io::remove_dir_all(path).await?;
-                }
+            if path.exists() {
+                io::remove_dir_all(path).await?;
             }
         }
 

packages/app-lib/src/api/minecraft_auth.rs

@@ -54,11 +54,11 @@ pub async fn remove_user(uuid: uuid::Uuid) -> crate::Result<()> {
     if let Some((uuid, user)) = users.remove(&uuid) {
         Credentials::remove(uuid, &state.pool).await?;
 
-        if user.active {
-            if let Some((_, mut user)) = users.into_iter().next() {
-                user.active = true;
-                user.upsert(&state.pool).await?;
-            }
+        if user.active
+            && let Some((_, mut user)) = users.into_iter().next()
+        {
+            user.active = true;
+            user.upsert(&state.pool).await?;
         }
     }
 

packages/app-lib/src/api/pack/import/atlauncher.rs

@@ -221,14 +221,14 @@ async fn import_atlauncher_unmanaged(
             .unwrap_or_else(|| backup_name.to_string());
         prof.install_stage = ProfileInstallStage::PackInstalling;
 
-        if let Some(ref project_id) = description.project_id {
-            if let Some(ref version_id) = description.version_id {
-                prof.linked_data = Some(LinkedData {
-                    project_id: project_id.clone(),
-                    version_id: version_id.clone(),
-                    locked: true,
-                })
-            }
+        if let Some(ref project_id) = description.project_id
+            && let Some(ref version_id) = description.version_id
+        {
+            prof.linked_data = Some(LinkedData {
+                project_id: project_id.clone(),
+                version_id: version_id.clone(),
+                locked: true,
+            })
         }
 
         prof.icon_path = description

packages/app-lib/src/api/pack/install_from.rs

@@ -383,18 +383,18 @@ pub async fn set_profile_information(
             .unwrap_or_else(|| backup_name.to_string());
         prof.install_stage = ProfileInstallStage::PackInstalling;
 
-        if let Some(ref project_id) = description.project_id {
-            if let Some(ref version_id) = description.version_id {
-                prof.linked_data = Some(LinkedData {
-                    project_id: project_id.clone(),
-                    version_id: version_id.clone(),
-                    locked: if !ignore_lock {
-                        true
-                    } else {
-                        prof.linked_data.as_ref().is_none_or(|x| x.locked)
-                    },
-                })
-            }
+        if let Some(ref project_id) = description.project_id
+            && let Some(ref version_id) = description.version_id
+        {
+            prof.linked_data = Some(LinkedData {
+                project_id: project_id.clone(),
+                version_id: version_id.clone(),
+                locked: if !ignore_lock {
+                    true
+                } else {
+                    prof.linked_data.as_ref().is_none_or(|x| x.locked)
+                },
+            })
         }
 
         prof.icon_path = description

packages/app-lib/src/api/pack/install_mrpack.rs

@@ -149,13 +149,12 @@ pub async fn install_zipped_mrpack_files(
                 let profile_path = profile_path.clone();
                 async move {
                     //TODO: Future update: prompt user for optional files in a modpack
-                    if let Some(env) = project.env {
-                        if env
+                    if let Some(env) = project.env
+                        && env
                             .get(&EnvType::Client)
                             .is_some_and(|x| x == &SideType::Unsupported)
-                        {
-                            return Ok(());
-                        }
+                    {
+                        return Ok(());
                     }
 
                     let file = fetch_mirrors(
@@ -375,12 +374,12 @@ pub async fn remove_all_related_files(
             )
             .await?
         {
-            if let Some(metadata) = &project.metadata {
-                if to_remove.contains(&metadata.project_id) {
-                    let path = profile_full_path.join(file_path);
-                    if path.exists() {
-                        io::remove_file(&path).await?;
-                    }
+            if let Some(metadata) = &project.metadata
+                && to_remove.contains(&metadata.project_id)
+            {
+                let path = profile_full_path.join(file_path);
+                if path.exists() {
+                    io::remove_file(&path).await?;
                 }
             }
         }

packages/app-lib/src/api/profile/mod.rs

@@ -337,28 +337,26 @@ pub async fn update_project(
             )
             .await?
             .remove(project_path)
+            && let Some(update_version) = &file.update_version_id
         {
-            if let Some(update_version) = &file.update_version_id {
-                let path = Profile::add_project_version(
-                    profile_path,
-                    update_version,
-                    &state.pool,
-                    &state.fetch_semaphore,
-                    &state.io_semaphore,
-                )
-                .await?;
+            let path = Profile::add_project_version(
+                profile_path,
+                update_version,
+                &state.pool,
+                &state.fetch_semaphore,
+                &state.io_semaphore,
+            )
+            .await?;
 
-                if path != project_path {
-                    Profile::remove_project(profile_path, project_path).await?;
-                }
-
-                if !skip_send_event.unwrap_or(false) {
-                    emit_profile(profile_path, ProfilePayloadType::Edited)
-                        .await?;
-                }
-
-                return Ok(path);
+            if path != project_path {
+                Profile::remove_project(profile_path, project_path).await?;
             }
+
+            if !skip_send_event.unwrap_or(false) {
+                emit_profile(profile_path, ProfilePayloadType::Edited).await?;
+            }
+
+            return Ok(path);
         }
 
         Err(crate::ErrorKind::InputError(
@@ -479,10 +477,10 @@ pub async fn export_mrpack(
     let included_export_candidates = included_export_candidates
         .into_iter()
         .filter(|x| {
-            if let Some(f) = PathBuf::from(x).file_name() {
-                if f.to_string_lossy().starts_with(".DS_Store") {
-                    return false;
-                }
+            if let Some(f) = PathBuf::from(x).file_name()
+                && f.to_string_lossy().starts_with(".DS_Store")
+            {
+                return false;
             }
             true
         })

packages/app-lib/src/event/mod.rs

@@ -184,6 +184,7 @@ pub enum LoadingBarType {
 }
 
 #[derive(Serialize, Clone)]
+#[cfg(feature = "tauri")]
 pub struct LoadingPayload {
     pub event: LoadingBarType,
     pub loader_uuid: Uuid,
@@ -192,11 +193,7 @@ pub struct LoadingPayload {
 }
 
 #[derive(Serialize, Clone)]
-pub struct OfflinePayload {
-    pub offline: bool,
-}
-
-#[derive(Serialize, Clone)]
+#[cfg(feature = "tauri")]
 pub struct WarningPayload {
     pub message: String,
 }
@@ -220,12 +217,14 @@ pub enum CommandPayload {
 }
 
 #[derive(Serialize, Clone)]
+#[cfg(feature = "tauri")]
 pub struct ProcessPayload {
     pub profile_path_id: String,
     pub uuid: Uuid,
     pub event: ProcessPayloadType,
     pub message: String,
 }
+
 #[derive(Serialize, Clone, Debug)]
 #[serde(rename_all = "snake_case")]
 pub enum ProcessPayloadType {
@@ -234,11 +233,13 @@ pub enum ProcessPayloadType {
 }
 
 #[derive(Serialize, Clone)]
+#[cfg(feature = "tauri")]
 pub struct ProfilePayload {
     pub profile_path_id: String,
     #[serde(flatten)]
     pub event: ProfilePayloadType,
 }
+
 #[derive(Serialize, Clone)]
 #[serde(tag = "event", rename_all = "snake_case")]
 pub enum ProfilePayloadType {
@@ -257,6 +258,16 @@ pub enum ProfilePayloadType {
     Removed,
 }
 
+#[derive(Serialize, Clone)]
+#[serde(rename_all = "snake_case")]
+#[serde(tag = "event")]
+pub enum FriendPayload {
+    FriendRequest { from: UserId },
+    UserOffline { id: UserId },
+    StatusUpdate { user_status: UserStatus },
+    StatusSync,
+}
+
 #[derive(Debug, thiserror::Error)]
 pub enum EventError {
     #[error("Event state was not properly initialized")]
@@ -269,13 +280,3 @@ pub enum EventError {
     #[error("Tauri error: {0}")]
     TauriError(#[from] tauri::Error),
 }
-
-#[derive(Serialize, Clone)]
-#[serde(rename_all = "snake_case")]
-#[serde(tag = "event")]
-pub enum FriendPayload {
-    FriendRequest { from: UserId },
-    UserOffline { id: UserId },
-    StatusUpdate { user_status: UserStatus },
-    StatusSync,
-}

packages/app-lib/src/launcher/args.rs

@@ -32,15 +32,15 @@ pub fn get_class_paths(
     let mut cps = libraries
         .iter()
         .filter_map(|library| {
-            if let Some(rules) = &library.rules {
-                if !parse_rules(
+            if let Some(rules) = &library.rules
+                && !parse_rules(
                     rules,
                     java_arch,
                     &QuickPlayType::None,
                     minecraft_updated,
-                ) {
-                    return None;
-                }
+                )
+            {
+                return None;
             }
 
             if !library.include_in_classpath {
@@ -504,10 +504,10 @@ pub async fn get_processor_main_class(
             let mut line = line.map_err(IOError::from)?;
             line.retain(|c| !c.is_whitespace());
 
-            if line.starts_with("Main-Class:") {
-                if let Some(class) = line.split(':').nth(1) {
-                    return Ok(Some(class.to_string()));
-                }
+            if line.starts_with("Main-Class:")
+                && let Some(class) = line.split(':').nth(1)
+            {
+                return Ok(Some(class.to_string()));
             }
         }
 

packages/app-lib/src/launcher/download.rs

@@ -290,12 +290,11 @@ pub async fn download_libraries(
     loading_try_for_each_concurrent(
         stream::iter(libraries.iter())
             .map(Ok::<&Library, crate::Error>), None, loading_bar,loading_amount,num_files, None,|library| async move {
-                if let Some(rules) = &library.rules {
-                    if !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
+                if let Some(rules) = &library.rules
+                    && !parse_rules(rules, java_arch, &QuickPlayType::None, minecraft_updated) {
                         tracing::trace!("Skipped library {}", &library.name);
                         return Ok(());
                     }
-                }
 
                 if !library.downloadable {
                     tracing::trace!("Skipped non-downloadable library {}", &library.name);
@@ -311,15 +310,14 @@ pub async fn download_libraries(
                             return Ok(());
                         }
 
-                        if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads {
-                            if !artifact.url.is_empty(){
+                        if let Some(d::minecraft::LibraryDownloads { artifact: Some(ref artifact), ..}) = library.downloads
+                            && !artifact.url.is_empty(){
                                 let bytes = fetch(&artifact.url, Some(&artifact.sha1), &st.fetch_semaphore, &st.pool)
                                     .await?;
                                 write(&path, &bytes, &st.io_semaphore).await?;
                                 tracing::trace!("Fetched library {} to path {:?}", &library.name, &path);
                                 return Ok::<_, crate::Error>(());
                             }
-                        }
 
                         let url = [
                             library

packages/app-lib/src/launcher/mod.rs

@@ -341,10 +341,10 @@ pub async fn install_minecraft(
 
             // Forge processors (90-100)
             for (index, processor) in processors.iter().enumerate() {
-                if let Some(sides) = &processor.sides {
-                    if !sides.contains(&String::from("client")) {
-                        continue;
-                    }
+                if let Some(sides) = &processor.sides
+                    && !sides.contains(&String::from("client"))
+                {
+                    continue;
                 }
 
                 let cp = {

packages/app-lib/src/state/dirs.rs

@@ -385,10 +385,10 @@ impl DirectoryInfo {
                         return Err(e);
                     }
                 } else {
-                    if let Some(disk_usage) = get_disk_usage(&move_dir)? {
-                        if total_size > disk_usage {
-                            return Err(crate::ErrorKind::DirectoryMoveError(format!("Not enough space to move directory to {}: only {} bytes available", app_dir.display(), disk_usage)).into());
-                        }
+                    if let Some(disk_usage) = get_disk_usage(&move_dir)?
+                        && total_size > disk_usage
+                    {
+                        return Err(crate::ErrorKind::DirectoryMoveError(format!("Not enough space to move directory to {}: only {} bytes available", app_dir.display(), disk_usage)).into());
                     }
 
                     let loader_bar_id = Arc::new(&loader_bar_id);

packages/app-lib/src/state/friends.rs

@@ -9,7 +9,7 @@ use ariadne::networking::message::{
     ClientToServerMessage, ServerToClientMessage,
 };
 use ariadne::users::UserStatus;
-use async_tungstenite::WebSocketStream;
+use async_tungstenite::WebSocketSender;
 use async_tungstenite::tokio::{ConnectStream, connect_async};
 use async_tungstenite::tungstenite::Message;
 use async_tungstenite::tungstenite::client::IntoClientRequest;
@@ -17,7 +17,6 @@ use bytes::Bytes;
 use chrono::{DateTime, Utc};
 use dashmap::DashMap;
 use either::Either;
-use futures::stream::SplitSink;
 use futures::{SinkExt, StreamExt};
 use reqwest::Method;
 use reqwest::header::HeaderValue;
@@ -32,7 +31,7 @@ use tokio::sync::{Mutex, RwLock};
 use uuid::Uuid;
 
 pub(super) type WriteSocket =
-    Arc<RwLock<Option<SplitSink<WebSocketStream<ConnectStream>, Message>>>>;
+    Arc<RwLock<Option<WebSocketSender<ConnectStream>>>>;
 pub(super) type TunnelSockets = Arc<DashMap<Uuid, Arc<InternalTunnelSocket>>>;
 
 pub struct FriendsSocket {
@@ -180,27 +179,24 @@ impl FriendsSocket {
                                             ServerToClientMessage::FriendSocketStoppedListening { .. } => {}, // TODO
 
                                             ServerToClientMessage::SocketConnected { to_socket, new_socket } => {
-                                                if let Some(connected_to) = sockets.get(&to_socket) {
-                                                    if let InternalTunnelSocket::Listening(local_addr) = *connected_to.value().clone() {
-                                                        if let Ok(new_stream) = TcpStream::connect(local_addr).await {
+                                                if let Some(connected_to) = sockets.get(&to_socket)
+                                                    && let InternalTunnelSocket::Listening(local_addr) = *connected_to.value().clone()
+                                                        && let Ok(new_stream) = TcpStream::connect(local_addr).await {
                                                             let (read, write) = new_stream.into_split();
                                                             sockets.insert(new_socket, Arc::new(InternalTunnelSocket::Connected(Mutex::new(write))));
                                                             Self::socket_read_loop(write_handle.clone(), read, new_socket);
                                                             continue;
                                                         }
-                                                    }
-                                                }
                                                 let _ = Self::send_message(&write_handle, ClientToServerMessage::SocketClose { socket: new_socket }).await;
                                             },
                                             ServerToClientMessage::SocketClosed { socket } => {
                                                 sockets.remove_if(&socket, |_, x| matches!(*x.clone(), InternalTunnelSocket::Connected(_)));
                                             },
                                             ServerToClientMessage::SocketData { socket, data } => {
-                                                if let Some(mut socket) = sockets.get_mut(&socket) {
-                                                    if let InternalTunnelSocket::Connected(ref stream) = *socket.value_mut().clone() {
+                                                if let Some(mut socket) = sockets.get_mut(&socket)
+                                                    && let InternalTunnelSocket::Connected(ref stream) = *socket.value_mut().clone() {
                                                         let _ = stream.lock().await.write_all(&data).await;
                                                     }
-                                                }
                                             },
                                         }
                                     }

packages/app-lib/src/state/fs_watcher.rs

@@ -100,8 +100,8 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                         let profile_path_str = profile_path_str.clone();
                                         let world = world.clone();
                                         tokio::spawn(async move {
-                                            if let Ok(state) = State::get().await {
-                                                if let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
+                                            if let Ok(state) = State::get().await
+                                                && let Err(e) = attached_world_data::AttachedWorldData::remove_for_world(
                                                     &profile_path_str,
                                                     WorldType::Singleplayer,
                                                     &world,
@@ -109,7 +109,6 @@ pub async fn init_watcher() -> crate::Result<FileWatcher> {
                                                 ).await {
                                                     tracing::warn!("Failed to remove AttachedWorldData for '{world}': {e}")
                                                 }
-                                            }
                                         });
                                     }
                                     Some(ProfilePayloadType::WorldUpdated { world })
@@ -150,14 +149,14 @@ pub(crate) async fn watch_profiles_init(
 ) {
     if let Ok(profiles_dir) = std::fs::read_dir(dirs.profiles_dir()) {
         for profile_dir in profiles_dir {
-            if let Ok(file_name) = profile_dir.map(|x| x.file_name()) {
-                if let Some(file_name) = file_name.to_str() {
-                    if file_name.starts_with(".DS_Store") {
-                        continue;
-                    };
+            if let Ok(file_name) = profile_dir.map(|x| x.file_name())
+                && let Some(file_name) = file_name.to_str()
+            {
+                if file_name.starts_with(".DS_Store") {
+                    continue;
+                };
 
-                    watch_profile(file_name, watcher, dirs).await;
-                }
+                watch_profile(file_name, watcher, dirs).await;
             }
         }
     }

packages/app-lib/src/state/legacy_converter.rs

@@ -76,10 +76,9 @@ where
             .loaded_config_dir
             .clone()
             .and_then(|x| x.to_str().map(|x| x.to_string()))
+            && path != old_launcher_root_str
         {
-            if path != old_launcher_root_str {
-                settings.custom_dir = Some(path);
-            }
+            settings.custom_dir = Some(path);
         }
 
         settings.prev_custom_dir = Some(old_launcher_root_str.clone());
@@ -136,31 +135,27 @@ where
                 .await?;
             }
 
-            if let Some(device_token) = minecraft_auth.token {
-                if let Ok(private_key) =
+            if let Some(device_token) = minecraft_auth.token
+                && let Ok(private_key) =
                     SigningKey::from_pkcs8_pem(&device_token.private_key)
-                {
-                    if let Ok(uuid) = Uuid::parse_str(&device_token.id) {
-                        DeviceTokenPair {
-                            token: DeviceToken {
-                                issue_instant: device_token.token.issue_instant,
-                                not_after: device_token.token.not_after,
-                                token: device_token.token.token,
-                                display_claims: device_token
-                                    .token
-                                    .display_claims,
-                            },
-                            key: DeviceTokenKey {
-                                id: uuid,
-                                key: private_key,
-                                x: device_token.x,
-                                y: device_token.y,
-                            },
-                        }
-                        .upsert(exec)
-                        .await?;
-                    }
+                && let Ok(uuid) = Uuid::parse_str(&device_token.id)
+            {
+                DeviceTokenPair {
+                    token: DeviceToken {
+                        issue_instant: device_token.token.issue_instant,
+                        not_after: device_token.token.not_after,
+                        token: device_token.token.token,
+                        display_claims: device_token.token.display_claims,
+                    },
+                    key: DeviceTokenKey {
+                        id: uuid,
+                        key: private_key,
+                        x: device_token.x,
+                        y: device_token.y,
+                    },
                 }
+                .upsert(exec)
+                .await?;
             }
         }
 
@@ -207,100 +202,93 @@ where
                         update_version,
                         ..
                     } = project.metadata
-                    {
-                        if let Some(file) = version
+                        && let Some(file) = version
                             .files
                             .iter()
                             .find(|x| x.hashes.get("sha512") == Some(&sha512))
-                        {
-                            if let Some(sha1) = file.hashes.get("sha1") {
-                                if let Ok(metadata) = full_path.metadata() {
-                                    let file_name = format!(
-                                        "{}/{}",
-                                        profile.path,
-                                        path.replace('\\', "/")
-                                            .replace(".disabled", "")
-                                    );
+                        && let Some(sha1) = file.hashes.get("sha1")
+                    {
+                        if let Ok(metadata) = full_path.metadata() {
+                            let file_name = format!(
+                                "{}/{}",
+                                profile.path,
+                                path.replace('\\', "/")
+                                    .replace(".disabled", "")
+                            );
 
-                                    cached_entries.push(CacheValue::FileHash(
-                                        CachedFileHash {
-                                            path: file_name,
-                                            size: metadata.len(),
-                                            hash: sha1.clone(),
-                                            project_type: ProjectType::get_from_parent_folder(&full_path),
-                                        },
-                                    ));
-                                }
-
-                                cached_entries.push(CacheValue::File(
-                                    CachedFile {
-                                        hash: sha1.clone(),
-                                        project_id: version.project_id.clone(),
-                                        version_id: version.id.clone(),
-                                    },
-                                ));
-
-                                if let Some(update_version) = update_version {
-                                    let mod_loader: ModLoader =
-                                        profile.metadata.loader.into();
-                                    cached_entries.push(
-                                        CacheValue::FileUpdate(
-                                            CachedFileUpdate {
-                                                hash: sha1.clone(),
-                                                game_version: profile
-                                                    .metadata
-                                                    .game_version
-                                                    .clone(),
-                                                loaders: vec![
-                                                    mod_loader
-                                                        .as_str()
-                                                        .to_string(),
-                                                ],
-                                                update_version_id:
-                                                    update_version.id.clone(),
-                                            },
+                            cached_entries.push(CacheValue::FileHash(
+                                CachedFileHash {
+                                    path: file_name,
+                                    size: metadata.len(),
+                                    hash: sha1.clone(),
+                                    project_type:
+                                        ProjectType::get_from_parent_folder(
+                                            &full_path,
                                         ),
-                                    );
-
-                                    cached_entries.push(CacheValue::Version(
-                                        (*update_version).into(),
-                                    ));
-                                }
-
-                                let members = members
-                                    .into_iter()
-                                    .map(|x| {
-                                        let user = User {
-                                            id: x.user.id,
-                                            username: x.user.username,
-                                            avatar_url: x.user.avatar_url,
-                                            bio: x.user.bio,
-                                            created: x.user.created,
-                                            role: x.user.role,
-                                            badges: 0,
-                                        };
-
-                                        cached_entries.push(CacheValue::User(
-                                            user.clone(),
-                                        ));
-
-                                        TeamMember {
-                                            team_id: x.team_id,
-                                            user,
-                                            is_owner: x.role == "Owner",
-                                            role: x.role,
-                                            ordering: x.ordering,
-                                        }
-                                    })
-                                    .collect::<Vec<_>>();
-
-                                cached_entries.push(CacheValue::Team(members));
-
-                                cached_entries.push(CacheValue::Version(
-                                    (*version).into(),
-                                ));
-                            }
+                                },
+                            ));
                         }
+
+                        cached_entries.push(CacheValue::File(CachedFile {
+                            hash: sha1.clone(),
+                            project_id: version.project_id.clone(),
+                            version_id: version.id.clone(),
+                        }));
+
+                        if let Some(update_version) = update_version {
+                            let mod_loader: ModLoader =
+                                profile.metadata.loader.into();
+                            cached_entries.push(CacheValue::FileUpdate(
+                                CachedFileUpdate {
+                                    hash: sha1.clone(),
+                                    game_version: profile
+                                        .metadata
+                                        .game_version
+                                        .clone(),
+                                    loaders: vec![
+                                        mod_loader.as_str().to_string(),
+                                    ],
+                                    update_version_id: update_version
+                                        .id
+                                        .clone(),
+                                },
+                            ));
+
+                            cached_entries.push(CacheValue::Version(
+                                (*update_version).into(),
+                            ));
+                        }
+
+                        let members = members
+                            .into_iter()
+                            .map(|x| {
+                                let user = User {
+                                    id: x.user.id,
+                                    username: x.user.username,
+                                    avatar_url: x.user.avatar_url,
+                                    bio: x.user.bio,
+                                    created: x.user.created,
+                                    role: x.user.role,
+                                    badges: 0,
+                                };
+
+                                cached_entries
+                                    .push(CacheValue::User(user.clone()));
+
+                                TeamMember {
+                                    team_id: x.team_id,
+                                    user,
+                                    is_owner: x.role == "Owner",
+                                    role: x.role,
+                                    ordering: x.ordering,
+                                }
+                            })
+                            .collect::<Vec<_>>();
+
+                        cached_entries.push(CacheValue::Team(members));
+
+                        cached_entries
+                            .push(CacheValue::Version((*version).into()));
                     }
                 }
 
@@ -332,16 +320,15 @@ where
                         .map(|x| x.id),
                     groups: profile.metadata.groups,
                     linked_data: profile.metadata.linked_data.and_then(|x| {
-                        if let Some(project_id) = x.project_id {
-                            if let Some(version_id) = x.version_id {
-                                if let Some(locked) = x.locked {
-                                    return Some(LinkedData {
-                                        project_id,
-                                        version_id,
-                                        locked,
-                                    });
-                                }
-                            }
+                        if let Some(project_id) = x.project_id
+                            && let Some(version_id) = x.version_id
+                            && let Some(locked) = x.locked
+                        {
+                            return Some(LinkedData {
+                                project_id,
+                                version_id,
+                                locked,
+                            });
                         }
 
                         None

packages/app-lib/src/state/minecraft_auth.rs

@@ -393,10 +393,9 @@ impl Credentials {
                             ..
                         },
                     ) = *err.raw
+                        && (source.is_connect() || source.is_timeout())
                     {
-                        if source.is_connect() || source.is_timeout() {
-                            return Ok(Some(creds));
-                        }
+                        return Ok(Some(creds));
                     }
 
                     Err(err)
@@ -640,36 +639,31 @@ impl DeviceTokenPair {
             .fetch_optional(exec)
             .await?;
 
-        if let Some(x) = res {
-            if let Ok(uuid) = Uuid::parse_str(&x.uuid) {
-                if let Ok(private_key) =
-                    SigningKey::from_pkcs8_pem(&x.private_key)
-                {
-                    return Ok(Some(Self {
-                        token: DeviceToken {
-                            issue_instant: Utc
-                                .timestamp_opt(x.issue_instant, 0)
-                                .single()
-                                .unwrap_or_else(Utc::now),
-                            not_after: Utc
-                                .timestamp_opt(x.not_after, 0)
-                                .single()
-                                .unwrap_or_else(Utc::now),
-                            token: x.token,
-                            display_claims: serde_json::from_value(
-                                x.display_claims,
-                            )
-                            .unwrap_or_default(),
-                        },
-                        key: DeviceTokenKey {
-                            id: uuid,
-                            key: private_key,
-                            x: x.x,
-                            y: x.y,
-                        },
-                    }));
-                }
-            }
+        if let Some(x) = res
+            && let Ok(uuid) = Uuid::parse_str(&x.uuid)
+            && let Ok(private_key) = SigningKey::from_pkcs8_pem(&x.private_key)
+        {
+            return Ok(Some(Self {
+                token: DeviceToken {
+                    issue_instant: Utc
+                        .timestamp_opt(x.issue_instant, 0)
+                        .single()
+                        .unwrap_or_else(Utc::now),
+                    not_after: Utc
+                        .timestamp_opt(x.not_after, 0)
+                        .single()
+                        .unwrap_or_else(Utc::now),
+                    token: x.token,
+                    display_claims: serde_json::from_value(x.display_claims)
+                        .unwrap_or_default(),
+                },
+                key: DeviceTokenKey {
+                    id: uuid,
+                    key: private_key,
+                    x: x.x,
+                    y: x.y,
+                },
+            }));
         }
 
         Ok(None)
@@ -724,7 +718,7 @@ const MICROSOFT_CLIENT_ID: &str = "00000000402b5328";
 const AUTH_REPLY_URL: &str = "https://login.live.com/oauth20_desktop.srf";
 const REQUESTED_SCOPE: &str = "service::user.auth.xboxlive.com::MBI_SSL";
 
-struct RequestWithDate<T> {
+pub struct RequestWithDate<T> {
     pub date: DateTime<Utc>,
     pub value: T,
 }

packages/app-lib/src/state/process.rs

@@ -360,18 +360,17 @@ impl Process {
                                     }
 
                                     // Write the throwable if present
-                                    if !current_content.is_empty() {
-                                        if let Err(e) =
+                                    if !current_content.is_empty()
+                                        && let Err(e) =
                                             Process::append_to_log_file(
                                                 &log_path,
                                                 &current_content,
                                             )
-                                        {
-                                            tracing::error!(
-                                                "Failed to write throwable to log file: {}",
-                                                e
-                                            );
-                                        }
+                                    {
+                                        tracing::error!(
+                                            "Failed to write throwable to log file: {}",
+                                            e
+                                        );
                                     }
                                 }
                             }
@@ -429,15 +428,13 @@ impl Process {
 
                                     if let Some(timestamp) =
                                         current_event.timestamp.as_deref()
-                                    {
-                                        if let Err(e) = Self::maybe_handle_server_join_logging(
+                                        && let Err(e) = Self::maybe_handle_server_join_logging(
                                             profile_path,
                                             timestamp,
                                             message
                                         ).await {
                                             tracing::error!("Failed to handle server join logging: {e}");
                                         }
-                                    }
                                 }
                             }
                             _ => {}
@@ -445,35 +442,29 @@ impl Process {
                     }
                     Ok(Event::Text(mut e)) => {
                         if in_message || in_throwable {
-                            if let Ok(text) = e.unescape() {
+                            if let Ok(text) = e.xml_content() {
                                 current_content.push_str(&text);
                             }
                         } else if !in_event
                             && !e.inplace_trim_end()
                             && !e.inplace_trim_start()
+                            && let Ok(text) = e.xml_content()
+                            && let Err(e) = Process::append_to_log_file(
+                                &log_path,
+                                &format!("{text}\n"),
+                            )
                         {
-                            if let Ok(text) = e.unescape() {
-                                if let Err(e) = Process::append_to_log_file(
-                                    &log_path,
-                                    &format!("{text}\n"),
-                                ) {
-                                    tracing::error!(
-                                        "Failed to write to log file: {}",
-                                        e
-                                    );
-                                }
-                            }
+                            tracing::error!(
+                                "Failed to write to log file: {}",
+                                e
+                            );
                         }
                     }
                     Ok(Event::CData(e)) => {
-                        if in_message || in_throwable {
-                            if let Ok(text) = e
-                                .escape()
-                                .map_err(|x| x.into())
-                                .and_then(|x| x.unescape())
-                            {
-                                current_content.push_str(&text);
-                            }
+                        if (in_message || in_throwable)
+                            && let Ok(text) = e.xml_content()
+                        {
+                            current_content.push_str(&text);
                         }
                     }
                     _ => (),
@@ -720,16 +711,13 @@ impl Process {
         let logs_folder = state.directories.profile_logs_dir(&profile_path);
         let log_path = logs_folder.join(LAUNCHER_LOG_PATH);
 
-        if log_path.exists() {
-            if let Err(e) = Process::append_to_log_file(
+        if log_path.exists()
+            && let Err(e) = Process::append_to_log_file(
                 &log_path,
                 &format!("\n# Process exited with status: {mc_exit_status}\n"),
-            ) {
-                tracing::warn!(
-                    "Failed to write exit status to log file: {}",
-                    e
-                );
-            }
+            )
+        {
+            tracing::warn!("Failed to write exit status to log file: {}", e);
         }
 
         let _ = state.discord_rpc.clear_to_default(true).await;

packages/app-lib/src/state/profiles.rs

@@ -595,8 +595,8 @@ impl Profile {
     }
 
     #[tracing::instrument(skip(self, semaphore, icon))]
-    pub async fn set_icon<'a>(
-        &'a mut self,
+    pub async fn set_icon(
+        &mut self,
         cache_dir: &Path,
         semaphore: &IoSemaphore,
         icon: bytes::Bytes,
@@ -629,21 +629,20 @@ impl Profile {
                     {
                         let subdirectory =
                             subdirectory.map_err(io::IOError::from)?.path();
-                        if subdirectory.is_file() {
-                            if let Some(file_name) = subdirectory
+                        if subdirectory.is_file()
+                            && let Some(file_name) = subdirectory
                                 .file_name()
                                 .and_then(|x| x.to_str())
-                            {
-                                let file_size = subdirectory
-                                    .metadata()
-                                    .map_err(io::IOError::from)?
-                                    .len();
+                        {
+                            let file_size = subdirectory
+                                .metadata()
+                                .map_err(io::IOError::from)?
+                                .len();
 
-                                keys.push(format!(
-                                    "{file_size}-{}/{folder}/{file_name}",
-                                    profile.path
-                                ));
-                            }
+                            keys.push(format!(
+                                "{file_size}-{}/{folder}/{file_name}",
+                                profile.path
+                            ));
                         }
                     }
                 }
@@ -901,30 +900,29 @@ impl Profile {
                 {
                     let subdirectory =
                         subdirectory.map_err(io::IOError::from)?.path();
-                    if subdirectory.is_file() {
-                        if let Some(file_name) =
+                    if subdirectory.is_file()
+                        && let Some(file_name) =
                             subdirectory.file_name().and_then(|x| x.to_str())
-                        {
-                            let file_size = subdirectory
-                                .metadata()
-                                .map_err(io::IOError::from)?
-                                .len();
+                    {
+                        let file_size = subdirectory
+                            .metadata()
+                            .map_err(io::IOError::from)?
+                            .len();
 
-                            keys.push(InitialScanFile {
-                                path: format!(
-                                    "{}/{folder}/{}",
-                                    self.path,
-                                    file_name.trim_end_matches(".disabled")
-                                ),
-                                file_name: file_name.to_string(),
-                                project_type,
-                                size: file_size,
-                                cache_key: format!(
-                                    "{file_size}-{}/{folder}/{file_name}",
-                                    self.path
-                                ),
-                            });
-                        }
+                        keys.push(InitialScanFile {
+                            path: format!(
+                                "{}/{folder}/{}",
+                                self.path,
+                                file_name.trim_end_matches(".disabled")
+                            ),
+                            file_name: file_name.to_string(),
+                            project_type,
+                            size: file_size,
+                            cache_key: format!(
+                                "{file_size}-{}/{folder}/{file_name}",
+                                self.path
+                            ),
+                        });
                     }
                 }
             }

packages/app-lib/src/util/fetch.rs

@@ -254,7 +254,7 @@ where
 }
 
 #[tracing::instrument(skip(bytes, semaphore))]
-pub async fn write<'a>(
+pub async fn write(
     path: &Path,
     bytes: &[u8],
     semaphore: &IoSemaphore,

packages/app-lib/src/util/jre.rs

@@ -191,22 +191,21 @@ async fn get_all_autoinstalled_jre_path() -> Result<HashSet<PathBuf>, JREError>
         let mut jre_paths = HashSet::new();
         let base_path = state.directories.java_versions_dir();
 
-        if base_path.is_dir() {
-            if let Ok(dir) = std::fs::read_dir(base_path) {
-                for entry in dir.flatten() {
-                    let file_path = entry.path().join("bin");
+        if base_path.is_dir()
+            && let Ok(dir) = std::fs::read_dir(base_path)
+        {
+            for entry in dir.flatten() {
+                let file_path = entry.path().join("bin");
 
-                    if let Ok(contents) =
-                        std::fs::read_to_string(file_path.clone())
+                if let Ok(contents) = std::fs::read_to_string(file_path.clone())
+                {
+                    let entry = entry.path().join(contents);
+                    jre_paths.insert(entry);
+                } else {
+                    #[cfg(not(target_os = "macos"))]
                     {
-                        let entry = entry.path().join(contents);
-                        jre_paths.insert(entry);
-                    } else {
-                        #[cfg(not(target_os = "macos"))]
-                        {
-                            let file_path = file_path.join(JAVA_BIN);
-                            jre_paths.insert(file_path);
-                        }
+                        let file_path = file_path.join(JAVA_BIN);
+                        jre_paths.insert(file_path);
                     }
                 }
             }
@@ -300,20 +299,20 @@ pub async fn check_java_at_filepath(path: &Path) -> crate::Result<JavaVersion> {
     }
 
     // Extract version info from it
-    if let Some(arch) = java_arch {
-        if let Some(version) = java_version {
-            if let Ok(version) = extract_java_version(version) {
-                let path = java.to_string_lossy().to_string();
-                return Ok(JavaVersion {
-                    parsed_version: version,
-                    path,
-                    version: version.to_string(),
-                    architecture: arch.to_string(),
-                });
-            }
-
-            return Err(JREError::InvalidJREVersion(version.to_owned()).into());
+    if let Some(arch) = java_arch
+        && let Some(version) = java_version
+    {
+        if let Ok(version) = extract_java_version(version) {
+            let path = java.to_string_lossy().to_string();
+            return Ok(JavaVersion {
+                parsed_version: version,
+                path,
+                version: version.to_string(),
+                architecture: arch.to_string(),
+            });
         }
+
+        return Err(JREError::InvalidJREVersion(version.to_owned()).into());
     }
 
     Err(JREError::FailedJavaCheck(java).into())

packages/ariadne/src/versions.rs

@@ -33,12 +33,11 @@ pub fn is_feature_supported_in(
         if part_version == part_first_release {
             continue;
         }
-        if let Ok(part_version) = part_version.parse::<u32>() {
-            if let Ok(part_first_release) = part_first_release.parse::<u32>() {
-                if part_version > part_first_release {
-                    return true;
-                }
-            }
+        if let Ok(part_version) = part_version.parse::<u32>()
+            && let Ok(part_first_release) = part_first_release.parse::<u32>()
+            && part_version > part_first_release
+        {
+            return true;
         }
     }
     false

packages/moderation/README.md

@@ -1,8 +1,6 @@
-<!-- TODO: After checklist v1.5, move everything into src directory. -->
-
 # @modrinth/moderation
 
-This package contains both the moderation checklist system used by moderators for reviewing projects on Modrinth, and the publishing checklist (nag system) that provides automated feedback to project authors during the submission process.
+This package contains the moderation checklist system used for reviewing projects on Modrinth. It provides a structured and transparent way to define moderation stages, actions, and messages that are displayed to moderators during the review process.
 
 ## Structure
 
@@ -11,30 +9,22 @@ The package is organized as follows:
 ```
 /packages/moderation/
 ├── data/
-│   ├── checklist.ts        # Main moderation checklist definition - imports and exports all stages
-│   ├── messages/           # Markdown files containing message templates for moderation
+│   ├── checklist.ts        # Main checklist definition - imports and exports all stages
+│   ├── messages/           # Markdown files containing message templates
 │   │   ├── title/          # Messages for the title stage
 │   │   ├── description/    # Messages for the description stage
 │   │   └── ...             # One directory per stage
-│   ├── stages/             # Moderation stage definition files
-│   │   ├── title.ts        # Title stage definition
-│   │   ├── description.ts  # Description stage definition
-│   │   └── ...             # One file per stage
-│   └── nags/               # Publishing checklist (nag system) files
-│       ├── core.ts         # Core nags (required fields, basic validation)
-│       └── ...
+│   └── stages/             # Stage definition files
+│       ├── title.ts        # Title stage definition
+│       ├── description.ts  # Description stage definition
+│       └── ...             # One file per stage
 └── types/                  # Type definitions
-    ├── actions.ts          # Action-related types (moderation)
-    ├── messages.ts         # Message-related types (moderation)
-    ├── stage.ts            # Stage-related types (moderation)
-    └── nags.ts             # Nag-related types (publishing checklist)
+    ├── actions.ts          # Action-related types
+    ├── messages.ts         # Message-related types
+    └── stage.ts            # Stage-related types
 ```
 
-## Moderation Checklist System
-
-The moderation checklist provides a structured and transparent way to define moderation stages, actions, and messages that are displayed to moderators during the review process.
-
-### Stages
+## Stages
 
 A stage represents a discrete step in the moderation process, like checking a project's title, description, or links. Each stage has:
 
@@ -45,7 +35,7 @@ A stage represents a discrete step in the moderation process, like checking a pr
 
 Stages are defined in individual files in the `data/stages` directory and are assembled into the complete checklist in `data/checklist.ts`.
 
-### Actions
+## Actions
 
 Actions represent decisions moderators can make for each stage. They can be buttons, dropdowns, toggles, etc. Actions can have:
 
@@ -57,11 +47,11 @@ Actions represent decisions moderators can make for each stage. They can be butt
 
 Each action requires a unique `id` field that is used for conditional logic and action relationships. The `suggestedStatus` and `severity` fields help determine the overall moderation outcome.
 
-### Messages
+## Messages
 
 Messages are the actual text that will be included in communications to project authors. To promote maintainability and reuse, messages are stored as Markdown files in the `data/messages` directory, organized by stage.
 
-#### Variable replacement
+### Variable replacement
 
 You can use variables in your messages that will be replaced with user input:
 
@@ -91,11 +81,11 @@ More text after the variable.
 
 The `%MESSAGE%` placeholder will be replaced with the text entered by the moderator.
 
-### Conditional logic
+## Conditional logic
 
 The moderation system supports conditional behavior that changes based on the selection of other actions.
 
-#### Conditional messages
+### Conditional messages
 
 You can define different messages for an action based on other selected actions:
 
@@ -118,7 +108,7 @@ You can define different messages for an action based on other selected actions:
 }
 ```
 
-#### Enabling and disabling actions
+### Enabling and disabling actions
 
 Actions can enable or disable other actions when selected:
 
@@ -141,7 +131,7 @@ Actions can enable or disable other actions when selected:
 }
 ```
 
-#### Conditional text inputs
+### Conditional text inputs
 
 Text inputs can be conditionally shown based on selected actions:
 
@@ -157,86 +147,3 @@ relevantExtraInput: [
   },
 ]
 ```
-
-## Publishing Checklist (Nag System)
-
-The nag system provides automated feedback to project authors during the submission process, helping them improve their projects before they reach moderation. It analyzes project data and provides suggestions, warnings, and requirements.
-
-### Nags
-
-A nag represents a specific issue or suggestion for improvement. Each nag has:
-
-- A unique `id` for identification
-- A `title` and `description` displayed to the user
-- A `status` indicating severity: `'required'`, `'warning'`, or `'suggestion'`
-- A `shouldShow` function that determines when the nag should be displayed
-- An optional `link` to help users address the issue
-
-### Internationalization
-
-Use vintl's `defineMessage` syntax.
-
-If you want to use context in the messages, you can do so like this:
-
-```typescript
-description: (context: NagContext) => {
-  const { formatMessage } = useVIntl()
-
-  return formatMessage(defineMessage(...), {
-    length: context.project.body?.length || 0,
-    minChars: MIN_DESCRIPTION_CHARS,
-  })
-}
-```
-
-### Nag Context
-
-The `NagContext` type provides access to:
-
-- `project`: Current project data
-- `versions`: Project versions
-- `tags`: Frontend "tags" (generated state)
-- `currentRoute`: Current page route
-- and other data...
-
-### Adding New Nags
-
-To add a new nag:
-
-1. Add the nag definition to the appropriate category file (or make a new category file and add it to `data/nags.ts`)
-2. Add corresponding i18n messages to the `.i18n.ts` file
-3. Implement the `shouldShow` logic based on project state
-4. Add appropriate links to help users resolve the issue
-5. Run `pnpm run fix` to fix lint issues & generate the root locale index.json file.
-
-Example:
-
-```typescript
-// In description.ts
-{
-  id: 'new-nag',
-  title: messages.newNagTitle,
-  description: messages.newNagDescription,
-  status: 'warning',
-  shouldShow: (context: NagContext) => {
-    // Your validation logic here
-    return someCondition
-  },
-  link: {
-    path: 'settings/description',
-    title: messages.editDescriptionTitle,
-    shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-  },
-}
-```
-
-```typescript
-// In description.i18n.ts
-newNagTitle: {
-  id: 'nags.new-nag.title',
-  defaultMessage: 'New Nag Title',
-},
-newNagDescription: {
-  id: 'nags.new-nag.description',
-  defaultMessage: 'Description of the new nag issue.',
-```

packages/moderation/data/nags.ts

@@ -1,7 +0,0 @@
-import type { Nag } from '../types/nags'
-import { coreNags } from './nags/core'
-import { descriptionNags } from './nags/description'
-import { linksNags } from './nags/links'
-import { tagsNags } from './nags/tags'
-
-export default [...coreNags, ...linksNags, ...descriptionNags, ...tagsNags] as Nag[]

packages/moderation/data/nags/core.ts

@@ -1,241 +0,0 @@
-import type { Nag, NagContext } from '../../types/nags'
-import { formatProjectType } from '@modrinth/utils'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const coreNags: Nag[] = [
-  {
-    id: 'moderator-feedback',
-    title: defineMessage({
-      id: 'nags.moderator-feedback.title',
-      defaultMessage: 'Review moderator feedback',
-    }),
-    description: defineMessage({
-      id: 'nags.moderator-feedback.description',
-      defaultMessage:
-        'Review and address all concerns from the moderation team before resubmitting.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) =>
-      context.tags.rejectedStatuses.includes(context.project.status),
-    link: {
-      path: 'moderation',
-      title: defineMessage({
-        id: 'nags.moderation.title',
-        defaultMessage: 'Visit moderation thread',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-moderation',
-    },
-  },
-  {
-    id: 'upload-version',
-    title: defineMessage({
-      id: 'nags.upload-version.title',
-      defaultMessage: 'Upload a version',
-    }),
-    description: defineMessage({
-      id: 'nags.upload-version.description',
-      defaultMessage: 'At least one version is required for a project to be submitted for review.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => context.versions.length < 1,
-    link: {
-      path: 'versions',
-      title: defineMessage({
-        id: 'nags.versions.title',
-        defaultMessage: 'Visit versions page',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-versions',
-    },
-  },
-  {
-    id: 'add-description',
-    title: defineMessage({
-      id: 'nags.add-description.title',
-      defaultMessage: 'Add a description',
-    }),
-    description: defineMessage({
-      id: 'nags.add-description.description',
-      defaultMessage:
-        "A description that clearly describes the project's purpose and function is required.",
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => context.project.body === '',
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.settings.description.title',
-        defaultMessage: 'Visit description settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'add-icon',
-    title: defineMessage({
-      id: 'nags.add-icon.title',
-      defaultMessage: 'Add an icon',
-    }),
-    description: defineMessage({
-      id: 'nags.add-icon.description',
-      defaultMessage:
-        'Adding a unique, relevant, and engaging icon makes your project identifiable and helps it stand out.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) => !context.project.icon_url,
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.settings.title',
-        defaultMessage: 'Visit general settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'feature-gallery-image',
-    title: defineMessage({
-      id: 'nags.feature-gallery-image.title',
-      defaultMessage: 'Feature a gallery image',
-    }),
-    description: defineMessage({
-      id: 'nags.feature-gallery-image.description',
-      defaultMessage:
-        'The featured gallery image is often how your project makes its first impression.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) => {
-      const featuredGalleryImage = context.project.gallery?.find((img) => img.featured)
-      return context.project?.gallery?.length === 0 || !featuredGalleryImage
-    },
-    link: {
-      path: 'gallery',
-      title: defineMessage({
-        id: 'nags.gallery.title',
-        defaultMessage: 'Visit gallery page',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-gallery',
-    },
-  },
-  {
-    id: 'select-tags',
-    title: defineMessage({
-      id: 'nags.select-tags.title',
-      defaultMessage: 'Select tags',
-    }),
-    description: defineMessage({
-      id: 'nags.select-tags.description',
-      defaultMessage:
-        'Select the tags that correctly apply to your project to help the right users find it.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) =>
-      context.project.versions.length > 0 && context.project.categories.length < 1,
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.settings.tags.title',
-        defaultMessage: 'Visit tag settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'add-links',
-    title: defineMessage({
-      id: 'nags.add-links.title',
-      defaultMessage: 'Add external links',
-    }),
-    description: defineMessage({
-      id: 'nags.add-links.description',
-      defaultMessage:
-        'Add any relevant links targeted outside of Modrinth, such as source code, an issue tracker, or a Discord invite.',
-    }),
-    status: 'suggestion',
-    shouldShow: (context: NagContext) =>
-      !(
-        context.project.issues_url ||
-        context.project.source_url ||
-        context.project.wiki_url ||
-        context.project.discord_url ||
-        context.project.donation_urls.length > 0
-      ),
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.settings.links.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'select-environments',
-    title: defineMessage({
-      id: 'nags.select-environments.title',
-      defaultMessage: 'Select supported environments',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.select-environments.description',
-          defaultMessage: `Select if the {projectType} functions on the client-side and/or server-side.`,
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const excludedTypes = ['resourcepack', 'plugin', 'shader', 'datapack']
-      return (
-        context.project.versions.length > 0 &&
-        !excludedTypes.includes(context.project.project_type) &&
-        (context.project.client_side === 'unknown' ||
-          context.project.server_side === 'unknown' ||
-          (context.project.client_side === 'unsupported' &&
-            context.project.server_side === 'unsupported'))
-      )
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.settings.environments.title',
-        defaultMessage: 'Visit general settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'select-license',
-    title: defineMessage({
-      id: 'nags.select-license.title',
-      defaultMessage: 'Select a license',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.select-license.description',
-          defaultMessage: 'Select the license your {projectType} is distributed under.',
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => context.project.license.id === 'LicenseRef-Unknown',
-    link: {
-      path: 'settings/license',
-      title: defineMessage({
-        id: 'nags.settings.license.title',
-        defaultMessage: 'Visit license settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-license',
-    },
-  },
-]

packages/moderation/data/nags/description.ts

@@ -1,343 +0,0 @@
-import { renderHighlightedString } from '@modrinth/utils'
-import type { Nag, NagContext } from '../../types/nags'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const MIN_DESCRIPTION_CHARS = 200
-export const MAX_HEADER_LENGTH = 80
-export const MIN_SUMMARY_CHARS = 30
-export const MIN_CHARS_PER_IMAGE = 60
-
-export function analyzeHeaderLength(markdown: string): {
-  hasLongHeaders: boolean
-  longHeaders: string[]
-} {
-  if (!markdown) return { hasLongHeaders: false, longHeaders: [] }
-
-  const withoutCodeBlocks = markdown.replace(/```[\s\S]*?```/g, '').replace(/`[^`]*`/g, '')
-
-  const headerRegex = /^(#{1,3})\s+(.+)$/gm
-  const headers = [...withoutCodeBlocks.matchAll(headerRegex)]
-
-  const longHeaders: string[] = []
-
-  headers.forEach((match) => {
-    const headerText = match[2].trim()
-    const sentenceEnders = /[.!?]+/g
-    const sentences = headerText.split(sentenceEnders).filter((s) => s.trim().length > 0)
-
-    const isVeryLong = headerText.length > MAX_HEADER_LENGTH
-    const hasMultipleSentences = sentences.length > 1
-
-    if (isVeryLong || hasMultipleSentences) {
-      longHeaders.push(headerText)
-    }
-  })
-
-  return {
-    hasLongHeaders: longHeaders.length > 0,
-    longHeaders,
-  }
-}
-
-export function analyzeImageContent(markdown: string): {
-  imageHeavy: boolean
-  hasEmptyAltText: boolean
-} {
-  if (!markdown) return { imageHeavy: false, hasEmptyAltText: false }
-
-  const withoutCodeBlocks = markdown.replace(/```[\s\S]*?```/g, '').replace(/`[^`]*`/g, '')
-
-  const imageRegex = /!\[([^\]]*)\]\([^)]+\)/g
-  const images = [...withoutCodeBlocks.matchAll(imageRegex)]
-
-  const htmlImageRegex = /<img[^>]*>/gi
-  const htmlImages = [...withoutCodeBlocks.matchAll(htmlImageRegex)]
-
-  const totalImages = images.length + htmlImages.length
-  if (totalImages === 0) return { imageHeavy: false, hasEmptyAltText: false }
-
-  const textWithoutImages = withoutCodeBlocks
-    .replace(/!\[([^\]]*)\]\([^)]+\)/g, '')
-    .replace(/<img[^>]*>/gi, '')
-    .replace(/\s+/g, ' ')
-    .trim()
-
-  const textLength = textWithoutImages.length
-  const recommendedTextLength = MIN_CHARS_PER_IMAGE * totalImages
-
-  const imageHeavy =
-    recommendedTextLength > MIN_DESCRIPTION_CHARS && textLength < recommendedTextLength
-
-  const hasEmptyAltText =
-    images.some((match) => !match[1]?.trim()) ||
-    htmlImages.some((match) => {
-      const altMatch = match[0].match(/alt\s*=\s*["']([^"']*)["']/i)
-      return !altMatch || !altMatch[1]?.trim()
-    })
-
-  return { imageHeavy, hasEmptyAltText }
-}
-
-export function countText(markdown: string): number {
-  const htmlString = renderHighlightedString(markdown)
-  const parser = new DOMParser()
-  const doc = parser.parseFromString(htmlString, 'text/html')
-  const walker = document.createTreeWalker(doc, NodeFilter.SHOW_TEXT)
-
-  const textList: string[] = []
-  let currentNode: Node | null = walker.currentNode
-
-  while (currentNode) {
-    if (currentNode.textContent !== null) {
-      textList.push(currentNode.textContent)
-    }
-    currentNode = walker.nextNode()
-  }
-
-  return textList.join(' ').trim().length
-}
-
-export const descriptionNags: Nag[] = [
-  {
-    id: 'description-too-short',
-    title: defineMessage({
-      id: 'nags.description-too-short.title',
-      defaultMessage: 'Expand the description',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const readableLength = countText(context.project.body || '')
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.description-too-short.description',
-          defaultMessage:
-            'Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description.',
-        }),
-        {
-          length: readableLength,
-          minChars: MIN_DESCRIPTION_CHARS,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const readableLength = countText(context.project.body || '')
-      return readableLength < MIN_DESCRIPTION_CHARS && readableLength > 0
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'long-headers',
-    title: defineMessage({
-      id: 'nags.long-headers.title',
-      defaultMessage: 'Shorten headers',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const { longHeaders } = analyzeHeaderLength(context.project.body || '')
-      const count = longHeaders.length
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.long-headers.description',
-          defaultMessage:
-            '{count, plural, one {# header} other {# headers}} in your description {count, plural, one {is} other {are}} too long. Headers should be concise and act as section titles, not full sentences.',
-        }),
-        {
-          count,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { hasLongHeaders } = analyzeHeaderLength(context.project.body || '')
-      return hasLongHeaders
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'summary-too-short',
-    title: defineMessage({
-      id: 'nags.summary-too-short.title',
-      defaultMessage: 'Expand the summary',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.summary-too-short.description',
-          defaultMessage:
-            'Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary.',
-        }),
-        {
-          length: context.project.description?.length || 0,
-          minChars: MIN_SUMMARY_CHARS,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const summaryLength = context.project.description?.trim()?.length || 0
-      return summaryLength < MIN_SUMMARY_CHARS && summaryLength !== 0
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-summary.title',
-        defaultMessage: 'Edit summary',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'minecraft-title-clause',
-    title: defineMessage({
-      id: 'nags.minecraft-title-clause.title',
-      defaultMessage: 'Avoid brand infringement',
-    }),
-    description: defineMessage({
-      id: 'nags.minecraft-title-clause.description',
-      defaultMessage: `Projects must not use Minecraft's branding or include "Minecraft" as a significant part of the name.`,
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.toLowerCase() || ''
-      const wordsInTitle = title.split(' ').filter((word) => word.length > 0)
-      return title.includes('minecraft') && title.length > 0 && wordsInTitle.length <= 3
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-title.title',
-        defaultMessage: 'Edit title',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'title-contains-technical-info',
-    title: defineMessage({
-      id: 'nags.title-contains-technical-info.title',
-      defaultMessage: 'Clean up the name',
-    }),
-    description: defineMessage({
-      id: 'nags.title-contains-technical-info.description',
-      defaultMessage:
-        "Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project.",
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.toLowerCase() || ''
-      if (!title) return false
-
-      const loaderNames =
-        context.tags.loaders?.map((loader: { name: string }) => loader.name?.toLowerCase()) || []
-      const hasLoader = loaderNames.some((loader) => loader && title.includes(loader.toLowerCase()))
-      const versionPatterns = [/\b1\.\d+(\.\d+)?\b/]
-      const hasVersionPattern = versionPatterns.some((pattern) => pattern.test(title))
-
-      return hasLoader || hasVersionPattern
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-title.title',
-        defaultMessage: 'Edit title',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'summary-same-as-title',
-    title: defineMessage({
-      id: 'nags.summary-same-as-title.title',
-      defaultMessage: 'Make the summary unique',
-    }),
-    description: defineMessage({
-      id: 'nags.summary-same-as-title.description',
-      defaultMessage:
-        "Your summary can not be the same as your project's Name. It's important to create an informative and enticing Summary.",
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const title = context.project.title?.trim() || ''
-      const summary = context.project.description?.trim() || ''
-      return title === summary && title.length > 0 && summary.length > 0
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-summary.title',
-        defaultMessage: 'Edit summary',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    // Don't like this one, is this needed?
-    id: 'image-heavy-description',
-    title: defineMessage({
-      id: 'nags.image-heavy-description.title',
-      defaultMessage: 'Ensure accessibility',
-    }),
-    description: defineMessage({
-      id: 'nags.image-heavy-description.description',
-      defaultMessage:
-        'Your Description should contain sufficient plain text or image alt-text, keeping it accessible to those using screen readers or with slow internet connections.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { imageHeavy } = analyzeImageContent(context.project.body || '')
-      return imageHeavy
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-  {
-    id: 'missing-alt-text',
-    title: defineMessage({
-      id: 'nags.missing-alt-text.title',
-      defaultMessage: 'Add image alt text',
-    }),
-    description: defineMessage({
-      id: 'nags.missing-alt-text.description',
-      defaultMessage:
-        'Some of your images are missing alt text, which is important for accessibility, especially for visually impaired users.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const { hasEmptyAltText } = analyzeImageContent(context.project.body || '')
-      return hasEmptyAltText
-    },
-    link: {
-      path: 'settings/description',
-      title: defineMessage({
-        id: 'nags.edit-description.title',
-        defaultMessage: 'Edit description',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-description',
-    },
-  },
-]

packages/moderation/data/nags/index.ts

@@ -1,4 +0,0 @@
-export * from './core'
-export * from './links'
-export * from './description'
-export * from './tags'

packages/moderation/data/nags/links.ts

@@ -1,269 +0,0 @@
-import type { Nag, NagContext } from '../../types/nags'
-import { formatProjectType } from '@modrinth/utils'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-export const commonLinkDomains = {
-  source: ['github.com', 'gitlab.com', 'bitbucket.org', 'codeberg.org', 'git.sr.ht'],
-  issues: ['github.com', 'gitlab.com', 'bitbucket.org', 'codeberg.org', 'docs.google.com'],
-  discord: ['discord.gg', 'discord.com', 'dsc.gg'],
-  licenseBlocklist: [
-    'youtube.com',
-    'youtu.be',
-    'modrinth.com',
-    'curseforge.com',
-    'twitter.com',
-    'x.com',
-    'discord.gg',
-    'discord.com',
-    'instagram.com',
-    'facebook.com',
-    'tiktok.com',
-    'reddit.com',
-    'twitch.tv',
-    'patreon.com',
-    'ko-fi.com',
-    'paypal.com',
-    'buymeacoffee.com',
-    'google.com',
-    'example.com',
-    't.me',
-  ],
-  linkShorteners: ['bit.ly', 'adf.ly', 'tinyurl.com', 'short.io', 'is.gd'],
-}
-
-export function isCommonUrl(url: string | null, commonDomains: string[]): boolean {
-  if (url === null || url === '') return true
-  try {
-    const domain = new URL(url).hostname.toLowerCase()
-    return commonDomains.some((allowed) => domain.includes(allowed))
-  } catch {
-    return false
-  }
-}
-
-export function isCommonUrlOfType(url: string | null, commonDomains: string[]): boolean {
-  if (url === null || url === '') return false
-  return isCommonUrl(url, commonDomains)
-}
-
-export function isDiscordUrl(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.discord)
-}
-
-export function isLinkShortener(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.linkShorteners)
-}
-
-export function isUncommonLicenseUrl(url: string | null): boolean {
-  return isCommonUrlOfType(url, commonLinkDomains.licenseBlocklist)
-}
-
-export const linksNags: Nag[] = [
-  {
-    id: 'verify-external-links',
-    title: defineMessage({
-      id: 'nags.verify-external-links.title',
-      defaultMessage: 'Verify external links',
-    }),
-    description: defineMessage({
-      id: 'nags.verify-external-links.description',
-      defaultMessage:
-        'Some of your external links may be using domains that are inappropriate for that type of link.',
-    }),
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      return (
-        !isCommonUrl(context.project.source_url, commonLinkDomains.source) ||
-        !isCommonUrl(context.project.issues_url, commonLinkDomains.issues) ||
-        !isCommonUrl(context.project.discord_url, commonLinkDomains.discord)
-      )
-    },
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'misused-discord-link',
-    title: defineMessage({
-      id: 'nags.misused-discord-link.title',
-      defaultMessage: 'Move Discord invite',
-    }),
-    description: defineMessage({
-      id: 'nags.misused-discord-link-description',
-      defaultMessage:
-        'Discord invites can not be used for other link types. Please put your Discord link in the Discord Invite link field only.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) =>
-      isDiscordUrl(context.project.source_url) ||
-      isDiscordUrl(context.project.issues_url) ||
-      isDiscordUrl(context.project.wiki_url),
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-  {
-    id: 'link-shortener-usage',
-    title: defineMessage({
-      id: 'nags.link-shortener-usage.title',
-      defaultMessage: "Don't use link shorteners",
-    }),
-    description: defineMessage({
-      id: 'nags.link-shortener-usage.description',
-      defaultMessage:
-        'Use of link shorteners or other methods to obscure where a link may lead in your external links or license link is prohibited, please only use appropriate full length links.',
-    }),
-    status: 'required',
-    shouldShow: (context: NagContext) =>
-      isLinkShortener(context.project.source_url) ||
-      isLinkShortener(context.project.issues_url) ||
-      isLinkShortener(context.project.wiki_url) ||
-      Boolean(context.project.license.url && isLinkShortener(context.project.license.url)),
-  },
-  {
-    id: 'invalid-license-url',
-    title: defineMessage({
-      id: 'nags.invalid-license-url.title',
-      defaultMessage: 'Add a valid license link',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const licenseUrl = context.project.license.url
-
-      if (!licenseUrl) {
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.default',
-            defaultMessage: 'License URL is invalid.',
-          }),
-        )
-      }
-
-      try {
-        const domain = new URL(licenseUrl).hostname.toLowerCase()
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.domain',
-            defaultMessage:
-              'Your license URL points to {domain}, which is not appropriate for license information. License URLs should link directly to your license file, not social media, gaming platforms, etc.',
-          }),
-          { domain },
-        )
-      } catch {
-        return formatMessage(
-          defineMessage({
-            id: 'nags.invalid-license-url.description.malformed',
-            defaultMessage:
-              'Your license URL appears to be malformed. Please provide a valid URL to your license text.',
-          }),
-        )
-      }
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const licenseUrl = context.project.license.url
-      if (!licenseUrl) return false
-
-      const isBlocklisted = isUncommonLicenseUrl(licenseUrl)
-
-      try {
-        new URL(licenseUrl)
-        return isBlocklisted
-      } catch {
-        return true
-      }
-    },
-    link: {
-      path: 'settings',
-      title: defineMessage({
-        id: 'nags.edit-license.title',
-        defaultMessage: 'Edit license',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings',
-    },
-  },
-  {
-    id: 'gpl-license-source-required',
-    title: defineMessage({
-      id: 'nags.gpl-license-source-required.title',
-      defaultMessage: 'Provide source code',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.gpl-license-source-required.description',
-          defaultMessage:
-            'Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license.',
-        }),
-        {
-          projectType: formatProjectType(context.project.project_type).toLowerCase(),
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const gplLicenses = [
-        'GPL-2.0',
-        'GPL-2.0+',
-        'GPL-2.0-only',
-        'GPL-2.0-or-later',
-        'GPL-3.0',
-        'GPL-3.0+',
-        'GPL-3.0-only',
-        'GPL-3.0-or-later',
-        'LGPL-2.1',
-        'LGPL-2.1+',
-        'LGPL-2.1-only',
-        'LGPL-2.1-or-later',
-        'LGPL-3.0',
-        'LGPL-3.0+',
-        'LGPL-3.0-only',
-        'LGPL-3.0-or-later',
-        'AGPL-3.0',
-        'AGPL-3.0+',
-        'AGPL-3.0-only',
-        'AGPL-3.0-or-later',
-        'MPL-2.0',
-      ]
-
-      const isGplLicense = gplLicenses.includes(context.project.license.id)
-      const hasSourceUrl = !!context.project.source_url
-      const hasAdditionalFiles = (context: NagContext) => {
-        let hasAdditional = true
-        context.versions.forEach((version) => {
-          if (version.files.length < 2) hasAdditional = false
-        })
-        return hasAdditional
-      }
-      const notSourceAsDistributed = (context: NagContext) =>
-        context.project.project_type === 'mod' || context.project.project_type === 'plugin'
-
-      return (
-        isGplLicense &&
-        notSourceAsDistributed(context) &&
-        !hasSourceUrl &&
-        !hasAdditionalFiles(context)
-      )
-    },
-    link: {
-      path: 'settings/links',
-      title: defineMessage({
-        id: 'nags.visit-links-settings.title',
-        defaultMessage: 'Visit links settings',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-links',
-    },
-  },
-]

packages/moderation/data/nags/tags.ts

@@ -1,160 +0,0 @@
-import type { Project } from '@modrinth/utils'
-import type { Nag, NagContext } from '../../types/nags'
-import { useVIntl, defineMessage } from '@vintl/vintl'
-
-const allResolutionTags = ['8x-', '16x', '32x', '48x', '64x', '128x', '256x', '512x+']
-
-const MAX_TAG_COUNT = 8
-
-function getCategories(
-  project: Project & { actualProjectType: string },
-  tags: {
-    categories?: {
-      project_type: string
-    }[]
-  },
-) {
-  return (
-    tags.categories?.filter(
-      (category: { project_type: string }) => category.project_type === project.actualProjectType,
-    ) ?? []
-  )
-}
-
-export const tagsNags: Nag[] = [
-  {
-    id: 'too-many-tags',
-    title: defineMessage({
-      id: 'nags.too-many-tags.title',
-      defaultMessage: 'Select accurate tags',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const tagCount =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      const maxTagCount = MAX_TAG_COUNT
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.too-many-tags.description',
-          defaultMessage:
-            "You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results.",
-        }),
-        {
-          tagCount,
-          maxTagCount,
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      const tagCount =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      return tagCount > MAX_TAG_COUNT
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'multiple-resolution-tags',
-    title: defineMessage({
-      id: 'nags.multiple-resolution-tags.title',
-      defaultMessage: 'Select correct resolution',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const resolutionTags = context.project.categories
-        .concat(context.project.additional_categories)
-        .filter((tag: string) => allResolutionTags.includes(tag))
-
-      const sortedTags = resolutionTags.toSorted((a, b) => {
-        return allResolutionTags.indexOf(a) - allResolutionTags.indexOf(b)
-      })
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.multiple-resolution-tags.description',
-          defaultMessage:
-            "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution.",
-        }),
-        {
-          count: resolutionTags.length,
-          tags: sortedTags
-            .join(', ')
-            .replace('8x-', '8x or lower')
-            .replace('512x+', '512x or higher'),
-        },
-      )
-    },
-    status: 'warning',
-    shouldShow: (context: NagContext) => {
-      if (context.project.project_type !== 'resourcepack') return false
-
-      const resolutionTags = context.project.categories
-        .concat(context.project.additional_categories)
-        .filter((tag: string) => allResolutionTags.includes(tag))
-      return resolutionTags.length > 1
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-  {
-    id: 'all-tags-selected',
-    title: defineMessage({
-      id: 'nags.all-tags-selected.title',
-      defaultMessage: 'Select accurate tags',
-    }),
-    description: (context: NagContext) => {
-      const { formatMessage } = useVIntl()
-      const categoriesForProjectType = getCategories(
-        context.project as Project & { actualProjectType: string },
-        context.tags,
-      )
-      const totalAvailableTags = categoriesForProjectType.length
-
-      return formatMessage(
-        defineMessage({
-          id: 'nags.all-tags-selected.description',
-          defaultMessage:
-            "You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project.",
-        }),
-        {
-          totalAvailableTags,
-        },
-      )
-    },
-    status: 'required',
-    shouldShow: (context: NagContext) => {
-      const categoriesForProjectType = getCategories(
-        context.project as Project & { actualProjectType: string },
-        context.tags,
-      )
-      const totalSelectedTags =
-        context.project.categories.length + (context.project.additional_categories?.length || 0)
-      return (
-        totalSelectedTags === categoriesForProjectType.length &&
-        context.project.project_type !== 'project'
-      )
-    },
-    link: {
-      path: 'settings/tags',
-      title: defineMessage({
-        id: 'nags.edit-tags.title',
-        defaultMessage: 'Edit tags',
-      }),
-      shouldShow: (context: NagContext) => context.currentRoute !== 'type-id-settings-tags',
-    },
-  },
-]

packages/moderation/index.ts

@@ -2,12 +2,9 @@ export * from './types/actions'
 export * from './types/messages'
 export * from './types/stage'
 export * from './types/keybinds'
-export * from './types/nags'
 export * from './types/reports'
 export * from './utils'
 
-export * from './data/nags/index'
-export { default as nags } from './data/nags'
 export { finalPermissionMessages } from './data/modpack-permissions-stage'
 export { default as checklist } from './data/checklist'
 export { default as keybinds } from './data/keybinds'

packages/moderation/locales/en-US/index.json

@@ -1,203 +0,0 @@
-{
-  "nags.add-description.description": {
-    "defaultMessage": "A description that clearly describes the project's purpose and function is required."
-  },
-  "nags.add-description.title": {
-    "defaultMessage": "Add a description"
-  },
-  "nags.add-icon.description": {
-    "defaultMessage": "Adding a unique, relevant, and engaging icon makes your project identifiable and helps it stand out."
-  },
-  "nags.add-icon.title": {
-    "defaultMessage": "Add an icon"
-  },
-  "nags.add-links.description": {
-    "defaultMessage": "Add any relevant links targeted outside of Modrinth, such as source code, an issue tracker, or a Discord invite."
-  },
-  "nags.add-links.title": {
-    "defaultMessage": "Add external links"
-  },
-  "nags.all-tags-selected.description": {
-    "defaultMessage": "You've selected all {totalAvailableTags} available tags. This defeats the purpose of tags, which are meant to help users find relevant projects. Please select only the tags that are relevant to your project."
-  },
-  "nags.all-tags-selected.title": {
-    "defaultMessage": "Select accurate tags"
-  },
-  "nags.description-too-short.description": {
-    "defaultMessage": "Your description is {length} readable characters. At least {minChars} characters is recommended to create a clear and informative description."
-  },
-  "nags.description-too-short.title": {
-    "defaultMessage": "Expand the description"
-  },
-  "nags.edit-description.title": {
-    "defaultMessage": "Edit description"
-  },
-  "nags.edit-license.title": {
-    "defaultMessage": "Edit license"
-  },
-  "nags.edit-summary.title": {
-    "defaultMessage": "Edit summary"
-  },
-  "nags.edit-tags.title": {
-    "defaultMessage": "Edit tags"
-  },
-  "nags.edit-title.title": {
-    "defaultMessage": "Edit title"
-  },
-  "nags.feature-gallery-image.description": {
-    "defaultMessage": "The featured gallery image is often how your project makes its first impression."
-  },
-  "nags.feature-gallery-image.title": {
-    "defaultMessage": "Feature a gallery image"
-  },
-  "nags.gallery.title": {
-    "defaultMessage": "Visit gallery page"
-  },
-  "nags.gpl-license-source-required.description": {
-    "defaultMessage": "Your {projectType} uses a license which requires source code to be available. Please provide a source code link or sources file for each additional version, or consider using a different license."
-  },
-  "nags.gpl-license-source-required.title": {
-    "defaultMessage": "Provide source code"
-  },
-  "nags.image-heavy-description.description": {
-    "defaultMessage": "Your Description should contain sufficient plain text or image alt-text, keeping it accessible to those using screen readers or with slow internet connections."
-  },
-  "nags.image-heavy-description.title": {
-    "defaultMessage": "Ensure accessibility"
-  },
-  "nags.invalid-license-url.description.default": {
-    "defaultMessage": "License URL is invalid."
-  },
-  "nags.invalid-license-url.description.domain": {
-    "defaultMessage": "Your license URL points to {domain}, which is not appropriate for license information. License URLs should link directly to your license file, not social media, gaming platforms, etc."
-  },
-  "nags.invalid-license-url.description.malformed": {
-    "defaultMessage": "Your license URL appears to be malformed. Please provide a valid URL to your license text."
-  },
-  "nags.invalid-license-url.title": {
-    "defaultMessage": "Add a valid license link"
-  },
-  "nags.link-shortener-usage.description": {
-    "defaultMessage": "Use of link shorteners or other methods to obscure where a link may lead in your external links or license link is prohibited, please only use appropriate full length links."
-  },
-  "nags.link-shortener-usage.title": {
-    "defaultMessage": "Don't use link shorteners"
-  },
-  "nags.long-headers.description": {
-    "defaultMessage": "{count, plural, one {# header} other {# headers}} in your description {count, plural, one {is} other {are}} too long. Headers should be concise and act as section titles, not full sentences."
-  },
-  "nags.long-headers.title": {
-    "defaultMessage": "Shorten headers"
-  },
-  "nags.minecraft-title-clause.description": {
-    "defaultMessage": "Projects must not use Minecraft's branding or include \"Minecraft\" as a significant part of the name."
-  },
-  "nags.minecraft-title-clause.title": {
-    "defaultMessage": "Avoid brand infringement"
-  },
-  "nags.missing-alt-text.description": {
-    "defaultMessage": "Some of your images are missing alt text, which is important for accessibility, especially for visually impaired users."
-  },
-  "nags.missing-alt-text.title": {
-    "defaultMessage": "Add image alt text"
-  },
-  "nags.misused-discord-link-description": {
-    "defaultMessage": "Discord invites can not be used for other link types. Please put your Discord link in the Discord Invite link field only."
-  },
-  "nags.misused-discord-link.title": {
-    "defaultMessage": "Move Discord invite"
-  },
-  "nags.moderation.title": {
-    "defaultMessage": "Visit moderation thread"
-  },
-  "nags.moderator-feedback.description": {
-    "defaultMessage": "Review and address all concerns from the moderation team before resubmitting."
-  },
-  "nags.moderator-feedback.title": {
-    "defaultMessage": "Review moderator feedback"
-  },
-  "nags.multiple-resolution-tags.description": {
-    "defaultMessage": "You've selected {count} resolution tags ({tags}). Resource packs should typically only have one resolution tag that matches their primary resolution."
-  },
-  "nags.multiple-resolution-tags.title": {
-    "defaultMessage": "Select correct resolution"
-  },
-  "nags.select-environments.description": {
-    "defaultMessage": "Select if the {projectType} functions on the client-side and/or server-side."
-  },
-  "nags.select-environments.title": {
-    "defaultMessage": "Select supported environments"
-  },
-  "nags.select-license.description": {
-    "defaultMessage": "Select the license your {projectType} is distributed under."
-  },
-  "nags.select-license.title": {
-    "defaultMessage": "Select a license"
-  },
-  "nags.select-tags.description": {
-    "defaultMessage": "Select the tags that correctly apply to your project to help the right users find it."
-  },
-  "nags.select-tags.title": {
-    "defaultMessage": "Select tags"
-  },
-  "nags.settings.description.title": {
-    "defaultMessage": "Visit description settings"
-  },
-  "nags.settings.environments.title": {
-    "defaultMessage": "Visit general settings"
-  },
-  "nags.settings.license.title": {
-    "defaultMessage": "Visit license settings"
-  },
-  "nags.settings.links.title": {
-    "defaultMessage": "Visit links settings"
-  },
-  "nags.settings.tags.title": {
-    "defaultMessage": "Visit tag settings"
-  },
-  "nags.settings.title": {
-    "defaultMessage": "Visit general settings"
-  },
-  "nags.summary-same-as-title.description": {
-    "defaultMessage": "Your summary can not be the same as your project's Name. It's important to create an informative and enticing Summary."
-  },
-  "nags.summary-same-as-title.title": {
-    "defaultMessage": "Make the summary unique"
-  },
-  "nags.summary-too-short.description": {
-    "defaultMessage": "Your summary is {length} characters. At least {minChars} characters is recommended to create an informative and enticing summary."
-  },
-  "nags.summary-too-short.title": {
-    "defaultMessage": "Expand the summary"
-  },
-  "nags.title-contains-technical-info.description": {
-    "defaultMessage": "Keeping your project's Name clean and makes it memorable easier to find. Version and loader information is automatically displayed alongside your project."
-  },
-  "nags.title-contains-technical-info.title": {
-    "defaultMessage": "Clean up the name"
-  },
-  "nags.too-many-tags.description": {
-    "defaultMessage": "You've selected {tagCount} tags. Consider reducing to {maxTagCount} or fewer to make sure your project appears in relevant search results."
-  },
-  "nags.too-many-tags.title": {
-    "defaultMessage": "Select accurate tags"
-  },
-  "nags.upload-version.description": {
-    "defaultMessage": "At least one version is required for a project to be submitted for review."
-  },
-  "nags.upload-version.title": {
-    "defaultMessage": "Upload a version"
-  },
-  "nags.verify-external-links.description": {
-    "defaultMessage": "Some of your external links may be using domains that are inappropriate for that type of link."
-  },
-  "nags.verify-external-links.title": {
-    "defaultMessage": "Verify external links"
-  },
-  "nags.versions.title": {
-    "defaultMessage": "Visit versions page"
-  },
-  "nags.visit-links-settings.title": {
-    "defaultMessage": "Visit links settings"
-  }
-}

packages/moderation/package.json

@@ -6,17 +6,14 @@
   "types": "./index.d.ts",
   "scripts": {
     "lint": "eslint . && prettier --check .",
-    "fix": "eslint . --fix && prettier --write . && pnpm run intl:extract",
-    "intl:extract": "formatjs extract \"**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" --ignore \"**/*.d.ts\" --ignore \"node_modules/**/*\" --out-file locales/en-US/index.json --preserve-whitespace"
+    "fix": "eslint . --fix && prettier --write ."
   },
   "dependencies": {
-    "@modrinth/assets": "workspace:*",
     "@modrinth/utils": "workspace:*",
+    "@modrinth/assets": "workspace:*",
     "vue": "^3.5.13"
   },
   "devDependencies": {
-    "@formatjs/cli": "^6.2.12",
-    "@vintl/vintl": "^4.4.1",
     "eslint": "^8.57.0",
     "eslint-config-custom": "workspace:*",
     "tsconfig": "workspace:*"

packages/moderation/types/nags.ts

@@ -1,96 +0,0 @@
-import type { Project, User, Version } from '@modrinth/utils'
-import type { MessageDescriptor } from '@vintl/vintl'
-import type { FunctionalComponent, SVGAttributes } from 'vue'
-
-/**
- * Type which represents the status type of a nag.
- *
- * - `required` indicates that the nag must be addressed.
- * - `warning` indicates that the nag is important but not critical, and can be ignored. It is often used for issues that should be resolved but do not block project submission.
- * - `suggestion` indicates that the nag is a recommendation and can be ignored.
- */
-export type NagStatus = 'required' | 'warning' | 'suggestion' | 'special-submit-action'
-
-/**
- * Interface representing the context in which a nag is displayed.
- * It includes the project, versions, current member, all members, and the current route.
- * This context is used to determine whether a nag or it's link should be shown and how it should be presented.
- */
-export interface NagContext {
-  /**
-   * The project associated with the nag.
-   */
-  project: Project
-  /**
-   * The versions associated with the project.
-   */
-  versions: Version[]
-  /**
-   * The current project member viewing the nag.
-   */
-  currentMember: User
-  /**
-   * The current route in the application.
-   */
-  currentRoute: string
-  /* eslint-disable @typescript-eslint/no-explicit-any */
-  tags: any
-  submitProject: (...any: any) => any
-  /* eslint-enable @typescript-eslint/no-explicit-any */
-}
-
-/**
- * Interface representing a nag's link.
- */
-export interface NagLink {
-  /**
-   * A relative path to the nag's link, e.g. '/settings'.
-   */
-  path: string
-  /**
-   * The text to display for the nag's link.
-   */
-  title: MessageDescriptor | string
-  /**
-   * The status of the nag, which can be 'required', 'warning', or 'suggestion'.
-   */
-  shouldShow?: (context: NagContext) => boolean
-}
-
-/**
- * Interface representing a nag.
- */
-export interface Nag {
-  /**
-   * A unique identifier for the nag.
-   */
-  id: string
-  /**
-   * The title of the nag.
-   */
-  title: MessageDescriptor | string
-  /**
-   * A function that returns the description of the nag.
-   * It can accept a context to provide dynamic descriptions.
-   */
-  description: MessageDescriptor | ((context: NagContext) => string)
-  /**
-   * The status of the nag, which can be 'required', 'warning', or 'suggestion'.
-   */
-  status: NagStatus
-  /**
-   * An optional icon for the nag, usually from `@modrinth/assets`.
-   * If not specified it will use the default icon associated with the nag status.
-   */
-  icon?: FunctionalComponent<SVGAttributes>
-
-  /**
-   * A function that determines whether the nag should be shown based on the context.
-   */
-  shouldShow: (context: NagContext) => boolean
-  /**
-   * An optional link associated with the nag.
-   * If provided, it should be displayed alongside the nag.
-   */
-  link?: NagLink
-}

packages/utils/types.ts

@@ -18,14 +18,7 @@ export type DonationPlatform =
   | { short: 'ko-fi'; name: 'Ko-fi' }
   | { short: 'other'; name: 'Other' }
 
-export type ProjectType =
-  | 'mod'
-  | 'modpack'
-  | 'resourcepack'
-  | 'shader'
-  | 'plugin'
-  | 'datapack'
-  | 'project'
+export type ProjectType = 'mod' | 'modpack' | 'resourcepack' | 'shader' | 'plugin' | 'datapack'
 export type MonetizationStatus = 'monetized' | 'demonetized' | 'force-demonetized'
 
 export type GameVersion = string
@@ -77,10 +70,10 @@ export interface Project {
   thread_id: ModrinthId
   organization: ModrinthId
 
-  issues_url: string | null
-  source_url: string | null
-  wiki_url: string | null
-  discord_url: string | null
+  issues_url?: string
+  source_url?: string
+  wiki_url?: string
+  discord_url?: string
   donation_urls: DonationLink<DonationPlatform>[]
 
   published: string

pnpm-lock.yaml

@@ -479,12 +479,6 @@ importers:
         specifier: ^3.5.13
         version: 3.5.13(typescript@5.8.3)
     devDependencies:
-      '@formatjs/cli':
-        specifier: ^6.2.12
-        version: 6.2.12(@vue/compiler-core@3.5.13)(vue@3.5.13(typescript@5.8.3))
-      '@vintl/vintl':
-        specifier: ^4.4.1
-        version: 4.4.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3))
       eslint:
         specifier: ^8.57.0
         version: 8.57.0
@@ -4178,8 +4172,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  electron-to-chromium@1.5.182:
-    resolution: {integrity: sha512-Lv65Btwv9W4J9pyODI6EWpdnhfvrve/us5h1WspW8B2Fb0366REPtY3hX7ounk1CkV/TBjWCEvCBBbYbmV0qCA==}
+  electron-to-chromium@1.5.191:
+    resolution: {integrity: sha512-xcwe9ELcuxYLUFqZZxL19Z6HVKcvNkIwhbHUz7L3us6u12yR+7uY89dSl570f/IqNthx8dAw3tojG7i4Ni4tDA==}
 
   electron-to-chromium@1.5.71:
     resolution: {integrity: sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==}
@@ -8969,10 +8963,6 @@ snapshots:
     dependencies:
       vue: 3.5.13(typescript@5.5.4)
 
-  '@braw/async-computed@5.0.2(vue@3.5.13(typescript@5.8.3))':
-    dependencies:
-      vue: 3.5.13(typescript@5.8.3)
-
   '@cloudflare/kv-asset-handler@0.3.4':
     dependencies:
       mime: 3.0.0
@@ -9500,11 +9490,6 @@ snapshots:
       '@vue/compiler-core': 3.5.13
       vue: 3.5.13(typescript@5.5.4)
 
-  '@formatjs/cli@6.2.12(@vue/compiler-core@3.5.13)(vue@3.5.13(typescript@5.8.3))':
-    optionalDependencies:
-      '@vue/compiler-core': 3.5.13
-      vue: 3.5.13(typescript@5.8.3)
-
   '@formatjs/ecma402-abstract@1.18.3':
     dependencies:
       '@formatjs/intl-localematcher': 0.5.4
@@ -9562,18 +9547,6 @@ snapshots:
     optionalDependencies:
       typescript: 5.5.4
 
-  '@formatjs/intl@2.10.4(typescript@5.8.3)':
-    dependencies:
-      '@formatjs/ecma402-abstract': 2.0.0
-      '@formatjs/fast-memoize': 2.2.0
-      '@formatjs/icu-messageformat-parser': 2.7.8
-      '@formatjs/intl-displaynames': 6.6.8
-      '@formatjs/intl-listformat': 7.5.7
-      intl-messageformat: 10.5.14
-      tslib: 2.6.3
-    optionalDependencies:
-      typescript: 5.8.3
-
   '@formatjs/ts-transformer@3.13.14':
     dependencies:
       '@formatjs/icu-messageformat-parser': 2.7.8
@@ -11261,17 +11234,6 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vintl/vintl@4.4.1(typescript@5.8.3)(vue@3.5.13(typescript@5.8.3))':
-    dependencies:
-      '@braw/async-computed': 5.0.2(vue@3.5.13(typescript@5.8.3))
-      '@formatjs/icu-messageformat-parser': 2.7.8
-      '@formatjs/intl': 2.10.4(typescript@5.8.3)
-      '@formatjs/intl-localematcher': 0.4.2
-      intl-messageformat: 10.5.14
-      vue: 3.5.13(typescript@5.8.3)
-    transitivePeerDependencies:
-      - typescript
-
   '@vitejs/plugin-vue-jsx@4.1.1(vite@5.4.11(@types/node@20.14.11)(sass@1.77.6)(terser@5.43.1))(vue@3.5.13(typescript@5.5.4))':
     dependencies:
       '@babel/core': 7.26.0
@@ -12077,7 +12039,7 @@ snapshots:
   browserslist@4.25.1:
     dependencies:
       caniuse-lite: 1.0.30001727
-      electron-to-chromium: 1.5.182
+      electron-to-chromium: 1.5.191
       node-releases: 2.0.19
       update-browserslist-db: 1.1.3(browserslist@4.25.1)
     optional: true
@@ -12655,7 +12617,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  electron-to-chromium@1.5.182:
+  electron-to-chromium@1.5.191:
     optional: true
 
   electron-to-chromium@1.5.71: {}
@@ -17414,7 +17376,7 @@ snapshots:
       magic-string: 0.30.17
       mlly: 1.7.4
       pathe: 2.0.3
-      picomatch: 4.0.2
+      picomatch: 4.0.3
       pkg-types: 2.2.0
       scule: 1.3.0
       strip-literal: 3.0.0

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.88.0"
+channel = "1.89.0"