-
-
+
+
{{ row.label }}
-
-
@@ -27,36 +25,49 @@
-
-
-
-
Selected
Not signed in
-
-
+export type ColorTheme = (typeof THEME_OPTIONS)[number]
+
+export type ThemeStore = {
+ selectedTheme: ColorTheme
+ advancedRendering: boolean
+ toggleSidebar: boolean
+
+ devMode: boolean
+ featureFlags: FeatureFlags
+}
+
+export const DEFAULT_THEME_STORE: ThemeStore = {
+ selectedTheme: 'dark',
+ advancedRendering: true,
+ toggleSidebar: false,
+
+ devMode: false,
+ featureFlags: DEFAULT_FEATURE_FLAGS,
+}
+
+export const useTheming = defineStore('themeStore', {
+ state: () => DEFAULT_THEME_STORE,
+ actions: {
+ setThemeState(newTheme: ColorTheme) {
+ if (THEME_OPTIONS.includes(newTheme)) {
+ this.selectedTheme = newTheme
+ } else {
+ console.warn('Selected theme is not present. Check themeOptions.')
+ }
+
+ this.setThemeClass()
+ },
+ setThemeClass() {
+ for (const theme of THEME_OPTIONS) {
+ document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
+ }
+
+ let theme = this.selectedTheme
+ if (this.selectedTheme === 'system') {
+ const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
+ if (darkThemeMq.matches) {
+ theme = 'dark'
+ } else {
+ theme = 'light'
+ }
+ }
+
+ document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
+ },
+ getFeatureFlag(key: FeatureFlag) {
+ return this.featureFlags[key] ?? DEFAULT_FEATURE_FLAGS[key]
+ },
+ getThemeOptions() {
+ return THEME_OPTIONS
+ },
+ },
+})
diff --git a/apps/app-frontend/tailwind.config.js b/apps/app-frontend/tailwind.config.js
index 0d0fab4bf..b5196b368 100644
--- a/apps/app-frontend/tailwind.config.js
+++ b/apps/app-frontend/tailwind.config.js
@@ -41,6 +41,7 @@ export default {
green: 'var(--color-green-highlight)',
blue: 'var(--color-blue-highlight)',
purple: 'var(--color-purple-highlight)',
+ gray: 'var(--color-gray-highlight)',
},
divider: {
DEFAULT: 'var(--color-divider)',
diff --git a/apps/app-frontend/tsconfig.node.json b/apps/app-frontend/tsconfig.node.json
index e5a932a9e..ac300be84 100644
--- a/apps/app-frontend/tsconfig.node.json
+++ b/apps/app-frontend/tsconfig.node.json
@@ -10,6 +10,7 @@
"isolatedModules": true,
"moduleDetection": "force",
"noEmit": true,
+ "resolveJsonModule": true,
"strict": true
},
diff --git a/apps/app-frontend/vite.config.ts b/apps/app-frontend/vite.config.ts
index 3f88715a9..8adf5fb2d 100644
--- a/apps/app-frontend/vite.config.ts
+++ b/apps/app-frontend/vite.config.ts
@@ -4,6 +4,8 @@ import svgLoader from 'vite-svg-loader'
import vue from '@vitejs/plugin-vue'
+import tauriConf from '../app/tauri.conf.json'
+
const projectRootDir = resolve(__dirname)
// https://vitejs.dev/config/
@@ -41,17 +43,32 @@ export default defineConfig({
server: {
port: 1420,
strictPort: true,
+ headers: {
+ 'content-security-policy': Object.entries(tauriConf.app.security.csp)
+ .map(([directive, sources]) => {
+ // An additional websocket connect-src is required for Vite dev tools to work
+ if (directive === 'connect-src') {
+ sources = Array.isArray(sources) ? sources : [sources]
+ sources.push('ws://localhost:1420')
+ }
+
+ return Array.isArray(sources)
+ ? `${directive} ${sources.join(' ')}`
+ : `${directive} ${sources}`
+ })
+ .join('; '),
+ },
},
// to make use of `TAURI_ENV_DEBUG` and other env variables
// https://v2.tauri.app/reference/environment-variables/#tauri-cli-hook-commands
envPrefix: ['VITE_', 'TAURI_'],
build: {
// Tauri supports es2021
- target: process.env.TAURI_PLATFORM == 'windows' ? 'chrome105' : 'safari13', // eslint-disable-line turbo/no-undeclared-env-vars
+ target: process.env.TAURI_ENV_PLATFORM == 'windows' ? 'chrome105' : 'safari13', // eslint-disable-line turbo/no-undeclared-env-vars
// don't minify for debug builds
- minify: !process.env.TAURI_DEBUG ? 'esbuild' : false, // eslint-disable-line turbo/no-undeclared-env-vars
+ minify: !process.env.TAURI_ENV_DEBUG ? 'esbuild' : false, // eslint-disable-line turbo/no-undeclared-env-vars
// produce sourcemaps for debug builds
- sourcemap: !!process.env.TAURI_DEBUG, // eslint-disable-line turbo/no-undeclared-env-vars
+ sourcemap: !!process.env.TAURI_ENV_DEBUG, // eslint-disable-line turbo/no-undeclared-env-vars
commonjsOptions: {
esmExternals: true,
},
diff --git a/apps/app-playground/Cargo.toml b/apps/app-playground/Cargo.toml
index a37251612..691c9d3b7 100644
--- a/apps/app-playground/Cargo.toml
+++ b/apps/app-playground/Cargo.toml
@@ -1,24 +1,14 @@
[package]
name = "theseus_playground"
version = "0.0.0"
-edition = "2021"
+edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-theseus = { path = "../../packages/app-lib", features = ["cli"] }
+theseus = { workspace = true, features = ["cli"] }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+enumset.workspace = true
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tokio = { version = "1", features = ["full"] }
-thiserror = "1.0"
-url = "2.2"
-webbrowser = "0.8.13"
-dunce = "1.0.3"
-
-futures = "0.3"
-uuid = { version = "1.1", features = ["serde", "v4"] }
-
-tracing = "0.1.37"
-tracing-subscriber = "0.3.18"
-tracing-error = "0.2.0"
+[lints]
+workspace = true
diff --git a/apps/app-playground/package.json b/apps/app-playground/package.json
index 0d76eaed8..342b3cecb 100644
--- a/apps/app-playground/package.json
+++ b/apps/app-playground/package.json
@@ -2,9 +2,9 @@
"name": "@modrinth/app-playground",
"scripts": {
"build": "cargo build --release",
- "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
- "fix": "cargo fmt && cargo clippy --fix",
+ "lint": "cargo fmt --check && cargo clippy --all-targets",
+ "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
"dev": "cargo run",
- "test": "cargo test"
+ "test": "cargo nextest run --all-targets --no-fail-fast"
}
}
diff --git a/apps/app-playground/src/main.rs b/apps/app-playground/src/main.rs
index f8d943938..a2c2b8922 100644
--- a/apps/app-playground/src/main.rs
+++ b/apps/app-playground/src/main.rs
@@ -3,9 +3,9 @@
windows_subsystem = "windows"
)]
-use std::time::Duration;
+use enumset::EnumSet;
use theseus::prelude::*;
-use tokio::signal::ctrl_c;
+use theseus::worlds::get_recent_worlds;
// A simple Rust implementation of the authentication run
// 1) call the authenticate_begin_flow() function to get the URL to open (like you would in the frontend)
@@ -15,8 +15,7 @@ pub async fn authenticate_run() -> theseus::Result {
println!("A browser window will now open, follow the login flow there.");
let login = minecraft_auth::begin_login().await?;
- println!("URL {}", login.redirect_uri.as_str());
- webbrowser::open(login.redirect_uri.as_str())?;
+ println!("Open URL {} in a browser", login.redirect_uri.as_str());
println!("Please enter URL code: ");
let mut input = String::new();
@@ -28,7 +27,10 @@ pub async fn authenticate_run() -> theseus::Result {
let credentials = minecraft_auth::finish_login(&input, login).await?;
- println!("Logged in user {}.", credentials.username);
+ println!(
+ "Logged in user {}.",
+ credentials.maybe_online_profile().await.name
+ );
Ok(credentials)
}
@@ -41,21 +43,16 @@ async fn main() -> theseus::Result<()> {
// Initialize state
State::init().await?;
- loop {
- if State::get().await?.friends_socket.is_connected().await {
- break;
- }
- tokio::time::sleep(Duration::from_millis(500)).await;
+ let worlds = get_recent_worlds(4, EnumSet::all()).await?;
+ for world in worlds {
+ println!(
+ "World: {:?}/{:?} played at {:?}: {:#?}",
+ world.profile,
+ world.world.name,
+ world.world.last_played,
+ world.world.details
+ );
}
- tracing::info!("Starting host");
-
- let socket = State::get().await?.friends_socket.open_port(25565).await?;
- tracing::info!("Running host on socket {}", socket.socket_id());
-
- ctrl_c().await?;
- tracing::info!("Stopping host");
- socket.shutdown().await?;
-
Ok(())
}
diff --git a/apps/app/.gitignore b/apps/app/.gitignore
index d887d6c0b..f73fca36c 100644
--- a/apps/app/.gitignore
+++ b/apps/app/.gitignore
@@ -1,6 +1,2 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
-
# Generated by tauri, metadata generated at compile time
/gen/
diff --git a/apps/app/Cargo.toml b/apps/app/Cargo.toml
index 0e3bc20b3..d1c67affc 100644
--- a/apps/app/Cargo.toml
+++ b/apps/app/Cargo.toml
@@ -1,66 +1,52 @@
[package]
name = "theseus_gui"
-version = "0.9.3"
+version = "1.0.0-local" # The actual version is set by the theseus-build workflow on tagging
description = "The Modrinth App is a desktop application for managing your Minecraft mods"
license = "GPL-3.0-only"
repository = "https://github.com/modrinth/code/apps/app/"
-edition = "2021"
-build = "build.rs"
+edition.workspace = true
[build-dependencies]
-tauri-build = { version = "2.0.3", features = ["codegen"] }
+tauri-build = { workspace = true, features = ["codegen"] }
[dependencies]
-theseus = { path = "../../packages/app-lib", features = ["tauri"] }
+theseus = { workspace = true, features = ["tauri"] }
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-serde_with = "3.0.0"
+serde_json.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_with.workspace = true
-tauri = { version = "2.1.1", features = ["devtools", "macos-private-api", "protocol-asset", "unstable"] }
-tauri-plugin-window-state = "2.2.0"
-tauri-plugin-deep-link = "2.2.0"
-tauri-plugin-os = "2.2.0"
-tauri-plugin-opener = "2.2.1"
-tauri-plugin-dialog = "2.2.0"
-tauri-plugin-updater = { version = "2.3.0" }
-tauri-plugin-single-instance = { version = "2.2.0" }
+tauri = { workspace = true, features = ["devtools", "macos-private-api", "protocol-asset"] }
+tauri-plugin-deep-link.workspace = true
+tauri-plugin-dialog.workspace = true
+tauri-plugin-http.workspace = true
+tauri-plugin-opener.workspace = true
+tauri-plugin-os.workspace = true
+tauri-plugin-single-instance.workspace = true
+tauri-plugin-updater.workspace = true
+tauri-plugin-window-state.workspace = true
-tokio = { version = "1", features = ["full"] }
-thiserror = "1.0"
-futures = "0.3"
-daedalus = { path = "../../packages/daedalus" }
-chrono = "0.4.26"
+tokio = { workspace = true, features = ["time"] }
+thiserror.workspace = true
+daedalus.workspace = true
+chrono.workspace = true
+either.workspace = true
-dirs = "5.0.1"
+url.workspace = true
+urlencoding.workspace = true
+uuid = { workspace = true, features = ["serde", "v4"] }
-url = "2.2"
-uuid = { version = "1.1", features = ["serde", "v4"] }
-os_info = "3.7.0"
+tracing.workspace = true
+tracing-error.workspace = true
-tracing = "0.1.37"
-tracing-error = "0.2.0"
+dashmap.workspace = true
+paste.workspace = true
+enumset = { workspace = true, features = ["serde"] }
-lazy_static = "1"
-once_cell = "1"
-
-dashmap = "6.0.1"
-paste = "1.0.15"
-
-opener = { version = "0.7.2", features = ["reveal", "dbus-vendored"] }
-
-native-dialog = "0.7.0"
-
-[target.'cfg(not(target_os = "linux"))'.dependencies]
-window-shadows = "0.2.1"
-
-[target.'cfg(target_os = "macos")'.dependencies]
-cocoa = "0.25.0"
-objc = "0.2.7"
-rand = "0.8.5"
+native-dialog.workspace = true
[target.'cfg(target_os = "linux")'.dependencies]
-tauri-plugin-updater = { version = "2.3.0", optional = true, features = ["native-tls-vendored", "zip"], default-features = false }
+tauri-plugin-updater = { workspace = true, optional = true }
[features]
# by default Tauri runs in production mode
@@ -70,3 +56,6 @@ default = ["custom-protocol"]
# DO NOT remove this
custom-protocol = ["tauri/custom-protocol"]
updater = []
+
+[lints]
+workspace = true
diff --git a/apps/app/Info.plist b/apps/app/Info.plist
index a3069984e..18e7a26a4 100644
--- a/apps/app/Info.plist
+++ b/apps/app/Info.plist
@@ -18,5 +18,25 @@
A Minecraft mod wants to access your camera.
NSMicrophoneUsageDescription
A Minecraft mod wants to access your microphone.
+ NSAppTransportSecurity
+
+ NSExceptionDomains
+
+ asset.localhost
+
+ NSExceptionAllowsInsecureHTTPLoads
+ NSIncludesSubdomains
+
+ textures.minecraft.net
+
+ NSExceptionAllowsInsecureHTTPLoads
+ NSIncludesSubdomains
+
+
+
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 3c00b6d8f..59f78131a 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -100,6 +100,24 @@ fn main() {
DefaultPermissionRule::AllowAllCommands,
),
)
+ .plugin(
+ "minecraft-skins",
+ InlinedPlugin::new()
+ .commands(&[
+ "get_available_capes",
+ "get_available_skins",
+ "add_and_equip_custom_skin",
+ "set_default_cape",
+ "equip_skin",
+ "remove_custom_skin",
+ "unequip_skin",
+ "normalize_skin_texture",
+ "get_dragged_skin_data",
+ ])
+ .default_permission(
+ DefaultPermissionRule::AllowAllCommands,
+ ),
+ )
.plugin(
"mr-auth",
InlinedPlugin::new()
@@ -152,7 +170,6 @@ fn main() {
"profile_update_managed_modrinth_version",
"profile_repair_managed_modrinth",
"profile_run",
- "profile_run_credentials",
"profile_kill",
"profile_edit",
"profile_edit_icon",
@@ -226,6 +243,30 @@ fn main() {
.default_permission(
DefaultPermissionRule::AllowAllCommands,
),
+ )
+ .plugin(
+ "worlds",
+ InlinedPlugin::new()
+ .commands(&[
+ "get_recent_worlds",
+ "get_profile_worlds",
+ "get_singleplayer_world",
+ "set_world_display_status",
+ "rename_world",
+ "reset_world_icon",
+ "backup_world",
+ "delete_world",
+ "add_server_to_profile",
+ "edit_server_in_profile",
+ "remove_server_from_profile",
+ "get_profile_protocol_version",
+ "get_server_status",
+ "start_join_singleplayer_world",
+ "start_join_server",
+ ])
+ .default_permission(
+ DefaultPermissionRule::AllowAllCommands,
+ ),
),
)
.expect("Failed to run tauri-build");
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 6c53b8e3d..c78dd9716 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -19,12 +19,21 @@
"window-state:default",
"window-state:allow-restore-state",
"window-state:allow-save-window-state",
+
+ {
+ "identifier": "http:default",
+ "allow": [
+ { "url": "https://modrinth.com/*" },
+ { "url": "https://*.modrinth.com/*" }
+ ]
+ },
"auth:default",
"import:default",
"jre:default",
"logs:default",
"metadata:default",
+ "minecraft-skins:default",
"mr-auth:default",
"profile-create:default",
"pack:default",
@@ -34,6 +43,7 @@
"settings:default",
"tags:default",
"utils:default",
- "friends:default"
+ "friends:default",
+ "worlds:default"
]
}
diff --git a/apps/app/package.json b/apps/app/package.json
index 168ac3454..43f017203 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -1,15 +1,15 @@
{
"name": "@modrinth/app",
"scripts": {
- "build": "tauri build",
"tauri": "tauri",
+ "build": "tauri build",
"dev": "tauri dev",
- "test": "cargo test",
- "lint": "cargo fmt --check && cargo clippy --all-targets -- -D warnings",
- "fix": "cargo fmt && cargo clippy --fix"
+ "test": "cargo nextest run --all-targets --no-fail-fast",
+ "lint": "cargo fmt --check && cargo clippy --all-targets",
+ "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt"
},
"devDependencies": {
- "@tauri-apps/cli": "2.1.0"
+ "@tauri-apps/cli": "2.5.0"
},
"dependencies": {
"@modrinth/app-frontend": "workspace:*",
diff --git a/apps/app/src/api/jre.rs b/apps/app/src/api/jre.rs
index 036d5889b..71c72257c 100644
--- a/apps/app/src/api/jre.rs
+++ b/apps/app/src/api/jre.rs
@@ -41,8 +41,8 @@ pub async fn jre_find_filtered_jres(
// Validates JRE at a given path
// Returns None if the path is not a valid JRE
#[tauri::command]
-pub async fn jre_get_jre(path: PathBuf) -> Result> {
- jre::check_jre(path).await.map_err(|e| e.into())
+pub async fn jre_get_jre(path: PathBuf) -> Result {
+ Ok(jre::check_jre(path).await?)
}
// Tests JRE of a certain version
diff --git a/apps/app/src/api/minecraft_skins.rs b/apps/app/src/api/minecraft_skins.rs
new file mode 100644
index 000000000..a6d138fbd
--- /dev/null
+++ b/apps/app/src/api/minecraft_skins.rs
@@ -0,0 +1,104 @@
+use crate::api::Result;
+
+use std::path::Path;
+use theseus::minecraft_skins::{
+ self, Bytes, Cape, MinecraftSkinVariant, Skin, UrlOrBlob,
+};
+
+pub fn init() -> tauri::plugin::TauriPlugin {
+ tauri::plugin::Builder::new("minecraft-skins")
+ .invoke_handler(tauri::generate_handler![
+ get_available_capes,
+ get_available_skins,
+ add_and_equip_custom_skin,
+ set_default_cape,
+ equip_skin,
+ remove_custom_skin,
+ unequip_skin,
+ normalize_skin_texture,
+ get_dragged_skin_data,
+ ])
+ .build()
+}
+
+/// `invoke('plugin:minecraft-skins|get_available_capes')`
+///
+/// See also: [minecraft_skins::get_available_capes]
+#[tauri::command]
+pub async fn get_available_capes() -> Result> {
+ Ok(minecraft_skins::get_available_capes().await?)
+}
+
+/// `invoke('plugin:minecraft-skins|get_available_skins')`
+///
+/// See also: [minecraft_skins::get_available_skins]
+#[tauri::command]
+pub async fn get_available_skins() -> Result> {
+ Ok(minecraft_skins::get_available_skins().await?)
+}
+
+/// `invoke('plugin:minecraft-skins|add_and_equip_custom_skin', texture_blob, variant, cape_override)`
+///
+/// See also: [minecraft_skins::add_and_equip_custom_skin]
+#[tauri::command]
+pub async fn add_and_equip_custom_skin(
+ texture_blob: Bytes,
+ variant: MinecraftSkinVariant,
+ cape_override: Option,
+) -> Result<()> {
+ Ok(minecraft_skins::add_and_equip_custom_skin(
+ texture_blob,
+ variant,
+ cape_override,
+ )
+ .await?)
+}
+
+/// `invoke('plugin:minecraft-skins|set_default_cape', cape)`
+///
+/// See also: [minecraft_skins::set_default_cape]
+#[tauri::command]
+pub async fn set_default_cape(cape: Option) -> Result<()> {
+ Ok(minecraft_skins::set_default_cape(cape).await?)
+}
+
+/// `invoke('plugin:minecraft-skins|equip_skin', skin)`
+///
+/// See also: [minecraft_skins::equip_skin]
+#[tauri::command]
+pub async fn equip_skin(skin: Skin) -> Result<()> {
+ Ok(minecraft_skins::equip_skin(skin).await?)
+}
+
+/// `invoke('plugin:minecraft-skins|remove_custom_skin', skin)`
+///
+/// See also: [minecraft_skins::remove_custom_skin]
+#[tauri::command]
+pub async fn remove_custom_skin(skin: Skin) -> Result<()> {
+ Ok(minecraft_skins::remove_custom_skin(skin).await?)
+}
+
+/// `invoke('plugin:minecraft-skins|unequip_skin')`
+///
+/// See also: [minecraft_skins::unequip_skin]
+#[tauri::command]
+pub async fn unequip_skin() -> Result<()> {
+ Ok(minecraft_skins::unequip_skin().await?)
+}
+
+/// `invoke('plugin:minecraft-skins|normalize_skin_texture')`
+///
+/// See also: [minecraft_skins::normalize_skin_texture]
+#[tauri::command]
+pub async fn normalize_skin_texture(texture: UrlOrBlob) -> Result {
+ Ok(minecraft_skins::normalize_skin_texture(&texture).await?)
+}
+
+/// `invoke('plugin:minecraft-skins|get_dragged_skin_data', path)`
+///
+/// See also: [minecraft_skins::get_dragged_skin_data]
+#[tauri::command]
+pub async fn get_dragged_skin_data(path: String) -> Result {
+ let path = Path::new(&path);
+ Ok(minecraft_skins::get_dragged_skin_data(path).await?)
+}
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index 264b07e88..3ce0dc921 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -7,6 +7,7 @@ pub mod import;
pub mod jre;
pub mod logs;
pub mod metadata;
+pub mod minecraft_skins;
pub mod mr_auth;
pub mod pack;
pub mod process;
@@ -18,6 +19,7 @@ pub mod utils;
pub mod cache;
pub mod friends;
+pub mod worlds;
pub type Result = std::result::Result;
diff --git a/apps/app/src/api/profile.rs b/apps/app/src/api/profile.rs
index 18e3831d3..1d812639e 100644
--- a/apps/app/src/api/profile.rs
+++ b/apps/app/src/api/profile.rs
@@ -4,6 +4,7 @@ use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::path::{Path, PathBuf};
use theseus::prelude::*;
+use theseus::profile::QuickPlayType;
pub fn init() -> tauri::plugin::TauriPlugin {
tauri::plugin::Builder::new("profile")
@@ -27,7 +28,6 @@ pub fn init() -> tauri::plugin::TauriPlugin {
profile_update_managed_modrinth_version,
profile_repair_managed_modrinth,
profile_run,
- profile_run_credentials,
profile_kill,
profile_edit,
profile_edit_icon,
@@ -250,21 +250,7 @@ pub async fn profile_get_pack_export_candidates(
// invoke('plugin:profile|profile_run', path)
#[tauri::command]
pub async fn profile_run(path: &str) -> Result {
- let process = profile::run(path).await?;
-
- Ok(process)
-}
-
-// Run Minecraft using a profile using chosen credentials
-// Returns the UUID, which can be used to poll
-// for the actual Child in the state.
-// invoke('plugin:profile|profile_run_credentials', {path, credentials})')
-#[tauri::command]
-pub async fn profile_run_credentials(
- path: &str,
- credentials: Credentials,
-) -> Result {
- let process = profile::run_credentials(path, &credentials).await?;
+ let process = profile::run(path, &QuickPlayType::None).await?;
Ok(process)
}
@@ -347,6 +333,9 @@ pub async fn profile_edit(path: &str, edit_profile: EditProfile) -> Result<()> {
prof.name = name;
}
if let Some(game_version) = edit_profile.game_version.clone() {
+ if game_version != prof.game_version {
+ prof.protocol_version = None;
+ }
prof.game_version = game_version;
}
if let Some(loader) = edit_profile.loader {
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
index 063c2937b..dfe645096 100644
--- a/apps/app/src/api/utils.rs
+++ b/apps/app/src/api/utils.rs
@@ -1,12 +1,16 @@
use serde::{Deserialize, Serialize};
+use tauri::Runtime;
+use tauri_plugin_opener::OpenerExt;
use theseus::{
handler,
prelude::{CommandPayload, DirectoryInfo},
};
-use crate::api::Result;
+use crate::api::{Result, TheseusSerializableError};
use dashmap::DashMap;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
+use theseus::prelude::canonicalize;
+use url::Url;
pub fn init() -> tauri::plugin::TauriPlugin {
tauri::plugin::Builder::new("utils")
@@ -40,6 +44,7 @@ pub fn get_os() -> OS {
let os = OS::MacOS;
os
}
+
#[derive(Debug, Clone, Serialize, Deserialize)]
#[allow(clippy::enum_variant_names)]
pub enum OS {
@@ -52,57 +57,56 @@ pub enum OS {
// Create a new HashMap with the same keys
// Values provided should not be used directly, as they are not guaranteed to be up-to-date
#[tauri::command]
-pub async fn progress_bars_list(
-) -> Result> {
+pub async fn progress_bars_list()
+-> Result> {
let res = theseus::EventState::list_progress_bars().await?;
Ok(res)
}
-// cfg only on mac os
// disables mouseover and fixes a random crash error only fixed by recent versions of macos
-#[cfg(target_os = "macos")]
#[tauri::command]
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
- let os = os_info::get();
- if let os_info::Version::Semantic(major, minor, _) = os.version() {
- if *major >= 12 && *minor >= 3 {
- // Mac os version is 12.3 or higher, we allow mouseover
- return false;
+ if cfg!(target_os = "macos") {
+ // 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()
+ {
+ if major >= 12 && minor >= 3 {
+ // Mac os version is 12.3 or higher, we allow mouseover
+ return false;
+ }
}
+ true
+ } else {
+ // Not macos, we allow mouseover
+ false
}
- true
-}
-#[cfg(not(target_os = "macos"))]
-#[tauri::command]
-pub async fn should_disable_mouseover() -> bool {
- false
}
#[tauri::command]
-pub fn highlight_in_folder(path: PathBuf) {
- let res = opener::reveal(path);
-
- if let Err(e) = res {
+pub fn highlight_in_folder(
+ app: tauri::AppHandle,
+ path: PathBuf,
+) {
+ if let Err(e) = app.opener().reveal_item_in_dir(path) {
tracing::error!("Failed to highlight file in folder: {}", e);
}
}
#[tauri::command]
-pub fn open_path(path: PathBuf) {
- let res = opener::open(path);
-
- if let Err(e) = res {
+pub fn open_path(app: tauri::AppHandle, path: PathBuf) {
+ if let Err(e) = app.opener().open_path(path.to_string_lossy(), None::<&str>)
+ {
tracing::error!("Failed to open path: {}", e);
}
}
#[tauri::command]
-pub fn show_launcher_logs_folder() {
+pub fn show_launcher_logs_folder(app: tauri::AppHandle) {
let path = DirectoryInfo::launcher_logs_dir().unwrap_or_default();
// failure to get folder just opens filesystem
// (ie: if in debug mode only and launcher_logs never created)
- open_path(path);
+ open_path(app, path);
}
// Get opening command
@@ -147,3 +151,28 @@ pub async fn handle_command(command: String) -> Result<()> {
tracing::info!("handle command: {command}");
Ok(theseus::handler::parse_and_emit_command(&command).await?)
}
+
+// Remove when (and if) https://github.com/tauri-apps/tauri/issues/12022 is implemented
+pub(crate) fn tauri_convert_file_src(path: &Path) -> Result {
+ #[cfg(any(windows, target_os = "android"))]
+ const BASE: &str = "http://asset.localhost/";
+ #[cfg(not(any(windows, target_os = "android")))]
+ const BASE: &str = "asset://localhost/";
+
+ macro_rules! theseus_try {
+ ($test:expr) => {
+ match $test {
+ Ok(val) => val,
+ Err(e) => {
+ return Err(TheseusSerializableError::Theseus(e.into()))
+ }
+ }
+ };
+ }
+
+ let path = theseus_try!(canonicalize(path));
+ let path = path.to_string_lossy();
+ let encoded = urlencoding::encode(&path);
+
+ Ok(theseus_try!(Url::parse(&format!("{BASE}{encoded}"))))
+}
diff --git a/apps/app/src/api/worlds.rs b/apps/app/src/api/worlds.rs
new file mode 100644
index 000000000..544ce05d6
--- /dev/null
+++ b/apps/app/src/api/worlds.rs
@@ -0,0 +1,218 @@
+use crate::api::Result;
+use either::Either;
+use enumset::EnumSet;
+use tauri::{AppHandle, Manager, Runtime};
+use theseus::prelude::ProcessMetadata;
+use theseus::profile::{QuickPlayType, get_full_path};
+use theseus::worlds::{
+ DisplayStatus, ServerPackStatus, ServerStatus, World, WorldType,
+ WorldWithProfile,
+};
+use theseus::{profile, worlds};
+
+pub fn init() -> tauri::plugin::TauriPlugin {
+ tauri::plugin::Builder::new("worlds")
+ .invoke_handler(tauri::generate_handler![
+ get_recent_worlds,
+ get_profile_worlds,
+ get_singleplayer_world,
+ set_world_display_status,
+ rename_world,
+ reset_world_icon,
+ backup_world,
+ delete_world,
+ add_server_to_profile,
+ edit_server_in_profile,
+ remove_server_from_profile,
+ get_profile_protocol_version,
+ get_server_status,
+ start_join_singleplayer_world,
+ start_join_server,
+ ])
+ .build()
+}
+
+#[tauri::command]
+pub async fn get_recent_worlds(
+ app_handle: AppHandle,
+ limit: usize,
+ display_statuses: Option>,
+) -> Result> {
+ let mut result = worlds::get_recent_worlds(
+ limit,
+ display_statuses.unwrap_or(EnumSet::all()),
+ )
+ .await?;
+ for world in &mut result {
+ adapt_world_icon(&app_handle, &mut world.world);
+ }
+ Ok(result)
+}
+
+#[tauri::command]
+pub async fn get_profile_worlds(
+ app_handle: AppHandle,
+ path: &str,
+) -> Result> {
+ let mut result = worlds::get_profile_worlds(path).await?;
+ for world in &mut result {
+ adapt_world_icon(&app_handle, world);
+ }
+ Ok(result)
+}
+
+#[tauri::command]
+pub async fn get_singleplayer_world(
+ app_handle: AppHandle,
+ instance: &str,
+ world: &str,
+) -> Result {
+ let mut world = worlds::get_singleplayer_world(instance, world).await?;
+ adapt_world_icon(&app_handle, &mut world);
+ Ok(world)
+}
+
+fn adapt_world_icon(app_handle: &AppHandle, world: &mut World) {
+ if let Some(Either::Left(icon_path)) = &world.icon {
+ let icon_path = icon_path.clone();
+ if let Ok(new_url) = super::utils::tauri_convert_file_src(&icon_path) {
+ world.icon = Some(Either::Right(new_url));
+ if let Err(e) =
+ app_handle.asset_protocol_scope().allow_file(&icon_path)
+ {
+ tracing::warn!(
+ "Failed to allow file access for icon {}: {}",
+ icon_path.display(),
+ e
+ );
+ }
+ } else {
+ tracing::warn!(
+ "Encountered invalid icon path for world {}: {}",
+ world.name,
+ icon_path.display()
+ );
+ world.icon = None;
+ }
+ }
+}
+
+#[tauri::command]
+pub async fn set_world_display_status(
+ instance: &str,
+ world_type: WorldType,
+ world_id: &str,
+ display_status: DisplayStatus,
+) -> Result<()> {
+ Ok(worlds::set_world_display_status(
+ instance,
+ world_type,
+ world_id,
+ display_status,
+ )
+ .await?)
+}
+
+#[tauri::command]
+pub async fn rename_world(
+ instance: &str,
+ world: &str,
+ new_name: &str,
+) -> Result<()> {
+ let instance = get_full_path(instance).await?;
+ worlds::rename_world(&instance, world, new_name).await?;
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn reset_world_icon(instance: &str, world: &str) -> Result<()> {
+ let instance = get_full_path(instance).await?;
+ worlds::reset_world_icon(&instance, world).await?;
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn backup_world(instance: &str, world: &str) -> Result {
+ let instance = get_full_path(instance).await?;
+ Ok(worlds::backup_world(&instance, world).await?)
+}
+
+#[tauri::command]
+pub async fn delete_world(instance: &str, world: &str) -> Result<()> {
+ let instance = get_full_path(instance).await?;
+ worlds::delete_world(&instance, world).await?;
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn add_server_to_profile(
+ path: &str,
+ name: String,
+ address: String,
+ pack_status: ServerPackStatus,
+) -> Result {
+ let path = get_full_path(path).await?;
+ Ok(
+ worlds::add_server_to_profile(&path, name, address, pack_status)
+ .await?,
+ )
+}
+
+#[tauri::command]
+pub async fn edit_server_in_profile(
+ path: &str,
+ index: usize,
+ name: String,
+ address: String,
+ pack_status: ServerPackStatus,
+) -> Result<()> {
+ let path = get_full_path(path).await?;
+ worlds::edit_server_in_profile(&path, index, name, address, pack_status)
+ .await?;
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn remove_server_from_profile(
+ path: &str,
+ index: usize,
+) -> Result<()> {
+ let path = get_full_path(path).await?;
+ worlds::remove_server_from_profile(&path, index).await?;
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn get_profile_protocol_version(path: &str) -> Result> {
+ Ok(worlds::get_profile_protocol_version(path).await?)
+}
+
+#[tauri::command]
+pub async fn get_server_status(
+ address: &str,
+ protocol_version: Option,
+) -> Result {
+ Ok(worlds::get_server_status(address, protocol_version).await?)
+}
+
+#[tauri::command]
+pub async fn start_join_singleplayer_world(
+ path: &str,
+ world: String,
+) -> Result {
+ let process =
+ profile::run(path, &QuickPlayType::Singleplayer(world)).await?;
+
+ Ok(process)
+}
+
+#[tauri::command]
+pub async fn start_join_server(
+ path: &str,
+ address: &str,
+) -> Result {
+ let process =
+ profile::run(path, &QuickPlayType::Server(address.to_owned())).await?;
+
+ Ok(process)
+}
diff --git a/apps/app/src/macos/deep_link.rs b/apps/app/src/macos/deep_link.rs
index e2c66ac15..08a9bc756 100644
--- a/apps/app/src/macos/deep_link.rs
+++ b/apps/app/src/macos/deep_link.rs
@@ -11,7 +11,8 @@ pub fn get_or_init_payload>(
manager: &M,
) -> InitialPayload {
let initial_payload = manager.try_state::();
- let mtx = if let Some(initial_payload) = initial_payload {
+
+ if let Some(initial_payload) = initial_payload {
initial_payload.inner().clone()
} else {
tracing::info!("No initial payload found, creating new");
@@ -22,7 +23,5 @@ pub fn get_or_init_payload>(
manager.manage(payload.clone());
payload
- };
-
- mtx
+ }
}
diff --git a/apps/app/src/macos/mod.rs b/apps/app/src/macos/mod.rs
index 8098222ea..af946b000 100644
--- a/apps/app/src/macos/mod.rs
+++ b/apps/app/src/macos/mod.rs
@@ -1,2 +1 @@
pub mod deep_link;
-pub mod window_ext;
diff --git a/apps/app/src/macos/window_ext.rs b/apps/app/src/macos/window_ext.rs
deleted file mode 100644
index 8a2d9e15a..000000000
--- a/apps/app/src/macos/window_ext.rs
+++ /dev/null
@@ -1,412 +0,0 @@
-// Stolen from https://gist.github.com/charrondev/43150e940bd2771b1ea88256d491c7a9
-use objc::{msg_send, sel, sel_impl};
-use rand::{distributions::Alphanumeric, Rng};
-use tauri::{
- plugin::{Builder, TauriPlugin},
- Emitter, Runtime, Window,
-}; // 0.8
-
-const WINDOW_CONTROL_PAD_X: f64 = 9.0;
-const WINDOW_CONTROL_PAD_Y: f64 = 10.0;
-
-struct UnsafeWindowHandle(*mut std::ffi::c_void);
-unsafe impl Send for UnsafeWindowHandle {}
-unsafe impl Sync for UnsafeWindowHandle {}
-
-pub fn init() -> TauriPlugin {
- Builder::new("traffic_light_positioner")
- .on_window_ready(|window| {
- #[cfg(target_os = "macos")]
- setup_traffic_light_positioner(window);
- })
- .build()
-}
-
-#[cfg(target_os = "macos")]
-fn position_traffic_lights(
- ns_window_handle: UnsafeWindowHandle,
- x: f64,
- y: f64,
-) {
- use cocoa::appkit::{NSView, NSWindow, NSWindowButton};
- use cocoa::foundation::NSRect;
- let ns_window = ns_window_handle.0 as cocoa::base::id;
- unsafe {
- let close = ns_window
- .standardWindowButton_(NSWindowButton::NSWindowCloseButton);
- let miniaturize = ns_window
- .standardWindowButton_(NSWindowButton::NSWindowMiniaturizeButton);
- let zoom =
- ns_window.standardWindowButton_(NSWindowButton::NSWindowZoomButton);
-
- let title_bar_container_view = close.superview().superview();
-
- let close_rect: NSRect = msg_send![close, frame];
- let button_height = close_rect.size.height + 12.0;
-
- let title_bar_frame_height = button_height + y;
- let mut title_bar_rect = NSView::frame(title_bar_container_view);
- title_bar_rect.size.height = title_bar_frame_height;
- title_bar_rect.origin.y =
- NSView::frame(ns_window).size.height - title_bar_frame_height;
- let _: () =
- msg_send![title_bar_container_view, setFrame: title_bar_rect];
-
- let window_buttons = vec![close, miniaturize, zoom];
- let space_between =
- NSView::frame(miniaturize).origin.x - NSView::frame(close).origin.x;
-
- for (i, button) in window_buttons.into_iter().enumerate() {
- let mut rect: NSRect = NSView::frame(button);
- rect.origin.x = x + (i as f64 * space_between) + 6.0;
- button.setFrameOrigin(rect.origin);
- }
- }
-}
-
-#[cfg(target_os = "macos")]
-#[derive(Debug)]
-struct WindowState {
- window: Window,
-}
-
-#[cfg(target_os = "macos")]
-pub fn setup_traffic_light_positioner(window: Window) {
- use cocoa::appkit::NSWindow;
- use cocoa::base::{id, BOOL};
- use cocoa::foundation::NSUInteger;
- use objc::runtime::{Object, Sel};
- use std::ffi::c_void;
-
- // Do the initial positioning
- position_traffic_lights(
- UnsafeWindowHandle(
- window.ns_window().expect("Failed to create window handle"),
- ),
- WINDOW_CONTROL_PAD_X,
- WINDOW_CONTROL_PAD_Y,
- );
-
- // Ensure they stay in place while resizing the window.
- fn with_window_state) -> T, T>(
- this: &Object,
- func: F,
- ) {
- let ptr = unsafe {
- let x: *mut c_void = *this.get_ivar("app_box");
- &mut *(x as *mut WindowState)
- };
- func(ptr);
- }
-
- unsafe {
- let ns_win = window
- .ns_window()
- .expect("NS Window should exist to mount traffic light delegate.")
- as id;
-
- let current_delegate: id = ns_win.delegate();
-
- extern "C" fn on_window_should_close(
- this: &Object,
- _cmd: Sel,
- sender: id,
- ) -> BOOL {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- msg_send![super_del, windowShouldClose: sender]
- }
- }
- extern "C" fn on_window_will_close(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowWillClose: notification];
- }
- }
- extern "C" fn on_window_did_resize(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- with_window_state(this, |state: &mut WindowState| {
- let id = state.window.ns_window().expect(
- "NS window should exist on state to handle resize",
- ) as id;
-
- #[cfg(target_os = "macos")]
- position_traffic_lights(
- UnsafeWindowHandle(id as *mut std::ffi::c_void),
- WINDOW_CONTROL_PAD_X,
- WINDOW_CONTROL_PAD_Y,
- );
- });
-
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowDidResize: notification];
- }
- }
- extern "C" fn on_window_did_move(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowDidMove: notification];
- }
- }
- extern "C" fn on_window_did_change_backing_properties(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowDidChangeBackingProperties: notification];
- }
- }
- extern "C" fn on_window_did_become_key(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () =
- msg_send![super_del, windowDidBecomeKey: notification];
- }
- }
- extern "C" fn on_window_did_resign_key(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () =
- msg_send![super_del, windowDidResignKey: notification];
- }
- }
- extern "C" fn on_dragging_entered(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) -> BOOL {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- msg_send![super_del, draggingEntered: notification]
- }
- }
- extern "C" fn on_prepare_for_drag_operation(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) -> BOOL {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- msg_send![super_del, prepareForDragOperation: notification]
- }
- }
- extern "C" fn on_perform_drag_operation(
- this: &Object,
- _cmd: Sel,
- sender: id,
- ) -> BOOL {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- msg_send![super_del, performDragOperation: sender]
- }
- }
- extern "C" fn on_conclude_drag_operation(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () =
- msg_send![super_del, concludeDragOperation: notification];
- }
- }
- extern "C" fn on_dragging_exited(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, draggingExited: notification];
- }
- }
- extern "C" fn on_window_will_use_full_screen_presentation_options(
- this: &Object,
- _cmd: Sel,
- window: id,
- proposed_options: NSUInteger,
- ) -> NSUInteger {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- msg_send![super_del, window: window willUseFullScreenPresentationOptions: proposed_options]
- }
- }
- extern "C" fn on_window_did_enter_full_screen(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- with_window_state(this, |state: &mut WindowState| {
- state
- .window
- .emit("did-enter-fullscreen", ())
- .expect("Failed to emit event");
- });
-
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowDidEnterFullScreen: notification];
- }
- }
- extern "C" fn on_window_will_enter_full_screen(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- with_window_state(this, |state: &mut WindowState| {
- state
- .window
- .emit("will-enter-fullscreen", ())
- .expect("Failed to emit event");
- });
-
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowWillEnterFullScreen: notification];
- }
- }
- extern "C" fn on_window_did_exit_full_screen(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- with_window_state(this, |state: &mut WindowState| {
- state
- .window
- .emit("did-exit-fullscreen", ())
- .expect("Failed to emit event");
-
- let id =
- state.window.ns_window().expect("Failed to emit event")
- as id;
- position_traffic_lights(
- UnsafeWindowHandle(id as *mut std::ffi::c_void),
- WINDOW_CONTROL_PAD_X,
- WINDOW_CONTROL_PAD_Y,
- );
- });
-
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () =
- msg_send![super_del, windowDidExitFullScreen: notification];
- }
- }
- extern "C" fn on_window_will_exit_full_screen(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- with_window_state(this, |state: &mut WindowState| {
- state
- .window
- .emit("will-exit-fullscreen", ())
- .expect("Failed to emit event");
- });
-
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowWillExitFullScreen: notification];
- }
- }
- extern "C" fn on_window_did_fail_to_enter_full_screen(
- this: &Object,
- _cmd: Sel,
- window: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, windowDidFailToEnterFullScreen: window];
- }
- }
- extern "C" fn on_effective_appearance_did_change(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![super_del, effectiveAppearanceDidChange: notification];
- }
- }
- extern "C" fn on_effective_appearance_did_changed_on_main_thread(
- this: &Object,
- _cmd: Sel,
- notification: id,
- ) {
- unsafe {
- let super_del: id = *this.get_ivar("super_delegate");
- let _: () = msg_send![
- super_del,
- effectiveAppearanceDidChangedOnMainThread: notification
- ];
- }
- }
-
- // Are we deallocing this properly ? (I miss safe Rust :( )
- let window_label = window.label().to_string();
-
- let app_state = WindowState { window };
- let app_box = Box::into_raw(Box::new(app_state)) as *mut c_void;
- let random_str: String = rand::thread_rng()
- .sample_iter(&Alphanumeric)
- .take(20)
- .map(char::from)
- .collect();
-
- // We need to ensure we have a unique delegate name, otherwise we will panic while trying to create a duplicate
- // delegate with the same name.
- let delegate_name =
- format!("windowDelegate_{}_{}", window_label, random_str);
-
- ns_win.setDelegate_(delegate!(&delegate_name, {
- window: id = ns_win,
- app_box: *mut c_void = app_box,
- toolbar: id = cocoa::base::nil,
- super_delegate: id = current_delegate,
- (windowShouldClose:) => on_window_should_close as extern fn(&Object, Sel, id) -> BOOL,
- (windowWillClose:) => on_window_will_close as extern fn(&Object, Sel, id),
- (windowDidResize:) => on_window_did_resize:: as extern fn(&Object, Sel, id),
- (windowDidMove:) => on_window_did_move as extern fn(&Object, Sel, id),
- (windowDidChangeBackingProperties:) => on_window_did_change_backing_properties as extern fn(&Object, Sel, id),
- (windowDidBecomeKey:) => on_window_did_become_key as extern fn(&Object, Sel, id),
- (windowDidResignKey:) => on_window_did_resign_key as extern fn(&Object, Sel, id),
- (draggingEntered:) => on_dragging_entered as extern fn(&Object, Sel, id) -> BOOL,
- (prepareForDragOperation:) => on_prepare_for_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
- (performDragOperation:) => on_perform_drag_operation as extern fn(&Object, Sel, id) -> BOOL,
- (concludeDragOperation:) => on_conclude_drag_operation as extern fn(&Object, Sel, id),
- (draggingExited:) => on_dragging_exited as extern fn(&Object, Sel, id),
- (window:willUseFullScreenPresentationOptions:) => on_window_will_use_full_screen_presentation_options as extern fn(&Object, Sel, id, NSUInteger) -> NSUInteger,
- (windowDidEnterFullScreen:) => on_window_did_enter_full_screen:: as extern fn(&Object, Sel, id),
- (windowWillEnterFullScreen:) => on_window_will_enter_full_screen:: as extern fn(&Object, Sel, id),
- (windowDidExitFullScreen:) => on_window_did_exit_full_screen:: as extern fn(&Object, Sel, id),
- (windowWillExitFullScreen:) => on_window_will_exit_full_screen:: as extern fn(&Object, Sel, id),
- (windowDidFailToEnterFullScreen:) => on_window_did_fail_to_enter_full_screen as extern fn(&Object, Sel, id),
- (effectiveAppearanceDidChange:) => on_effective_appearance_did_change as extern fn(&Object, Sel, id),
- (effectiveAppearanceDidChangedOnMainThread:) => on_effective_appearance_did_changed_on_main_thread as extern fn(&Object, Sel, id)
- }))
- }
-}
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index c73c06da4..dc3ee39e8 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -3,7 +3,7 @@
windows_subsystem = "windows"
)]
-use native_dialog::{MessageDialog, MessageType};
+use native_dialog::{DialogBuilder, MessageLevel};
use std::env;
use tauri::{Listener, Manager};
use theseus::prelude::*;
@@ -14,14 +14,6 @@ mod error;
#[cfg(target_os = "macos")]
mod macos;
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate cocoa;
-
-#[cfg(target_os = "macos")]
-#[macro_use]
-extern crate objc;
-
// Should be called in launcher initialization
#[tracing::instrument(skip_all)]
#[tauri::command]
@@ -42,9 +34,6 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
// let update_fut = updater.check();
- // tracing::info!("Initializing app state...");
- State::init().await?;
-
// let check_bar = theseus::init_loading(
// theseus::LoadingBarType::CheckingForUpdates,
// 1.0,
@@ -95,7 +84,7 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
// #[cfg(not(feature = "updater"))]
// {
// }
-
+ tracing::info!("Initializing app state...");
State::init().await?;
tracing::info!("AstralRinth state successfully initialized.");
let state = State::get().await?;
@@ -113,14 +102,14 @@ async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
fn show_window(app: tauri::AppHandle) {
let win = app.get_window("main").unwrap();
if let Err(e) = win.show() {
- MessageDialog::new()
- .set_type(MessageType::Error)
+ DialogBuilder::message()
+ .set_level(MessageLevel::Error)
.set_title("Initialization error")
- .set_text(&format!(
- "Cannot display application window due to an error:\n{}",
- e
+ .set_text(format!(
+ "Cannot display application window due to an error:\n{e}"
))
- .show_alert()
+ .alert()
+ .show()
.unwrap();
panic!("cannot display application window")
} else {
@@ -138,8 +127,7 @@ fn is_dev() -> bool {
async fn toggle_decorations(b: bool, window: tauri::Window) -> api::Result<()> {
window.set_decorations(b).map_err(|e| {
theseus::Error::from(theseus::ErrorKind::OtherError(format!(
- "Failed to toggle decorations: {}",
- e
+ "Failed to toggle decorations: {e}"
)))
})?;
Ok(())
@@ -173,10 +161,10 @@ fn main() {
let mut builder = tauri::Builder::default();
- #[cfg(feature = "updater")]
- {
- builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
- }
+ // #[cfg(feature = "updater")]
+ // {
+ // builder = builder.plugin(tauri_plugin_updater::Builder::new().build());
+ // }
builder = builder
.plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
@@ -192,6 +180,7 @@ fn main() {
let _ = win.set_focus();
}
}))
+ .plugin(tauri_plugin_http::init())
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_dialog::init())
.plugin(tauri_plugin_deep_link::init())
@@ -219,7 +208,7 @@ fn main() {
{
let payload = macos::deep_link::get_or_init_payload(app);
- let mtx_copy = payload.payload.clone();
+ let mtx_copy = payload.payload;
app.listen("deep-link://new-url", move |url| {
let mtx_copy_copy = mtx_copy.clone();
let request = url.payload().to_owned();
@@ -251,13 +240,12 @@ fn main() {
tauri::async_runtime::spawn(api::utils::handle_command(
payload,
));
- dbg!(url);
});
#[cfg(not(target_os = "linux"))]
- {
- if let Some(window) = app.get_window("main") {
- window.set_shadow(true).unwrap();
+ if let Some(window) = app.get_window("main") {
+ if let Err(e) = window.set_shadow(true) {
+ tracing::warn!("Failed to set window shadow: {e}");
}
}
@@ -271,6 +259,7 @@ fn main() {
.plugin(api::logs::init())
.plugin(api::jre::init())
.plugin(api::metadata::init())
+ .plugin(api::minecraft_skins::init())
.plugin(api::pack::init())
.plugin(api::process::init())
.plugin(api::profile::init())
@@ -280,6 +269,7 @@ fn main() {
.plugin(api::utils::init())
.plugin(api::cache::init())
.plugin(api::friends::init())
+ .plugin(api::worlds::init())
.invoke_handler(tauri::generate_handler![
initialize_state,
is_dev,
@@ -288,32 +278,27 @@ fn main() {
restart_app,
]);
- #[cfg(target_os = "macos")]
- {
- builder = builder.plugin(macos::window_ext::init());
- }
-
tracing::info!("Initializing app...");
let app = builder.build(tauri::generate_context!());
match app {
Ok(app) => {
- #[allow(unused_variables)]
app.run(|app, event| {
+ #[cfg(not(target_os = "macos"))]
+ drop((app, event));
#[cfg(target_os = "macos")]
if let tauri::RunEvent::Opened { urls } = event {
tracing::info!("Handling webview open {urls:?}");
let file = urls
.into_iter()
- .filter_map(|url| url.to_file_path().ok())
- .next();
+ .find_map(|url| url.to_file_path().ok());
if let Some(file) = file {
let payload =
macos::deep_link::get_or_init_payload(app);
- let mtx_copy = payload.payload.clone();
+ let mtx_copy = payload.payload;
let request = file.to_string_lossy().to_string();
tauri::async_runtime::spawn(async move {
let mut payload = mtx_copy.lock().await;
@@ -331,28 +316,29 @@ fn main() {
#[cfg(target_os = "windows")]
{
// tauri doesn't expose runtime errors, so matching a string representation seems like the only solution
- if format!("{:?}", e).contains(
+ if format!("{e:?}").contains(
"Runtime(CreateWebview(WebView2Error(WindowsError",
) {
- MessageDialog::new()
- .set_type(MessageType::Error)
+ DialogBuilder::message()
+ .set_level(MessageLevel::Error)
.set_title("Initialization error")
.set_text("Your Microsoft Edge WebView2 installation is corrupt.\n\nMicrosoft Edge WebView2 is required to run Modrinth App.\n\nLearn how to repair it at https://support.modrinth.com/en/articles/8797765-corrupted-microsoft-edge-webview2-installation")
- .show_alert()
+ .alert()
+ .show()
.unwrap();
panic!("webview2 initialization failed")
}
}
- MessageDialog::new()
- .set_type(MessageType::Error)
+ DialogBuilder::message()
+ .set_level(MessageLevel::Error)
.set_title("Initialization error")
- .set_text(&format!(
- "Cannot initialize application due to an error:\n{:?}",
- e
+ .set_text(format!(
+ "Cannot initialize application due to an error:\n{e:?}"
))
- .show_alert()
+ .alert()
+ .show()
.unwrap();
tracing::error!("Error while running tauri application: {:?}", e);
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index ac5619188..26021c70a 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -1,4 +1,5 @@
{
+ "$schema": "https://schema.tauri.app/config/2",
"build": {
"beforeDevCommand": "pnpm turbo run dev --filter=@modrinth/app-frontend",
"beforeBuildCommand": "pnpm turbo run build --filter=@modrinth/app-frontend",
@@ -13,9 +14,6 @@
"externalBin": [],
"icon": ["icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
"windows": {
- "certificateThumbprint": null,
- "digestAlgorithm": "sha256",
- "timestampUrl": "http://timestamp.digicert.com",
"nsis": {
"installMode": "perMachine",
"installerHooks": "./nsis/hooks.nsi"
@@ -29,7 +27,6 @@
"providerShortName": null,
"signingIdentity": null
},
- "resources": [],
"shortDescription": "",
"linux": {
"deb": {
@@ -44,7 +41,7 @@
]
},
"productName": "AstralRinth App",
- "version": "0.9.304",
+ "version": "0.10.302",
"mainBinaryName": "AstralRinth App",
"identifier": "AstralRinthApp",
"plugins": {
@@ -76,18 +73,26 @@
],
"security": {
"assetProtocol": {
- "scope": ["$APPDATA/caches/icons/*", "$APPCONFIG/caches/icons/*", "$CONFIG/caches/icons/*"],
+ "scope": [
+ "$APPDATA/caches/icons/*",
+ "$APPCONFIG/caches/icons/*",
+ "$CONFIG/caches/icons/*",
+ "$APPDATA/profiles/*/saves/*/icon.png",
+ "$APPCONFIG/profiles/*/saves/*/icon.png",
+ "$CONFIG/profiles/*/saves/*/icon.png"
+ ],
"enable": true
},
"capabilities": ["core", "plugins"],
"csp": {
"default-src": "'self' customprotocol: asset:",
- "connect-src": "https://api.github.com ipc: http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs",
- "font-src": ["https://cdn-raw.modrinth.com/fonts/inter/"],
- "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost blob: data:",
+ "connect-src": "ipc: https://git.astralium.su http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.posthog.com https://*.sentry.io https://api.mclo.gs 'self' data: blob:",
+ "font-src": ["https://cdn-raw.modrinth.com/fonts/"],
+ "img-src": "https: 'unsafe-inline' 'self' asset: http://asset.localhost http://textures.minecraft.net blob: data:",
"style-src": "'unsafe-inline' 'self'",
"script-src": "https://*.posthog.com 'self'",
- "frame-src": "https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'"
+ "frame-src": "https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'",
+ "media-src": "https://*.githubusercontent.com"
}
}
}
diff --git a/apps/app/turbo.jsonc b/apps/app/turbo.jsonc
new file mode 100644
index 000000000..7cdf6bd4b
--- /dev/null
+++ b/apps/app/turbo.jsonc
@@ -0,0 +1,14 @@
+{
+ "$schema": "../../node_modules/turbo/schema.json",
+ "extends": ["//"],
+ "tasks": {
+ // Running Clippy and tests on a Tauri application requires
+ // the frontend to be built at least once first
+ "lint": {
+ "dependsOn": ["@modrinth/app-frontend#build"]
+ },
+ "test": {
+ "dependsOn": ["@modrinth/app-frontend#build"]
+ }
+ }
+}
diff --git a/apps/daedalus_client/.env b/apps/daedalus_client/.env.local
similarity index 100%
rename from apps/daedalus_client/.env
rename to apps/daedalus_client/.env.local
diff --git a/apps/daedalus_client/Cargo.toml b/apps/daedalus_client/Cargo.toml
index 30b0f9db5..ffec1a471 100644
--- a/apps/daedalus_client/Cargo.toml
+++ b/apps/daedalus_client/Cargo.toml
@@ -2,41 +2,32 @@
name = "daedalus_client"
version = "0.2.2"
authors = ["Jai A "]
-edition = "2021"
+edition.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
-daedalus = { path = "../../packages/daedalus" }
-tokio = { version = "1", features = ["full"] }
-futures = "0.3.25"
-dotenvy = "0.15.6"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-serde-xml-rs = "0.6.0"
-lazy_static = "1.4.0"
-thiserror = "1.0"
-reqwest = { version = "0.12.5", default-features = false, features = [
- "stream",
- "json",
- "rustls-tls-native-roots",
-] }
-async_zip = { version = "0.0.17", features = ["full"] }
-semver = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-bytes = "1.6.0"
-rust-s3 = { version = "0.33.0", default-features = false, features = [
- "fail-on-err",
- "tags",
- "tokio-rustls-tls",
- "reqwest",
-] }
-dashmap = "5.5.3"
-sha1_smol = { version = "1.0.0", features = ["std"] }
-indexmap = { version = "2.2.6", features = ["serde"] }
-itertools = "0.13.0"
-tracing-error = "0.2.0"
+daedalus.workspace = true
+tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
+futures.workspace = true
+dotenvy.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+serde-xml-rs.workspace = true
+thiserror.workspace = true
+reqwest = { workspace = true, features = ["stream", "json", "rustls-tls-native-roots"] }
+async_zip = { workspace = true, features = ["chrono", "tokio-fs", "deflate", "bzip2", "zstd", "deflate64"] }
+chrono = { workspace = true, features = ["serde"] }
+bytes.workspace = true
+rust-s3.workspace = true
+dashmap.workspace = true
+sha1_smol.workspace = true
+indexmap = { workspace = true, features = ["serde"] }
+itertools.workspace = true
+tracing-error.workspace = true
-tracing = "0.1"
-tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-tracing-futures = { version = "0.2.5", features = ["futures", "tokio"] }
+tracing.workspace = true
+tracing-subscriber = { workspace = true, features = ["env-filter"] }
+
+[lints]
+workspace = true
diff --git a/apps/daedalus_client/Dockerfile b/apps/daedalus_client/Dockerfile
index f47e750ea..d33fc113a 100644
--- a/apps/daedalus_client/Dockerfile
+++ b/apps/daedalus_client/Dockerfile
@@ -1,4 +1,4 @@
-FROM rust:1.82.0 as build
+FROM rust:1.88.0 AS build
ENV PKG_CONFIG_ALLOW_CROSS=1
WORKDIR /usr/src/daedalus
@@ -9,9 +9,9 @@ RUN cargo build --release --package daedalus_client
FROM debian:bookworm-slim
RUN apt-get update \
- && apt-get install -y --no-install-recommends ca-certificates openssl \
- && apt-get clean \
- && rm -rf /var/lib/apt/lists/*
+ && apt-get install -y --no-install-recommends ca-certificates openssl \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
RUN update-ca-certificates
diff --git a/apps/daedalus_client/package.json b/apps/daedalus_client/package.json
index 1f48075b1..f75b9d768 100644
--- a/apps/daedalus_client/package.json
+++ b/apps/daedalus_client/package.json
@@ -2,10 +2,10 @@
"name": "@modrinth/daedalus_client",
"scripts": {
"build": "cargo build --release",
- "lint": "cargo fmt --check && cargo clippy --all-targets --all-features -- -D warnings",
- "fix": "cargo fmt && cargo clippy --fix",
+ "lint": "cargo fmt --check && cargo clippy --all-targets",
+ "fix": "cargo clippy --all-targets --fix --allow-dirty && cargo fmt",
"dev": "cargo run",
- "test": "cargo test"
+ "test": "cargo nextest run --all-targets --no-fail-fast"
},
"dependencies": {
"@modrinth/daedalus": "workspace:*"
diff --git a/apps/daedalus_client/src/error.rs b/apps/daedalus_client/src/error.rs
index d4a0167cb..586c7fc56 100644
--- a/apps/daedalus_client/src/error.rs
+++ b/apps/daedalus_client/src/error.rs
@@ -12,7 +12,9 @@ pub enum ErrorKind {
SerdeJSON(#[from] serde_json::Error),
#[error("Error while deserializing XML: {0}")]
SerdeXML(#[from] serde_xml_rs::Error),
- #[error("Failed to validate file checksum at url {url} with hash {hash} after {tries} tries")]
+ #[error(
+ "Failed to validate file checksum at url {url} with hash {hash} after {tries} tries"
+ )]
ChecksumFailure {
hash: String,
url: String,
@@ -22,7 +24,7 @@ pub enum ErrorKind {
Fetch { inner: reqwest::Error, item: String },
#[error("Error while uploading file to S3: {file}")]
S3 {
- inner: s3::error::S3Error,
+ inner: Box,
file: String,
},
#[error("Error acquiring semaphore: {0}")]
diff --git a/apps/daedalus_client/src/fabric.rs b/apps/daedalus_client/src/fabric.rs
index 2c394bc23..805d0e288 100644
--- a/apps/daedalus_client/src/fabric.rs
+++ b/apps/daedalus_client/src/fabric.rs
@@ -1,6 +1,6 @@
use crate::util::{download_file, fetch_json, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
-use daedalus::modded::{Manifest, PartialVersionInfo, DUMMY_REPLACE_STRING};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
+use daedalus::modded::{DUMMY_REPLACE_STRING, Manifest, PartialVersionInfo};
use dashmap::DashMap;
use serde::Deserialize;
use std::sync::Arc;
@@ -169,10 +169,11 @@ async fn fetch(
insert_mirrored_artifact(
&new_name,
None,
- vec![lib
- .url
- .clone()
- .unwrap_or_else(|| maven_url.to_string())],
+ vec![
+ lib.url
+ .clone()
+ .unwrap_or_else(|| maven_url.to_string()),
+ ],
false,
mirror_artifacts,
)?;
diff --git a/apps/daedalus_client/src/forge.rs b/apps/daedalus_client/src/forge.rs
index 5591f3211..ab67ae914 100644
--- a/apps/daedalus_client/src/forge.rs
+++ b/apps/daedalus_client/src/forge.rs
@@ -1,5 +1,5 @@
use crate::util::{download_file, fetch_json, fetch_xml, format_url};
-use crate::{insert_mirrored_artifact, Error, MirrorArtifact, UploadFile};
+use crate::{Error, MirrorArtifact, UploadFile, insert_mirrored_artifact};
use chrono::{DateTime, Utc};
use daedalus::get_path_from_artifact;
use daedalus::modded::PartialVersionInfo;
@@ -7,8 +7,8 @@ use dashmap::DashMap;
use futures::io::Cursor;
use indexmap::IndexMap;
use itertools::Itertools;
-use serde::de::DeserializeOwned;
use serde::Deserialize;
+use serde::de::DeserializeOwned;
use std::collections::HashMap;
use std::sync::Arc;
use tokio::sync::Semaphore;
@@ -57,7 +57,7 @@ pub async fn fetch_forge(
ForgeVersion {
format_version,
- installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{0}/forge-{0}-installer.jar", loader_version),
+ installer_url: format!("https://maven.minecraftforge.net/net/minecraftforge/forge/{loader_version}/forge-{loader_version}-installer.jar"),
raw: loader_version,
loader_version: version_split,
game_version: game_version.clone(),
@@ -137,7 +137,7 @@ pub async fn fetch_neo(
Ok(ForgeVersion {
format_version: 2,
- installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{0}/forge-{0}-installer.jar", loader_version),
+ installer_url: format!("https://maven.neoforged.net/net/neoforged/forge/{loader_version}/forge-{loader_version}-installer.jar"),
raw: loader_version,
loader_version: version_split,
game_version: "1.20.1".to_string(), // All NeoForge Forge versions are for 1.20.1
@@ -163,7 +163,7 @@ pub async fn fetch_neo(
Ok(ForgeVersion {
format_version: 2,
- installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{0}/neoforge-{0}-installer.jar", loader_version),
+ installer_url: format!("https://maven.neoforged.net/net/neoforged/neoforge/{loader_version}/neoforge-{loader_version}-installer.jar"),
loader_version: loader_version.clone(),
raw: loader_version,
game_version,
@@ -502,7 +502,7 @@ async fn fetch(
)?;
artifact.url =
- format_url(&format!("maven/{}", artifact_path));
+ format_url(&format!("maven/{artifact_path}"));
return Ok(lib);
}
@@ -589,16 +589,18 @@ async fn fetch(
mod_loader: &str,
version: &ForgeVersion,
) -> Result {
- let extract_file =
- read_file(zip, &value[1..value.len()])
- .await?
- .ok_or_else(|| {
- crate::ErrorKind::InvalidInput(format!(
+ let extract_file = read_file(
+ zip,
+ &value[1..value.len()],
+ )
+ .await?
+ .ok_or_else(|| {
+ crate::ErrorKind::InvalidInput(format!(
"Unable reading data key {key} at path {value}",
))
- })?;
+ })?;
- let file_name = value.split('/').last()
+ let file_name = value.split('/').next_back()
.ok_or_else(|| {
crate::ErrorKind::InvalidInput(format!(
"Unable reading filename for data key {key} at path {value}",
@@ -622,10 +624,7 @@ async fn fetch(
let path = format!(
"com.modrinth.daedalus:{}-installer-extracts:{}:{}@{}",
- mod_loader,
- version.raw,
- file_name,
- ext
+ mod_loader, version.raw, file_name, ext
);
upload_files.insert(
@@ -753,7 +752,8 @@ async fn fetch(
.rev()
.chunk_by(|x| x.game_version.clone())
.into_iter()
- .map(|(game_version, loaders)| daedalus::modded::Version {
+ .map(|(game_version, loaders)| {
+ daedalus::modded::Version {
id: game_version,
stable: true,
loaders: loaders
@@ -766,6 +766,7 @@ async fn fetch(
stable: false,
})
.collect(),
+ }
})
.collect(),
};
diff --git a/apps/daedalus_client/src/main.rs b/apps/daedalus_client/src/main.rs
index 870a55ec0..dcd610558 100644
--- a/apps/daedalus_client/src/main.rs
+++ b/apps/daedalus_client/src/main.rs
@@ -1,13 +1,13 @@
use crate::util::{
- format_url, upload_file_to_bucket, upload_url_to_bucket_mirrors,
- REQWEST_CLIENT,
+ REQWEST_CLIENT, format_url, upload_file_to_bucket,
+ upload_url_to_bucket_mirrors,
};
use daedalus::get_path_from_artifact;
use dashmap::{DashMap, DashSet};
use std::sync::Arc;
use tokio::sync::Semaphore;
use tracing_error::ErrorLayer;
-use tracing_subscriber::{fmt, prelude::*, EnvFilter};
+use tracing_subscriber::{EnvFilter, fmt, prelude::*};
mod error;
mod fabric;
diff --git a/apps/daedalus_client/src/minecraft.rs b/apps/daedalus_client/src/minecraft.rs
index e98b12044..f90cf6ddd 100644
--- a/apps/daedalus_client/src/minecraft.rs
+++ b/apps/daedalus_client/src/minecraft.rs
@@ -1,11 +1,11 @@
use crate::util::fetch_json;
use crate::{
- util::download_file, util::format_url, util::sha1_async, Error,
- MirrorArtifact, UploadFile,
+ Error, MirrorArtifact, UploadFile, util::download_file, util::format_url,
+ util::sha1_async,
};
use daedalus::minecraft::{
- merge_partial_library, Library, PartialLibrary, VersionInfo,
- VersionManifest, VERSION_MANIFEST_URL,
+ Library, PartialLibrary, VERSION_MANIFEST_URL, VersionInfo,
+ VersionManifest, merge_partial_library,
};
use dashmap::DashMap;
use serde::Deserialize;
@@ -52,8 +52,7 @@ pub async fn fetch(
if modrinth_version
.original_sha1
.as_ref()
- .map(|x| x == &version.sha1)
- .unwrap_or(false)
+ .is_some_and(|x| x == &version.sha1)
{
existing_versions.push(modrinth_version);
} else {
diff --git a/apps/daedalus_client/src/util.rs b/apps/daedalus_client/src/util.rs
index b5e4b360a..3f8f11e53 100644
--- a/apps/daedalus_client/src/util.rs
+++ b/apps/daedalus_client/src/util.rs
@@ -3,59 +3,57 @@ use bytes::Bytes;
use s3::creds::Credentials;
use s3::{Bucket, Region};
use serde::de::DeserializeOwned;
-use std::sync::Arc;
+use std::sync::{Arc, LazyLock};
use tokio::sync::Semaphore;
-lazy_static::lazy_static! {
- static ref BUCKET : Bucket = {
- let region = dotenvy::var("S3_REGION").unwrap();
- let b = Bucket::new(
- &dotenvy::var("S3_BUCKET_NAME").unwrap(),
- if &*region == "r2" {
- Region::R2 {
- account_id: dotenvy::var("S3_URL").unwrap(),
- }
- } else {
- Region::Custom {
- region: region.clone(),
- endpoint: dotenvy::var("S3_URL").unwrap(),
- }
- },
- Credentials::new(
- Some(&*dotenvy::var("S3_ACCESS_TOKEN").unwrap()),
- Some(&*dotenvy::var("S3_SECRET").unwrap()),
- None,
- None,
- None,
- ).unwrap(),
- ).unwrap();
-
- if region == "path-style" {
- b.with_path_style()
+static BUCKET: LazyLock = LazyLock::new(|| {
+ let region = dotenvy::var("S3_REGION").unwrap();
+ let b = Bucket::new(
+ &dotenvy::var("S3_BUCKET_NAME").unwrap(),
+ if &*region == "r2" {
+ Region::R2 {
+ account_id: dotenvy::var("S3_URL").unwrap(),
+ }
} else {
- b
- }
- };
-}
+ Region::Custom {
+ region: region.clone(),
+ endpoint: dotenvy::var("S3_URL").unwrap(),
+ }
+ },
+ Credentials::new(
+ Some(&*dotenvy::var("S3_ACCESS_TOKEN").unwrap()),
+ Some(&*dotenvy::var("S3_SECRET").unwrap()),
+ None,
+ None,
+ None,
+ )
+ .unwrap(),
+ )
+ .unwrap();
-lazy_static::lazy_static! {
- pub static ref REQWEST_CLIENT: reqwest::Client = {
- let mut headers = reqwest::header::HeaderMap::new();
- if let Ok(header) = reqwest::header::HeaderValue::from_str(&format!(
- "modrinth/daedalus/{} (support@modrinth.com)",
- env!("CARGO_PKG_VERSION")
- )) {
- headers.insert(reqwest::header::USER_AGENT, header);
- }
+ if region == "path-style" {
+ *b.with_path_style()
+ } else {
+ *b
+ }
+});
- reqwest::Client::builder()
- .tcp_keepalive(Some(std::time::Duration::from_secs(10)))
- .timeout(std::time::Duration::from_secs(15))
- .default_headers(headers)
- .build()
- .unwrap()
- };
-}
+pub static REQWEST_CLIENT: LazyLock = LazyLock::new(|| {
+ let mut headers = reqwest::header::HeaderMap::new();
+ if let Ok(header) = reqwest::header::HeaderValue::from_str(&format!(
+ "modrinth/daedalus/{} (support@modrinth.com)",
+ env!("CARGO_PKG_VERSION")
+ )) {
+ headers.insert(reqwest::header::USER_AGENT, header);
+ }
+
+ reqwest::Client::builder()
+ .tcp_keepalive(Some(std::time::Duration::from_secs(10)))
+ .timeout(std::time::Duration::from_secs(15))
+ .default_headers(headers)
+ .build()
+ .unwrap()
+});
#[tracing::instrument(skip(bytes, semaphore))]
pub async fn upload_file_to_bucket(
@@ -78,7 +76,7 @@ pub async fn upload_file_to_bucket(
BUCKET.put_object(key.clone(), &bytes).await
}
.map_err(|err| ErrorKind::S3 {
- inner: err,
+ inner: Box::new(err),
file: path.clone(),
});
@@ -203,7 +201,7 @@ pub async fn download_file(
inner: err,
item: url.to_string(),
}
- .into())
+ .into());
}
}
}
diff --git a/apps/docs/astro.config.mjs b/apps/docs/astro.config.mjs
index 4fcf82fa6..3baeb6f4f 100644
--- a/apps/docs/astro.config.mjs
+++ b/apps/docs/astro.config.mjs
@@ -44,6 +44,10 @@ export default defineConfig({
label: 'Contributing to Modrinth',
autogenerate: { directory: 'contributing' },
},
+ {
+ label: 'Guides',
+ autogenerate: { directory: 'guide' },
+ },
// Add the generated sidebar group to the sidebar.
...openAPISidebarGroups,
],
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 8ce3806e6..274ddd55c 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -5,7 +5,8 @@
"scripts": {
"dev": "astro dev",
"start": "astro dev",
- "build": "astro check && astro build",
+ "lint": "astro check",
+ "build": "astro build",
"preview": "astro preview",
"astro": "astro"
},
@@ -18,4 +19,4 @@
"starlight-openapi": "^0.14.0",
"typescript": "^5.8.2"
}
-}
\ No newline at end of file
+}
diff --git a/apps/docs/public/openapi.yaml b/apps/docs/public/openapi.yaml
index da9504ae5..73b2b05b7 100644
--- a/apps/docs/public/openapi.yaml
+++ b/apps/docs/public/openapi.yaml
@@ -1,7 +1,7 @@
openapi: '3.0.0'
info:
- version: v2.7.0/15cf3fc
+ version: v2.7.0/366f528
title: Labrinth
termsOfService: https://modrinth.com/legal/terms
contact:
@@ -51,35 +51,7 @@ info:
Please note that certain scopes and requests cannot be completed with a personal access token or using OAuth.
For example, deleting a user account can only be done through Modrinth's frontend.
- ### OAuth2
- Applications interacting with an authenticated API should create an OAuth2 application.
- You can do this in [the developer settings](https://modrinth.com/settings/applications).
-
- Make sure to save your application secret, as you will not be able to access it after you leave the page.
-
- Once you have created a client, use the following URL to have a user authorize your client:
- ```
- https://modrinth.com/auth/authorize?client_id=&redirect_uri=&scope=++
- ```
- > You can get a list of all scope names [here](https://github.com/modrinth/code/tree/main/apps/labrinth/src/models/v3/pats.rs).
-
- Then, send a `POST` request to the following URL to get the token:
-
- ```
- https://api.modrinth.com/_internal/oauth/token
- ```
-
- > Note that you will need to provide your application's secret under the Authorization header.
-
- In the body of your request, make sure to include the following:
- - `code`: The code generated when authorizing your client
- - `client_id`: Your client ID (found in developer settings)
- - `redirect_uri`: A valid redirect URI provided in your application's settings
- - `grant_type`: This will need to be `authorization_code`.
-
- If your token request fails for any reason, you will need to get another code from the authorization process.
-
- This route will be changed in the future to move the `_internal` part to `v3`.
+ A detailed guide on OAuth has been published in [Modrinth's technical documentation](https://docs.modrinth.com/guide/oauth).
### Personal access tokens
Personal access tokens (PATs) can be generated in from [the user settings](https://modrinth.com/settings/account).
@@ -3018,6 +2990,24 @@ paths:
$ref: '#/components/schemas/InvalidInputError'
'404':
description: The requested item(s) were not found or no authorization to access the requested item(s)
+ delete:
+ summary: Remove user's avatar
+ operationId: deleteUserIcon
+ tags:
+ - users
+ security:
+ - TokenAuth: ['USER_WRITE']
+ responses:
+ '204':
+ description: Expected response to a valid request
+ '400':
+ description: Request was invalid, see given error
+ content:
+ application/json:
+ schema:
+ $ref: '#/components/schemas/InvalidInputError'
+ '404':
+ description: The requested item(s) were not found or no authorization to access the requested item(s)
/user/{id|username}/projects:
parameters:
- $ref: '#/components/parameters/UserIdentifier'
diff --git a/apps/docs/public/welcome-channel.yaml b/apps/docs/public/welcome-channel.yaml
index f5893ba2b..21728ff2d 100644
--- a/apps/docs/public/welcome-channel.yaml
+++ b/apps/docs/public/welcome-channel.yaml
@@ -68,7 +68,7 @@
Support: https://support.modrinth.com
Status page: https://status.modrinth.com
Roadmap: https://roadmap.modrinth.com
- Blog and newsletter: https://blog.modrinth.com/subscribe?utm_medium=social&utm_source=discord&utm_campaign=welcome
+ Blog and newsletter: https://modrinth.com/news
API documentation: https://docs.modrinth.com
Modrinth source code: https://github.com/modrinth
Help translate Modrinth: https://crowdin.com/project/modrinth
diff --git a/apps/docs/src/content/docs/contributing/labrinth.md b/apps/docs/src/content/docs/contributing/labrinth.md
index 309e5d1a4..f29c71255 100644
--- a/apps/docs/src/content/docs/contributing/labrinth.md
+++ b/apps/docs/src/content/docs/contributing/labrinth.md
@@ -7,7 +7,7 @@ This project is part of our [monorepo](https://github.com/modrinth/code). You ca
[labrinth] is the Rust-based backend serving Modrinth's API with the help of the [Actix](https://actix.rs) framework. To get started with a labrinth instance, install docker, docker-compose (which comes with Docker), and [Rust]. The initial startup can be done simply with the command `docker-compose up`, or with `docker compose up` (Compose V2 and later). That will deploy a PostgreSQL database on port 5432 and a MeiliSearch instance on port 7700. To run the API itself, you'll need to use the `cargo run` command, this will deploy the API on port 8000.
-Now, you'll have to install the sqlx CLI, which can be done with cargo:
+To get a basic configuration, copy the `.env.local` file to `.env`. Now, you'll have to install the sqlx CLI, which can be done with cargo:
```bash
cargo install --git https://github.com/launchbadge/sqlx sqlx-cli --no-default-features --features postgres,rustls
@@ -53,8 +53,12 @@ If you would like 'placeholder_category' to be marked as supporting modpacks too
INSERT INTO categories VALUES (0, 'placeholder_category', 2); -- modloader id, supported type id
```
+You can find more example SQL statements for seeding the database in the `apps/labrinth/tests/files/dummy_data.sql` file.
+
The majority of configuration is done at runtime using [dotenvy](https://crates.io/crates/dotenvy) and the `.env` file. Each of the variables and what they do can be found in the dropdown below. Additionally, there are three command line options that can be used to specify to MeiliSearch what you want to do.
+During development, you might notice that changes made directly to entities in the PostgreSQL database do not seem to take effect. This is often because the Redis cache still holds outdated data. To ensure your updates are reflected, clear the cache by e.g. running `redis-cli FLUSHALL`, which will force Labrinth to fetch the latest data from the database the next time it is needed.
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/skin/UploadSkinModal.vue b/apps/app-frontend/src/components/ui/skin/UploadSkinModal.vue
new file mode 100644
index 000000000..818922eff
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/skin/UploadSkinModal.vue
@@ -0,0 +1,140 @@
+
+
+
+ Upload skin texture
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/InstanceItem.vue b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
new file mode 100644
index 000000000..12fc67468
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/InstanceItem.vue
@@ -0,0 +1,230 @@
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
new file mode 100644
index 000000000..a960f805f
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/RecentWorldsList.vue
@@ -0,0 +1,304 @@
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
new file mode 100644
index 000000000..00fab96ec
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/AddServerModal.vue
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
new file mode 100644
index 000000000..5e03bbb89
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/EditServerModal.vue
@@ -0,0 +1,118 @@
+
+
+
+
+ {{ formatMessage(titleMessage) }}
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
new file mode 100644
index 000000000..5a01d93ec
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/EditSingleplayerWorldModal.vue
@@ -0,0 +1,129 @@
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue b/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue
new file mode 100644
index 000000000..024072b57
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/modal/HideFromHomeOption.vue
@@ -0,0 +1,18 @@
+
+
+ {
+ await this.setupModel(modelUrl, textureUrl, capeModelUrl, capeUrl)
+
+ const headPart = this.currentModel!.getObjectByName('Head')
+ let lookAtTarget: [number, number, number]
+
+ if (headPart) {
+ const headPosition = new THREE.Vector3()
+ headPart.getWorldPosition(headPosition)
+ lookAtTarget = [headPosition.x, headPosition.y - 0.3, headPosition.z]
+ } else {
+ throw new Error("Failed to find 'Head' object in model.")
+ }
+
+ const frontCameraPos: [number, number, number] = [-1.3, 1, 6.3]
+ const backCameraPos: [number, number, number] = [-1.3, 1, -2.5]
+
+ const forwards = await this.renderView(frontCameraPos, lookAtTarget)
+ const backwards = await this.renderView(backCameraPos, lookAtTarget)
+
+ return { forwards, backwards }
+ }
+
+ private async renderView(
+ cameraPosition: [number, number, number],
+ lookAtPosition: [number, number, number],
+ ): Promise {
+ this.camera.position.set(...cameraPosition)
+ this.camera.lookAt(...lookAtPosition)
+
+ this.renderer.render(this.scene, this.camera)
+
+ return new Promise((resolve, reject) => {
+ this.renderer.domElement.toBlob((blob) => {
+ if (blob) {
+ const url = URL.createObjectURL(blob)
+ resolve(url)
+ } else {
+ reject(new Error('Failed to create blob from canvas'))
+ }
+ }, 'image/png')
+ })
+ }
+
+ private async setupModel(
+ modelUrl: string,
+ textureUrl: string,
+ capeModelUrl?: string,
+ capeUrl?: string,
+ ): Promise {
+ if (this.currentModel) {
+ this.scene.remove(this.currentModel)
+ }
+
+ const { model } = await setupSkinModel(modelUrl, textureUrl, capeModelUrl, capeUrl)
+
+ const group = new THREE.Group()
+ group.add(model)
+ group.position.set(0, 0.3, 1.95)
+ group.scale.set(0.8, 0.8, 0.8)
+
+ this.scene.add(group)
+ this.currentModel = group
+ }
+
+ public dispose(): void {
+ this.renderer.dispose()
+ disposeCaches()
+ }
+}
+
+function getModelUrlForVariant(variant: string): string {
+ switch (variant) {
+ case 'SLIM':
+ return SlimPlayerModel
+ case 'CLASSIC':
+ case 'UNKNOWN':
+ default:
+ return ClassicPlayerModel
+ }
+}
+
+export const map = reactive(new Map())
+export const headMap = reactive(new Map())
+const DEBUG_MODE = false
+
+export async function cleanupUnusedPreviews(skins: Skin[]): Promise {
+ const validKeys = new Set()
+ const validHeadKeys = new Set()
+
+ for (const skin of skins) {
+ const key = `${skin.texture_key}+${skin.variant}+${skin.cape_id ?? 'no-cape'}`
+ const headKey = `${skin.texture_key}-head`
+ validKeys.add(key)
+ validHeadKeys.add(headKey)
+ }
+
+ try {
+ await skinPreviewStorage.cleanupInvalidKeys(validKeys)
+ await skinPreviewStorage.cleanupInvalidKeys(validHeadKeys)
+ } catch (error) {
+ console.warn('Failed to cleanup unused skin previews:', error)
+ }
+}
+
+export async function generatePlayerHeadBlob(skinUrl: string, size: number = 64): Promise {
+ return new Promise((resolve, reject) => {
+ const img = new Image()
+ img.crossOrigin = 'anonymous'
+
+ img.onload = () => {
+ try {
+ const sourceCanvas = document.createElement('canvas')
+ const sourceCtx = sourceCanvas.getContext('2d')
+
+ if (!sourceCtx) {
+ throw new Error('Could not get 2D context from source canvas')
+ }
+
+ sourceCanvas.width = img.width
+ sourceCanvas.height = img.height
+
+ sourceCtx.drawImage(img, 0, 0)
+
+ const outputCanvas = document.createElement('canvas')
+ const outputCtx = outputCanvas.getContext('2d')
+
+ if (!outputCtx) {
+ throw new Error('Could not get 2D context from output canvas')
+ }
+
+ outputCanvas.width = size
+ outputCanvas.height = size
+
+ outputCtx.imageSmoothingEnabled = false
+
+ const headImageData = sourceCtx.getImageData(8, 8, 8, 8)
+
+ const headCanvas = document.createElement('canvas')
+ const headCtx = headCanvas.getContext('2d')
+
+ if (!headCtx) {
+ throw new Error('Could not get 2D context from head canvas')
+ }
+
+ headCanvas.width = 8
+ headCanvas.height = 8
+ headCtx.putImageData(headImageData, 0, 0)
+
+ outputCtx.drawImage(headCanvas, 0, 0, 8, 8, 0, 0, size, size)
+
+ const hatImageData = sourceCtx.getImageData(40, 8, 8, 8)
+
+ const hatCanvas = document.createElement('canvas')
+ const hatCtx = hatCanvas.getContext('2d')
+
+ if (!hatCtx) {
+ throw new Error('Could not get 2D context from hat canvas')
+ }
+
+ hatCanvas.width = 8
+ hatCanvas.height = 8
+ hatCtx.putImageData(hatImageData, 0, 0)
+
+ const hatPixels = hatImageData.data
+ let hasHat = false
+
+ for (let i = 3; i < hatPixels.length; i += 4) {
+ if (hatPixels[i] > 0) {
+ hasHat = true
+ break
+ }
+ }
+
+ if (hasHat) {
+ outputCtx.drawImage(hatCanvas, 0, 0, 8, 8, 0, 0, size, size)
+ }
+
+ outputCanvas.toBlob((blob) => {
+ if (blob) {
+ resolve(blob)
+ } else {
+ reject(new Error('Failed to create blob from canvas'))
+ }
+ }, 'image/png')
+ } catch (error) {
+ reject(error)
+ }
+ }
+
+ img.onerror = () => {
+ reject(new Error('Failed to load skin texture image'))
+ }
+
+ img.src = skinUrl
+ })
+}
+
+async function generateHeadRender(skin: Skin): Promise {
+ const headKey = `${skin.texture_key}-head`
+
+ if (headMap.has(headKey)) {
+ if (DEBUG_MODE) {
+ const url = headMap.get(headKey)!
+ URL.revokeObjectURL(url)
+ headMap.delete(headKey)
+ } else {
+ return headMap.get(headKey)!
+ }
+ }
+
+ try {
+ const cached = await skinPreviewStorage.retrieve(headKey)
+ if (cached && typeof cached === 'string') {
+ headMap.set(headKey, cached)
+ return cached
+ }
+ } catch (error) {
+ console.warn('Failed to retrieve cached head render:', error)
+ }
+
+ const skinUrl = await get_normalized_skin_texture(skin)
+ const headBlob = await generatePlayerHeadBlob(skinUrl, 64)
+ const headUrl = URL.createObjectURL(headBlob)
+
+ headMap.set(headKey, headUrl)
+
+ try {
+ // @ts-expect-error - skinPreviewStorage.store expects a RenderResult, but we are storing a string url.
+ await skinPreviewStorage.store(headKey, headUrl)
+ } catch (error) {
+ console.warn('Failed to store head render in persistent storage:', error)
+ }
+
+ return headUrl
+}
+
+export async function getPlayerHeadUrl(skin: Skin): Promise {
+ return await generateHeadRender(skin)
+}
+
+export async function generateSkinPreviews(skins: Skin[], capes: Cape[]): Promise {
+ const renderer = new BatchSkinRenderer()
+
+ try {
+ for (const skin of skins) {
+ const key = `${skin.texture_key}+${skin.variant}+${skin.cape_id ?? 'no-cape'}`
+
+ if (map.has(key)) {
+ if (DEBUG_MODE) {
+ const result = map.get(key)!
+ URL.revokeObjectURL(result.forwards)
+ URL.revokeObjectURL(result.backwards)
+ map.delete(key)
+ } else continue
+ }
+
+ try {
+ const cached = await skinPreviewStorage.retrieve(key)
+ if (cached) {
+ map.set(key, cached)
+ continue
+ }
+ } catch (error) {
+ console.warn('Failed to retrieve cached skin preview:', error)
+ }
+
+ let variant = skin.variant
+ if (variant === 'UNKNOWN') {
+ try {
+ variant = await determineModelType(skin.texture)
+ } catch (error) {
+ console.error(`Failed to determine model type for skin ${key}:`, error)
+ variant = 'CLASSIC'
+ }
+ }
+
+ const modelUrl = getModelUrlForVariant(variant)
+ const cape: Cape | undefined = capes.find((_cape) => _cape.id === skin.cape_id)
+ const renderResult = await renderer.renderSkin(
+ await get_normalized_skin_texture(skin),
+ modelUrl,
+ cape?.texture,
+ CapeModel,
+ )
+
+ map.set(key, renderResult)
+
+ try {
+ await skinPreviewStorage.store(key, renderResult)
+ } catch (error) {
+ console.warn('Failed to store skin preview in persistent storage:', error)
+ }
+
+ await generateHeadRender(skin)
+ }
+ } finally {
+ renderer.dispose()
+ await cleanupUnusedPreviews(skins)
+ }
+}
diff --git a/apps/app-frontend/src/helpers/settings.js b/apps/app-frontend/src/helpers/settings.js
deleted file mode 100644
index b27bfe90b..000000000
--- a/apps/app-frontend/src/helpers/settings.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * All theseus API calls return serialized values (both return values and errors);
- * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
- * and deserialized into a usable JS object.
- */
-import { invoke } from '@tauri-apps/api/core'
-
-// Settings object
-/*
-
-Settings {
- "memory": MemorySettings,
- "game_resolution": [int int],
- "custom_java_args": [String ...],
- "custom_env_args" : [(string, string) ... ]>,
- "java_globals": Hash of (string, Path),
- "default_user": Uuid string (can be null),
- "hooks": Hooks,
- "max_concurrent_downloads": uint,
- "version": u32,
- "collapsed_navigation": bool,
-}
-
-Memorysettings {
- "min": u32, can be null,
- "max": u32,
-}
-
-*/
-
-// Get full settings object
-export async function get() {
- return await invoke('plugin:settings|settings_get')
-}
-
-// Set full settings object
-export async function set(settings) {
- return await invoke('plugin:settings|settings_set', { settings })
-}
-
-export async function cancel_directory_change() {
- return await invoke('plugin:settings|cancel_directory_change')
-}
diff --git a/apps/app-frontend/src/helpers/settings.ts b/apps/app-frontend/src/helpers/settings.ts
new file mode 100644
index 000000000..c256575a4
--- /dev/null
+++ b/apps/app-frontend/src/helpers/settings.ts
@@ -0,0 +1,79 @@
+/**
+ * All theseus API calls return serialized values (both return values and errors);
+ * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
+ * and deserialized into a usable JS object.
+ */
+import { invoke } from '@tauri-apps/api/core'
+import type { ColorTheme, FeatureFlag } from '@/store/theme.ts'
+import type { Hooks, MemorySettings, WindowSize } from '@/helpers/types'
+
+// Settings object
+/*
+
+Settings {
+ "memory": MemorySettings,
+ "game_resolution": [int int],
+ "custom_java_args": [String ...],
+ "custom_env_args" : [(string, string) ... ]>,
+ "java_globals": Hash of (string, Path),
+ "default_user": Uuid string (can be null),
+ "hooks": Hooks,
+ "max_concurrent_downloads": uint,
+ "version": u32,
+ "collapsed_navigation": bool,
+}
+
+Memorysettings {
+ "min": u32, can be null,
+ "max": u32,
+}
+
+*/
+
+export type AppSettings = {
+ max_concurrent_downloads: number
+ max_concurrent_writes: number
+
+ theme: ColorTheme
+ default_page: 'home' | 'library'
+ collapsed_navigation: boolean
+ hide_nametag_skins_page: boolean
+ advanced_rendering: boolean
+ native_decorations: boolean
+ toggle_sidebar: boolean
+
+ telemetry: boolean
+ discord_rpc: boolean
+ personalized_ads: boolean
+
+ onboarded: boolean
+
+ extra_launch_args: string[]
+ custom_env_vars: [string, string][]
+ memory: MemorySettings
+ force_fullscreen: boolean
+ game_resolution: WindowSize
+ hide_on_process_start: boolean
+ hooks: Hooks
+
+ custom_dir?: string | null
+ prev_custom_dir?: string | null
+ migrated: boolean
+
+ developer_mode: boolean
+ feature_flags: Record
+}
+
+// Get full settings object
+export async function get() {
+ return (await invoke('plugin:settings|settings_get')) as AppSettings
+}
+
+// Set full settings object
+export async function set(settings: AppSettings) {
+ return await invoke('plugin:settings|settings_set', { settings })
+}
+
+export async function cancel_directory_change(): Promise {
+ return await invoke('plugin:settings|cancel_directory_change')
+}
diff --git a/apps/app-frontend/src/helpers/skins.ts b/apps/app-frontend/src/helpers/skins.ts
new file mode 100644
index 000000000..28a29ba1a
--- /dev/null
+++ b/apps/app-frontend/src/helpers/skins.ts
@@ -0,0 +1,167 @@
+import { invoke } from '@tauri-apps/api/core'
+import { handleError } from '@/store/notifications'
+import { arrayBufferToBase64 } from '@modrinth/utils'
+
+export interface Cape {
+ id: string
+ name: string
+ texture: string
+ is_default: boolean
+ is_equipped: boolean
+}
+
+export type SkinModel = 'CLASSIC' | 'SLIM' | 'UNKNOWN'
+export type SkinSource = 'default' | 'custom_external' | 'custom'
+
+export interface Skin {
+ texture_key: string
+ name?: string
+ variant: SkinModel
+ cape_id?: string
+ texture: string
+ source: SkinSource
+ is_equipped: boolean
+}
+
+export const DEFAULT_MODEL_SORTING = ['Steve', 'Alex'] as string[]
+
+export const DEFAULT_MODELS: Record = {
+ Steve: 'CLASSIC',
+ Alex: 'SLIM',
+ Zuri: 'CLASSIC',
+ Sunny: 'CLASSIC',
+ Noor: 'SLIM',
+ Makena: 'SLIM',
+ Kai: 'CLASSIC',
+ Efe: 'SLIM',
+ Ari: 'CLASSIC',
+}
+
+export function filterSavedSkins(list: Skin[]) {
+ const customSkins = list.filter((s) => s.source !== 'default')
+ fixUnknownSkins(customSkins).catch(handleError)
+ return customSkins
+}
+
+export async function determineModelType(texture: string): Promise<'SLIM' | 'CLASSIC'> {
+ return new Promise((resolve, reject) => {
+ const canvas = document.createElement('canvas')
+ const context = canvas.getContext('2d')
+
+ if (!context) {
+ return reject(new Error('Failed to create canvas rendering context.'))
+ }
+
+ const image = new Image()
+ image.crossOrigin = 'anonymous'
+ image.src = texture
+
+ image.onload = () => {
+ canvas.width = image.width
+ canvas.height = image.height
+
+ context.drawImage(image, 0, 0)
+
+ const armX = 44
+ const armY = 16
+ const armWidth = 4
+ const armHeight = 12
+
+ const imageData = context.getImageData(armX, armY, armWidth, armHeight).data
+
+ for (let y = 0; y < armHeight; y++) {
+ const alphaIndex = (3 + y * armWidth) * 4 + 3
+ if (imageData[alphaIndex] !== 0) {
+ resolve('CLASSIC')
+ return
+ }
+ }
+
+ canvas.remove()
+ resolve('SLIM')
+ }
+
+ image.onerror = () => {
+ canvas.remove()
+ reject(new Error('Failed to load the image.'))
+ }
+ })
+}
+
+export async function fixUnknownSkins(list: Skin[]) {
+ const unknownSkins = list.filter((s) => s.variant === 'UNKNOWN')
+ for (const unknownSkin of unknownSkins) {
+ unknownSkin.variant = await determineModelType(unknownSkin.texture)
+ }
+}
+
+export function filterDefaultSkins(list: Skin[]) {
+ return list
+ .filter(
+ (s) =>
+ s.source === 'default' &&
+ (!s.name || !(s.name in DEFAULT_MODELS) || s.variant === DEFAULT_MODELS[s.name]),
+ )
+ .sort((a, b) => {
+ const aIndex = a.name ? DEFAULT_MODEL_SORTING.indexOf(a.name) : -1
+ const bIndex = b.name ? DEFAULT_MODEL_SORTING.indexOf(b.name) : -1
+ return (aIndex === -1 ? Infinity : aIndex) - (bIndex === -1 ? Infinity : bIndex)
+ })
+}
+
+export async function get_available_capes(): Promise {
+ return invoke('plugin:minecraft-skins|get_available_capes', {})
+}
+
+export async function get_available_skins(): Promise {
+ return invoke('plugin:minecraft-skins|get_available_skins', {})
+}
+
+export async function add_and_equip_custom_skin(
+ textureBlob: Uint8Array,
+ variant: SkinModel,
+ capeOverride?: Cape,
+): Promise {
+ await invoke('plugin:minecraft-skins|add_and_equip_custom_skin', {
+ textureBlob,
+ variant,
+ capeOverride,
+ })
+}
+
+export async function set_default_cape(cape?: Cape): Promise {
+ await invoke('plugin:minecraft-skins|set_default_cape', {
+ cape,
+ })
+}
+
+export async function equip_skin(skin: Skin): Promise {
+ await invoke('plugin:minecraft-skins|equip_skin', {
+ skin,
+ })
+}
+
+export async function remove_custom_skin(skin: Skin): Promise {
+ await invoke('plugin:minecraft-skins|remove_custom_skin', {
+ skin,
+ })
+}
+
+export async function get_normalized_skin_texture(skin: Skin): Promise {
+ const data = await normalize_skin_texture(skin.texture)
+ const base64 = arrayBufferToBase64(data)
+ return `data:image/png;base64,${base64}`
+}
+
+export async function normalize_skin_texture(texture: Uint8Array | string): Promise {
+ return await invoke('plugin:minecraft-skins|normalize_skin_texture', { texture })
+}
+
+export async function unequip_skin(): Promise {
+ await invoke('plugin:minecraft-skins|unequip_skin')
+}
+
+export async function get_dragged_skin_data(path: string): Promise {
+ const data = await invoke('plugin:minecraft-skins|get_dragged_skin_data', { path })
+ return new Uint8Array(data)
+}
diff --git a/apps/app-frontend/src/helpers/storage/skin-preview-storage.ts b/apps/app-frontend/src/helpers/storage/skin-preview-storage.ts
new file mode 100644
index 000000000..2e4990850
--- /dev/null
+++ b/apps/app-frontend/src/helpers/storage/skin-preview-storage.ts
@@ -0,0 +1,118 @@
+import type { RenderResult } from '../rendering/batch-skin-renderer'
+
+interface StoredPreview {
+ forwards: Blob
+ backwards: Blob
+ timestamp: number
+}
+
+export class SkinPreviewStorage {
+ private dbName = 'skin-previews'
+ private version = 1
+ private db: IDBDatabase | null = null
+
+ async init(): Promise {
+ return new Promise((resolve, reject) => {
+ const request = indexedDB.open(this.dbName, this.version)
+
+ request.onerror = () => reject(request.error)
+ request.onsuccess = () => {
+ this.db = request.result
+ resolve()
+ }
+
+ request.onupgradeneeded = () => {
+ const db = request.result
+ if (!db.objectStoreNames.contains('previews')) {
+ db.createObjectStore('previews')
+ }
+ }
+ })
+ }
+
+ async store(key: string, result: RenderResult): Promise {
+ if (!this.db) await this.init()
+
+ const forwardsBlob = await fetch(result.forwards).then((r) => r.blob())
+ const backwardsBlob = await fetch(result.backwards).then((r) => r.blob())
+
+ const transaction = this.db!.transaction(['previews'], 'readwrite')
+ const store = transaction.objectStore('previews')
+
+ const storedPreview: StoredPreview = {
+ forwards: forwardsBlob,
+ backwards: backwardsBlob,
+ timestamp: Date.now(),
+ }
+
+ return new Promise((resolve, reject) => {
+ const request = store.put(storedPreview, key)
+
+ request.onsuccess = () => resolve()
+ request.onerror = () => reject(request.error)
+ })
+ }
+
+ async retrieve(key: string): Promise {
+ if (!this.db) await this.init()
+
+ const transaction = this.db!.transaction(['previews'], 'readonly')
+ const store = transaction.objectStore('previews')
+
+ return new Promise((resolve, reject) => {
+ const request = store.get(key)
+
+ request.onsuccess = () => {
+ const result = request.result as StoredPreview | undefined
+
+ if (!result) {
+ resolve(null)
+ return
+ }
+
+ const forwards = URL.createObjectURL(result.forwards)
+ const backwards = URL.createObjectURL(result.backwards)
+ resolve({ forwards, backwards })
+ }
+ request.onerror = () => reject(request.error)
+ })
+ }
+
+ async cleanupInvalidKeys(validKeys: Set): Promise {
+ if (!this.db) await this.init()
+
+ const transaction = this.db!.transaction(['previews'], 'readwrite')
+ const store = transaction.objectStore('previews')
+ let deletedCount = 0
+
+ return new Promise((resolve, reject) => {
+ const request = store.openCursor()
+
+ request.onsuccess = (event) => {
+ const cursor = (event.target as IDBRequest).result
+
+ if (cursor) {
+ const key = cursor.primaryKey as string
+
+ if (!validKeys.has(key)) {
+ const deleteRequest = cursor.delete()
+ deleteRequest.onsuccess = () => {
+ deletedCount++
+ }
+ deleteRequest.onerror = () => {
+ console.warn('Failed to delete invalid entry:', key)
+ }
+ }
+
+ cursor.continue()
+ } else {
+ resolve(deletedCount)
+ }
+ }
+
+ request.onerror = () => reject(request.error)
+ })
+ }
+}
+
+export const skinPreviewStorage = new SkinPreviewStorage()
diff --git a/apps/app-frontend/src/helpers/types.d.ts b/apps/app-frontend/src/helpers/types.d.ts
index 1007744d0..aa60ec2f7 100644
--- a/apps/app-frontend/src/helpers/types.d.ts
+++ b/apps/app-frontend/src/helpers/types.d.ts
@@ -48,6 +48,32 @@ type LinkedData = {
type InstanceLoader = 'vanilla' | 'forge' | 'fabric' | 'quilt' | 'neoforge'
+type ContentFile = {
+ hash: string
+ file_name: string
+ size: number
+ metadata?: FileMetadata
+ update_version_id?: string
+ project_type: ContentFileProjectType
+}
+
+type FileMetadata = {
+ project_id: string
+ version_id: string
+}
+
+type ContentFileProjectType = 'mod' | 'datapack' | 'resourcepack' | 'shaderpack'
+
+type CacheBehaviour =
+ // Serve expired data. If fetch fails / launcher is offline, errors are ignored
+ | 'stale_while_revalidate_skip_offline'
+ // Serve expired data, revalidate in background
+ | 'stale_while_revalidate'
+ // Must revalidate if data is expired
+ | 'must_revalidate'
+ // Ignore cache- always fetch updated data from origin
+ | 'bypass'
+
type MemorySettings = {
maximum: number
}
@@ -88,6 +114,7 @@ type AppSettings = {
collapsed_navigation: boolean
advanced_rendering: boolean
native_decorations: boolean
+ worlds_in_home: boolean
telemetry: boolean
discord_rpc: boolean
diff --git a/apps/app-frontend/src/helpers/update.js b/apps/app-frontend/src/helpers/update.js
index 223689512..6f3d87a13 100644
--- a/apps/app-frontend/src/helpers/update.js
+++ b/apps/app-frontend/src/helpers/update.js
@@ -2,23 +2,19 @@ import { ref } from 'vue'
import { getVersion } from '@tauri-apps/api/app'
import { getArtifact, getOS } from '@/helpers/utils.js'
-
export const allowState = ref(false)
export const installState = ref(false)
export const updateState = ref(false)
-export const latestBetaCommitTruncatedSha = ref('')
-export const latestBetaCommitLink = ref('')
-export const launcherUrl = 'https://www.astralium.su/get/ar'
-const os = ref('')
-const releaseLink = `https://api.github.com/repos/DIDIRUS4/AstralRinth/releases/latest`
-const branchesLink = `https://api.github.com/repos/DIDIRUS4/AstralRinth/branches`
+const currentOS = ref('')
+const releaseLink = `https://git.astralium.su/api/v1/repos/didirus/AstralRinth/releases/latest`
const failedFetch = [`Failed to fetch remote releases:`, `Failed to fetch remote commits:`]
-const betaBranch = `beta` // Github repository beta branch
-const osNames = ['macos', 'windows', 'linux']
-const macExtension = `.dmg` // MacOS file type for download
-const windowsExtension = `.msi` // Windows file type for download
-const blacklistedBuilds = [
+
+const osList = ['macos', 'windows', 'linux']
+const macExtensionList = ['.app', '.dmg']
+const windowsExtensionList = ['.exe', '.msi']
+
+const blacklistPrefixes = [
`dev`,
`nightly`,
`dirty`,
@@ -28,149 +24,73 @@ const blacklistedBuilds = [
`dirty_nightly`,
] // This is blacklisted builds for download. For example, file.startsWith('dev') is not allowed.
-/**
- * Asynchronously fetches branches and their latest commit information from the specified URLs.
- *
- * @return {Promise} This function does not return anything directly but updates the latestBetaCommitTruncatedSha and latestBetaCommitLink values.
- */
-export async function getBranches() {
- fetch(branchesLink)
- .then(async (response) => {
- if (response.ok) {
- response.json().then((data) => {
- const branches = data.map((branch) => branch)
- branches.forEach((branch) => {
- fetch(branch.commit.url).then(async (data) => {
- if (data.ok) {
- data.json().then((data) => {
- const truncatedSha = data.sha.slice(0, 7)
- const commitLink = data.html_url
- if (branch.name.toLowerCase() == betaBranch) {
- latestBetaCommitTruncatedSha.value = truncatedSha
- latestBetaCommitLink.value = commitLink
- }
- })
- } else {
- throw new Error(data.status)
- }
- })
- })
- })
- } else {
- throw new Error(response.status)
- }
- })
- .catch((error) => {
- latestBetaCommitTruncatedSha.value = error.message
- latestBetaCommitLink.value = undefined
- console.error(failedFetch[1], error)
- })
-}
+export async function getRemote(isDownloadState) {
+ var releaseData = null;
+ var result = false;
+ try {
+ const response = await fetch(releaseLink);
+ if (!response.ok) {
+ throw new Error(response.status);
+ }
+ const remoteData = await response.json();
+ currentOS.value = await getOS();
+ const remoteLatestReleaseTag = remoteData.tag_name;
+ releaseData = document.getElementById('releaseData');
+ const remoteVersion = releaseData ? (releaseData.textContent = remoteLatestReleaseTag) : remoteLatestReleaseTag;
-/**
- * Asynchronous function to get remote data and handle updates and downloads.
- *
- * @param {boolean} elementIdBool - Indicates whether to disable an element ID.
- * @param {boolean} downloadArtifactBool - Indicates whether to download an artifact.
- */
-export async function getRemote(elementIdBool, downloadArtifactBool) {
- fetch(releaseLink)
- .then((response) => {
- if (!response.ok) {
- throw new Error(response.status)
- }
- return response.json()
- })
- .then(async (data) => {
- os.value = await getOS()
- const latestRelease = data.name
- let remoteVersion = undefined
+ if (osList.includes(currentOS.value.toLowerCase())) {
+ const localVersion = await getVersion();
+ const isUpdateAvailable = !remoteVersion.includes(localVersion);
- if (!elementIdBool) {
- const releaseData = document.getElementById('releaseData')
- if (releaseData == null) {
- console.error('Release data element not found.')
- return false
- }
- releaseData.textContent = latestRelease
- remoteVersion = `${releaseData.textContent}`
- } else {
- remoteVersion = latestRelease
- }
- if (osNames.includes(os.value.toLowerCase())) {
- if (remoteVersion.startsWith('v' + await getVersion())) {
- updateState.value = false
- allowState.value = false
- } else {
- updateState.value = true
- allowState.value = true
- }
- } else {
- updateState.value = false
- allowState.value = false
- }
- console.log('Update available state is', updateState.value)
- console.log('Remote version is', remoteVersion)
- console.log('Local version is', await getVersion())
- console.log('Operating System is', os.value)
+ updateState.value = isUpdateAvailable;
+ allowState.value = isUpdateAvailable;
+ } else {
+ updateState.value = false;
+ allowState.value = false;
+ }
+ if (isDownloadState) {
+ installState.value = true;
+ const builds = remoteData.assets;
+ const fileName = getInstaller(getExtension(), builds);
+ result = fileName ? await getArtifact(fileName[1], fileName[0], currentOS.value, true) : false;
+ installState.value = false;
+ }
- if (downloadArtifactBool) {
- installState.value = true
- const builds = data.assets
- const fileName = getInstaller(getExtension(), builds)
- if (fileName != null) {
- await getArtifact(fileName[1], fileName[0], os.value, true)
- }
- installState.value = false
+ console.log('Update available state is', updateState.value);
+ console.log('Remote version is', remoteVersion);
+ console.log('Local version is', await getVersion());
+ console.log('Operating System is', currentOS.value);
+ return result;
+ } catch (error) {
+ console.error(failedFetch[0], error);
+ if (!releaseData) {
+ const errorData = document.getElementById('releaseData');
+ if (errorData) {
+ errorData.textContent = `${error.message}`;
}
- })
- .catch((error) => {
- console.error(failedFetch[0], error)
- if (!elementIdBool) {
- const errorData = document.getElementById('releaseData')
- if (errorData) {
- errorData.textContent = `${error.message}`
- }
- updateState.value = false
- allowState.value = false
- installState.value = false
- }
- })
-}
-
-/**
- * Retrieves the installer for a specific operating system.
- *
- * @param {string} osExtension - The file extension of the installer.
- * @param {Array} builds - The list of builds.
- * @return {Array|null} An array containing the installer name and URL if found, or null if not found.
- */
-function getInstaller(osExtension, builds) {
- for (let i of builds) {
- let blacklistedItem = false
- blacklistedBuilds.forEach((item) => {
- if (i.name.startsWith(item)) {
- return (blacklistedItem = true)
- }
- })
- if (i.name.endsWith(osExtension) && !blacklistedItem) {
- console.log(i.browser_download_url)
- return [i.name, i.browser_download_url]
+ updateState.value = false;
+ allowState.value = false;
+ installState.value = false;
}
}
- return null
}
-/**
- * A function to get the extension based on the operating system.
- *
- * @return {string} The extension based on the operating system.
- */
-function getExtension() {
- if (os.value.toLowerCase() == osNames[0]) {
- return macExtension
- } else if (os.value.toLowerCase() == osNames[1]) {
- return windowsExtension
+function getInstaller(osExtension, builds) {
+ console.log(osExtension, builds)
+ for (const build of builds) {
+ if (blacklistPrefixes.some(prefix => build.name.startsWith(prefix))) {
+ continue;
+ }
+ if (osExtension.some(ext => build.name.endsWith(ext))) {
+ console.log(build.name, build.browser_download_url);
+ return [build.name, build.browser_download_url];
+ }
}
- return null
-}
\ No newline at end of file
+ return null;
+}
+
+function getExtension() {
+ return osList.find(osName => osName === currentOS.value.toLowerCase())?.endsWith('macos')
+ ? macExtensionList
+ : windowsExtensionList;
+}
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 53256838b..a6353504d 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -42,6 +42,13 @@ export async function restartApp() {
return await invoke('restart_app')
}
+/**
+ * @deprecated This method is no longer needed, and just returns its parameter
+ */
+export function sanitizePotentialFileUrl(url) {
+ return url
+}
+
export const releaseColor = (releaseType) => {
switch (releaseType) {
case 'release':
@@ -54,3 +61,7 @@ export const releaseColor = (releaseType) => {
return ''
}
}
+
+export async function copyToClipboard(text) {
+ await navigator.clipboard.writeText(text)
+}
diff --git a/apps/app-frontend/src/helpers/worlds.ts b/apps/app-frontend/src/helpers/worlds.ts
new file mode 100644
index 000000000..89f98d7d7
--- /dev/null
+++ b/apps/app-frontend/src/helpers/worlds.ts
@@ -0,0 +1,327 @@
+import { invoke } from '@tauri-apps/api/core'
+import { get_full_path } from '@/helpers/profile'
+import { openPath } from '@/helpers/utils'
+import { autoToHTML } from '@geometrically/minecraft-motd-parser'
+import dayjs from 'dayjs'
+import type { GameVersion } from '@modrinth/ui'
+
+type BaseWorld = {
+ name: string
+ last_played?: string
+ icon?: string
+ display_status: DisplayStatus
+ type: WorldType
+}
+
+export type WorldType = 'singleplayer' | 'server'
+export type DisplayStatus = 'normal' | 'hidden' | 'favorite'
+
+export type SingleplayerWorld = BaseWorld & {
+ type: 'singleplayer'
+ path: string
+ game_mode: SingleplayerGameMode
+ hardcore: boolean
+ locked: boolean
+}
+
+export type ServerWorld = BaseWorld & {
+ type: 'server'
+ index: number
+ address: string
+ pack_status: ServerPackStatus
+}
+
+export type World = SingleplayerWorld | ServerWorld
+
+export type WorldWithProfile = {
+ profile: string
+} & World
+
+export type SingleplayerGameMode = 'survival' | 'creative' | 'adventure' | 'spectator'
+export type ServerPackStatus = 'enabled' | 'disabled' | 'prompt'
+
+export type ServerStatus = {
+ // https://minecraft.wiki/w/Text_component_format
+ description?: string | Chat
+ players?: {
+ max: number
+ online: number
+ sample: { name: string; id: string }[]
+ }
+ version?: {
+ name: string
+ protocol: number
+ }
+ favicon?: string
+ enforces_secure_chat: boolean
+ ping?: number
+}
+
+export interface Chat {
+ text: string
+ bold: boolean
+ italic: boolean
+ underlined: boolean
+ strikethrough: boolean
+ obfuscated: boolean
+ color?: string
+ extra: Chat[]
+}
+
+export type ServerData = {
+ refreshing: boolean
+ status?: ServerStatus
+ rawMotd?: string | Chat
+ renderedMotd?: string
+}
+
+export async function get_recent_worlds(
+ limit: number,
+ displayStatuses?: DisplayStatus[],
+): Promise {
+ return await invoke('plugin:worlds|get_recent_worlds', { limit, displayStatuses })
+}
+
+export async function get_profile_worlds(path: string): Promise {
+ return await invoke('plugin:worlds|get_profile_worlds', { path })
+}
+
+export async function get_singleplayer_world(
+ instance: string,
+ world: string,
+): Promise {
+ return await invoke('plugin:worlds|get_singleplayer_world', { instance, world })
+}
+
+export async function set_world_display_status(
+ instance: string,
+ worldType: WorldType,
+ worldId: string,
+ displayStatus: DisplayStatus,
+): Promise {
+ return await invoke('plugin:worlds|set_world_display_status', {
+ instance,
+ worldType,
+ worldId,
+ displayStatus,
+ })
+}
+
+export async function rename_world(
+ instance: string,
+ world: string,
+ newName: string,
+): Promise {
+ return await invoke('plugin:worlds|rename_world', { instance, world, newName })
+}
+
+export async function reset_world_icon(instance: string, world: string): Promise {
+ return await invoke('plugin:worlds|reset_world_icon', { instance, world })
+}
+
+export async function backup_world(instance: string, world: string): Promise {
+ return await invoke('plugin:worlds|backup_world', { instance, world })
+}
+
+export async function delete_world(instance: string, world: string): Promise {
+ return await invoke('plugin:worlds|delete_world', { instance, world })
+}
+
+export async function add_server_to_profile(
+ path: string,
+ name: string,
+ address: string,
+ packStatus: ServerPackStatus,
+): Promise {
+ return await invoke('plugin:worlds|add_server_to_profile', { path, name, address, packStatus })
+}
+
+export async function edit_server_in_profile(
+ path: string,
+ index: number,
+ name: string,
+ address: string,
+ packStatus: ServerPackStatus,
+): Promise {
+ return await invoke('plugin:worlds|edit_server_in_profile', {
+ path,
+ index,
+ name,
+ address,
+ packStatus,
+ })
+}
+
+export async function remove_server_from_profile(path: string, index: number): Promise {
+ return await invoke('plugin:worlds|remove_server_from_profile', { path, index })
+}
+
+export async function get_profile_protocol_version(path: string): Promise {
+ return await invoke('plugin:worlds|get_profile_protocol_version', { path })
+}
+
+export async function get_server_status(
+ address: string,
+ protocolVersion: number | null = null,
+): Promise {
+ return await invoke('plugin:worlds|get_server_status', { address, protocolVersion })
+}
+
+export async function start_join_singleplayer_world(path: string, world: string): Promise {
+ return await invoke('plugin:worlds|start_join_singleplayer_world', { path, world })
+}
+
+export async function start_join_server(path: string, address: string): Promise {
+ return await invoke('plugin:worlds|start_join_server', { path, address })
+}
+
+export async function showWorldInFolder(instancePath: string, worldPath: string) {
+ const fullPath = await get_full_path(instancePath)
+ return await openPath(fullPath + '/saves/' + worldPath)
+}
+
+export function getWorldIdentifier(world: World) {
+ return world.type === 'singleplayer' ? world.path : world.address
+}
+
+export function sortWorlds(worlds: World[]) {
+ worlds.sort((a, b) => {
+ if (!a.last_played) {
+ return 1
+ }
+ if (!b.last_played) {
+ return -1
+ }
+ return dayjs(b.last_played).diff(dayjs(a.last_played))
+ })
+}
+
+export function isSingleplayerWorld(world: World): world is SingleplayerWorld {
+ return world.type === 'singleplayer'
+}
+
+export function isServerWorld(world: World): world is ServerWorld {
+ return world.type === 'server'
+}
+
+export async function refreshServerData(
+ serverData: ServerData,
+ protocolVersion: number | null,
+ address: string,
+): Promise {
+ serverData.refreshing = true
+ await get_server_status(address, protocolVersion)
+ .then((status) => {
+ serverData.status = status
+ if (status.description) {
+ serverData.rawMotd = status.description
+ serverData.renderedMotd = autoToHTML(status.description)
+ }
+ })
+ .catch((err) => {
+ console.error(`Refreshing addr: ${address}`, err)
+ })
+ .finally(() => {
+ serverData.refreshing = false
+ })
+}
+
+export async function refreshServers(
+ worlds: World[],
+ serverData: Record,
+ protocolVersion: number | null,
+) {
+ const servers = worlds.filter(isServerWorld)
+ servers.forEach((server) => {
+ if (!serverData[server.address]) {
+ serverData[server.address] = {
+ refreshing: true,
+ }
+ } else {
+ serverData[server.address].refreshing = true
+ }
+ })
+
+ // noinspection ES6MissingAwait - handled with .then by refreshServerData already
+ Promise.all(
+ Object.keys(serverData).map((address) =>
+ refreshServerData(serverData[address], protocolVersion, address),
+ ),
+ )
+}
+
+export async function refreshWorld(worlds: World[], instancePath: string, worldPath: string) {
+ const index = worlds.findIndex((w) => w.type === 'singleplayer' && w.path === worldPath)
+ const newWorld = await get_singleplayer_world(instancePath, worldPath)
+ if (index !== -1) {
+ worlds[index] = newWorld
+ } else {
+ console.info(`Adding new world at path: ${worldPath}.`)
+ worlds.push(newWorld)
+ }
+ sortWorlds(worlds)
+}
+
+export async function handleDefaultProfileUpdateEvent(
+ worlds: World[],
+ instancePath: string,
+ e: ProfileEvent,
+) {
+ if (e.event === 'world_updated') {
+ await refreshWorld(worlds, instancePath, e.world)
+ }
+
+ if (e.event === 'server_joined') {
+ const world = worlds.find(
+ (w) =>
+ w.type === 'server' &&
+ (w.address === `${e.host}:${e.port}` || (e.port == 25565 && w.address == e.host)),
+ )
+ if (world) {
+ world.last_played = e.timestamp
+ sortWorlds(worlds)
+ } else {
+ console.error(`Could not find world for server join event: ${e.host}:${e.port}`)
+ }
+ }
+}
+
+export async function refreshWorlds(instancePath: string): Promise {
+ const worlds = await get_profile_worlds(instancePath).catch((err) => {
+ console.error(`Error refreshing worlds for instance: ${instancePath}`, err)
+ })
+ if (worlds) {
+ sortWorlds(worlds)
+ }
+
+ return worlds ?? []
+}
+
+const FIRST_QUICK_PLAY_VERSION = '23w14a'
+
+export function hasQuickPlaySupport(gameVersions: GameVersion[], currentVersion: string) {
+ if (!gameVersions.length) {
+ return false
+ }
+
+ const versionIndex = gameVersions.findIndex((v) => v.version === currentVersion)
+ const targetIndex = gameVersions.findIndex((v) => v.version === FIRST_QUICK_PLAY_VERSION)
+
+ return versionIndex !== -1 && targetIndex !== -1 && versionIndex <= targetIndex
+}
+
+export type ProfileEvent = { profile_path_id: string } & (
+ | {
+ event: 'servers_updated'
+ }
+ | {
+ event: 'world_updated'
+ world: string
+ }
+ | {
+ event: 'server_joined'
+ host: string
+ port: number
+ timestamp: string
+ }
+)
diff --git a/apps/app-frontend/src/locales/en-US/index.json b/apps/app-frontend/src/locales/en-US/index.json
index 515e4e71a..fa2563da9 100644
--- a/apps/app-frontend/src/locales/en-US/index.json
+++ b/apps/app-frontend/src/locales/en-US/index.json
@@ -20,12 +20,60 @@
"app.settings.tabs.resource-management": {
"message": "Resource management"
},
+ "instance.add-server.add-and-play": {
+ "message": "Add and play"
+ },
+ "instance.add-server.add-server": {
+ "message": "Add server"
+ },
+ "instance.add-server.resource-pack.disabled": {
+ "message": "Disabled"
+ },
+ "instance.add-server.resource-pack.enabled": {
+ "message": "Enabled"
+ },
+ "instance.add-server.resource-pack.prompt": {
+ "message": "Prompt"
+ },
+ "instance.add-server.title": {
+ "message": "Add a server"
+ },
+ "instance.edit-server.title": {
+ "message": "Edit server"
+ },
+ "instance.edit-world.hide-from-home": {
+ "message": "Hide from the Home page"
+ },
+ "instance.edit-world.name": {
+ "message": "Name"
+ },
+ "instance.edit-world.placeholder-name": {
+ "message": "Minecraft World"
+ },
+ "instance.edit-world.reset-icon": {
+ "message": "Reset icon"
+ },
+ "instance.edit-world.title": {
+ "message": "Edit world"
+ },
"instance.filter.disabled": {
"message": "Disabled projects"
},
"instance.filter.updates-available": {
"message": "Updates available"
},
+ "instance.server-modal.address": {
+ "message": "Address"
+ },
+ "instance.server-modal.name": {
+ "message": "Name"
+ },
+ "instance.server-modal.placeholder-name": {
+ "message": "Minecraft Server"
+ },
+ "instance.server-modal.resource-pack": {
+ "message": "Resource pack"
+ },
"instance.settings.tabs.general": {
"message": "General"
},
@@ -308,6 +356,48 @@
"instance.settings.title": {
"message": "Settings"
},
+ "instance.worlds.a_minecraft_server": {
+ "message": "A Minecraft Server"
+ },
+ "instance.worlds.cant_connect": {
+ "message": "Can't connect to server"
+ },
+ "instance.worlds.copy_address": {
+ "message": "Copy address"
+ },
+ "instance.worlds.dont_show_on_home": {
+ "message": "Don't show on Home"
+ },
+ "instance.worlds.filter.available": {
+ "message": "Available"
+ },
+ "instance.worlds.game_already_open": {
+ "message": "Instance is already open"
+ },
+ "instance.worlds.hardcore": {
+ "message": "Hardcore mode"
+ },
+ "instance.worlds.no_quick_play": {
+ "message": "You can only jump straight into worlds on Minecraft 1.20+"
+ },
+ "instance.worlds.play_anyway": {
+ "message": "Play anyway"
+ },
+ "instance.worlds.play_instance": {
+ "message": "Play instance"
+ },
+ "instance.worlds.type.server": {
+ "message": "Server"
+ },
+ "instance.worlds.type.singleplayer": {
+ "message": "Singleplayer"
+ },
+ "instance.worlds.view_instance": {
+ "message": "View instance"
+ },
+ "instance.worlds.world_in_use": {
+ "message": "World is in use"
+ },
"search.filter.locked.instance": {
"message": "Provided by the instance"
},
diff --git a/apps/app-frontend/src/main.js b/apps/app-frontend/src/main.js
index ba6d3f49b..a37a7018f 100644
--- a/apps/app-frontend/src/main.js
+++ b/apps/app-frontend/src/main.js
@@ -6,6 +6,7 @@ import FloatingVue from 'floating-vue'
import 'floating-vue/dist/style.css'
import { createPlugin } from '@vintl/vintl/plugin'
import * as Sentry from '@sentry/vue'
+import { VueScanPlugin } from '@taijased/vue-render-tracker'
const VIntlPlugin = createPlugin({
controllerOpts: {
@@ -24,6 +25,13 @@ const VIntlPlugin = createPlugin({
injectInto: [],
})
+const vueScan = new VueScanPlugin({
+ enabled: false, // Enable or disable the tracker
+ showOverlay: true, // Show overlay to visualize renders
+ log: false, // Log render events to the console
+ playSound: false, // Play sound on each render
+})
+
const pinia = createPinia()
let app = createApp(App)
@@ -35,6 +43,7 @@ Sentry.init({
tracesSampleRate: 0.1,
})
+app.use(vueScan)
app.use(router)
app.use(pinia)
app.use(FloatingVue, {
diff --git a/apps/app-frontend/src/pages/Browse.vue b/apps/app-frontend/src/pages/Browse.vue
index a57b2fddd..f11e2c044 100644
--- a/apps/app-frontend/src/pages/Browse.vue
+++ b/apps/app-frontend/src/pages/Browse.vue
@@ -220,6 +220,7 @@ async function refreshSearch() {
}
}
results.value = rawResults.result
+ currentPage.value = Math.max(1, Math.min(pageCount.value, currentPage.value))
const persistentParams: LocationQuery = {}
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index fcf8607c4..30ea5d957 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -1,4 +1,4 @@
-
+
+
+
-
+
+
diff --git a/apps/app-frontend/src/pages/instance/Worlds.vue b/apps/app-frontend/src/pages/instance/Worlds.vue
new file mode 100644
index 000000000..8490269e3
--- /dev/null
+++ b/apps/app-frontend/src/pages/instance/Worlds.vue
@@ -0,0 +1,465 @@
+
+
-
@@ -96,7 +107,16 @@
+
+
+
+ Change cape
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ instance.name }}
+
+
+
+
+ ({{ loader }} {{ instance.game_version }})
+
+
+
+
+
+ {{
+ formatMessage(commonMessages.playedLabel, {
+ time: formatRelativeTime(last_played.toISOString?.()),
+ })
+ }}
+
+ Not played yet
+
+ •
+
+
+
+
+
+
+
+
+
+
+
+
+
+ View instance
+
+
+
+ {{ formatMessage(commonMessages.openFolderButton) }}
+
+
+
+
+
+
+ Jump back in
+
+
+ Jump back in
+
+
+
+
diff --git a/apps/app-frontend/src/components/ui/world/WorldItem.vue b/apps/app-frontend/src/components/ui/world/WorldItem.vue
new file mode 100644
index 000000000..f30aca810
--- /dev/null
+++ b/apps/app-frontend/src/components/ui/world/WorldItem.vue
@@ -0,0 +1,506 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ world.name }}
+
+
+
+ {{ formatMessage(commonMessages.singleplayerLabel) }}
+
+
+
+
+ Loading...
+
+
+
+
+
+ Incompatible version {{ serverStatus.version?.name }}
+
+
+
+
+
+
+ {{ formatNumber(serverStatus.players?.online, false) }} online
+
+
+
+
+
+
+ Offline
+
+
+
+
+ {{ player.name }}
+
+
+
+
+
+
+
+
+
+
+ {{
+ formatMessage(commonMessages.playedLabel, {
+ time: formatRelativeTime(dayjs(world.last_played).toISOString()),
+ })
+ }}
+
+ Not played yet
+
+
+ •
+
+
+
+
+ {{ formatMessage(commonMessages.loadingLabel) }}
+
+
+
+
+ {{ formatMessage(messages.cantConnect) }}
+
+
+ {{ formatMessage(messages.aMinecraftServer) }}
+
+
+
+
+
+ {{ formatMessage(messages.hardcore) }}
+
+
+
+ {{ formatMessage(gameMode.message) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ formatMessage(messages.playInstance) }}
+
+
+
+ {{ formatMessage(messages.playAnyway) }}
+
+
+
+ {{ formatMessage(messages.viewInstance) }}
+
+
+ {{ formatMessage(commonMessages.editButton) }}
+
+
+
+ {{ formatMessage(commonMessages.openFolderButton) }}
+
+
+ {{ formatMessage(messages.copyAddress) }}
+
+
+ {{ formatMessage(commonMessages.refreshButton) }}
+
+
+
+ {{ formatMessage(messages.dontShowOnHome) }}
+
+
+
+ {{
+ formatMessage(
+ world.type === 'server'
+ ? commonMessages.removeButton
+ : commonMessages.deleteLabel,
+ )
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ formatMessage(messages.name) }} +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/helpers/analytics.js b/apps/app-frontend/src/helpers/analytics.js
index 90d2c8aef..6fa5ea3ab 100644
--- a/apps/app-frontend/src/helpers/analytics.js
+++ b/apps/app-frontend/src/helpers/analytics.js
@@ -1,8 +1,9 @@
import { posthog } from 'posthog-js'
export const initAnalytics = () => {
- posthog.init('phc_hm2ihMpTAoE86xIm7XzsCB8RPiTRKivViK5biiHedm', {
+ posthog.init('phc_9Iqi6lFs9sr5BSqh9RRNRSJ0mATS9PSgirDiX3iOYJ', {
persistence: 'localStorage',
+ api_host: 'https://posthog.modrinth.com',
})
}
diff --git a/apps/app-frontend/src/helpers/events.js b/apps/app-frontend/src/helpers/events.js
index 0ed288365..81a849b9e 100644
--- a/apps/app-frontend/src/helpers/events.js
+++ b/apps/app-frontend/src/helpers/events.js
@@ -62,7 +62,7 @@ export async function process_listener(callback) {
ProfilePayload {
uuid: unique identification of the process in the state (currently identified by path, but that will change)
name: name of the profile
- profile_path: relative path to profile (used for path identification)
+ profile_path: relative path toprofile_listener profile (used for path identification)
path: path to profile (used for opening the profile in the OS file explorer)
event: event type ("Created", "Added", "Edited", "Removed")
}
diff --git a/apps/app-frontend/src/helpers/fetch.js b/apps/app-frontend/src/helpers/fetch.js
index ff3e8b62e..5c5cf39cf 100644
--- a/apps/app-frontend/src/helpers/fetch.js
+++ b/apps/app-frontend/src/helpers/fetch.js
@@ -1,12 +1,12 @@
-import { ofetch } from 'ofetch'
+import { fetch } from '@tauri-apps/plugin-http'
import { handleError } from '@/store/state.js'
import { getVersion } from '@tauri-apps/api/app'
export const useFetch = async (url, item, isSilent) => {
try {
const version = await getVersion()
-
- return await ofetch(url, {
+ return await fetch(url, {
+ method: 'GET',
headers: { 'User-Agent': `modrinth/theseus/${version} (support@modrinth.com)` },
})
} catch (err) {
diff --git a/apps/app-frontend/src/helpers/pack.js b/apps/app-frontend/src/helpers/pack.js
index c175f9030..2026ec120 100644
--- a/apps/app-frontend/src/helpers/pack.js
+++ b/apps/app-frontend/src/helpers/pack.js
@@ -7,7 +7,13 @@ import { invoke } from '@tauri-apps/api/core'
import { create } from './profile'
// Installs pack from a version ID
-export async function create_profile_and_install(projectId, versionId, packTitle, iconUrl) {
+export async function create_profile_and_install(
+ projectId,
+ versionId,
+ packTitle,
+ iconUrl,
+ createInstanceCallback = () => {},
+) {
const location = {
type: 'fromVersionId',
project_id: projectId,
@@ -24,6 +30,7 @@ export async function create_profile_and_install(projectId, versionId, packTitle
null,
true,
)
+ createInstanceCallback(profile)
return await invoke('plugin:pack|pack_install', { location, profile })
}
diff --git a/apps/app-frontend/src/helpers/rendering/batch-skin-renderer.ts b/apps/app-frontend/src/helpers/rendering/batch-skin-renderer.ts
new file mode 100644
index 000000000..6495837d1
--- /dev/null
+++ b/apps/app-frontend/src/helpers/rendering/batch-skin-renderer.ts
@@ -0,0 +1,354 @@
+import * as THREE from 'three'
+import type { Skin, Cape } from '../skins'
+import { get_normalized_skin_texture, determineModelType } from '../skins'
+import { reactive } from 'vue'
+import { setupSkinModel, disposeCaches } from '@modrinth/utils'
+import { skinPreviewStorage } from '../storage/skin-preview-storage'
+import { CapeModel, ClassicPlayerModel, SlimPlayerModel } from '@modrinth/assets'
+
+export interface RenderResult {
+ forwards: string
+ backwards: string
+}
+
+class BatchSkinRenderer {
+ private renderer: THREE.WebGLRenderer
+ private readonly scene: THREE.Scene
+ private readonly camera: THREE.PerspectiveCamera
+ private currentModel: THREE.Group | null = null
+
+ constructor(width: number = 360, height: number = 504) {
+ const canvas = document.createElement('canvas')
+ canvas.width = width
+ canvas.height = height
+
+ this.renderer = new THREE.WebGLRenderer({
+ canvas: canvas,
+ antialias: true,
+ alpha: true,
+ preserveDrawingBuffer: true,
+ })
+
+ this.renderer.outputColorSpace = THREE.SRGBColorSpace
+ this.renderer.toneMapping = THREE.NoToneMapping
+ this.renderer.toneMappingExposure = 10.0
+ this.renderer.setClearColor(0x000000, 0)
+ this.renderer.setSize(width, height)
+
+ this.scene = new THREE.Scene()
+ this.camera = new THREE.PerspectiveCamera(20, width / height, 0.4, 1000)
+
+ const ambientLight = new THREE.AmbientLight(0xffffff, 2)
+ const directionalLight = new THREE.DirectionalLight(0xffffff, 1.2)
+ directionalLight.castShadow = true
+ directionalLight.position.set(2, 4, 3)
+ this.scene.add(ambientLight)
+ this.scene.add(directionalLight)
+ }
+
+ public async renderSkin(
+ textureUrl: string,
+ modelUrl: string,
+ capeUrl?: string,
+ capeModelUrl?: string,
+ ): Promise+ {{ formatMessage(messages.name) }} +
+ ++ {{ formatMessage(messages.address) }} +
+ ++ {{ formatMessage(messages.resourcePack) }} +
+
+
+
+
+
+
+
+
+ + Skins + Beta +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Saved skins
+
+
+
+
+
+
+
+
+
+
+
+
+ Default skins
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/pages/Worlds.vue b/apps/app-frontend/src/pages/Worlds.vue
new file mode 100644
index 000000000..8c1f57bf3
--- /dev/null
+++ b/apps/app-frontend/src/pages/Worlds.vue
@@ -0,0 +1,4 @@
+
+
+
+ ![Excited Modrinth Bot]()
+
+
+
+
+
+
+
+
+ Please sign-in
++ Please sign into your Minecraft account to use the skin management features of the + Modrinth app. +
+Worlds
+
diff --git a/apps/app-frontend/src/pages/index.js b/apps/app-frontend/src/pages/index.js
index 6c4866b46..2e0361cd5 100644
--- a/apps/app-frontend/src/pages/index.js
+++ b/apps/app-frontend/src/pages/index.js
@@ -1,4 +1,6 @@
import Index from './Index.vue'
import Browse from './Browse.vue'
+import Worlds from './Worlds.vue'
+import Skins from './Skins.vue'
-export { Index, Browse }
+export { Index, Browse, Worlds, Skins }
diff --git a/apps/app-frontend/src/pages/instance/Index.vue b/apps/app-frontend/src/pages/instance/Index.vue
index d2f3d52e0..8b6d63bfa 100644
--- a/apps/app-frontend/src/pages/instance/Index.vue
+++ b/apps/app-frontend/src/pages/instance/Index.vue
@@ -1,152 +1,160 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/app-frontend/src/pages/instance/index.js b/apps/app-frontend/src/pages/instance/index.js
index e433570eb..fa77df524 100644
--- a/apps/app-frontend/src/pages/instance/index.js
+++ b/apps/app-frontend/src/pages/instance/index.js
@@ -1,5 +1,7 @@
import Index from './Index.vue'
+import Overview from './Overview.vue'
+import Worlds from './Worlds.vue'
import Mods from './Mods.vue'
import Logs from './Logs.vue'
-export { Index, Mods, Logs }
+export { Index, Overview, Worlds, Mods, Logs }
diff --git a/apps/app-frontend/src/pages/project/Index.vue b/apps/app-frontend/src/pages/project/Index.vue
index 1f5082b13..941ab0d08 100644
--- a/apps/app-frontend/src/pages/project/Index.vue
+++ b/apps/app-frontend/src/pages/project/Index.vue
@@ -155,7 +155,7 @@ import { get_categories, get_game_versions, get_loaders } from '@/helpers/tags'
import { get as getInstance, get_projects as getInstanceProjects } from '@/helpers/profile'
import dayjs from 'dayjs'
import relativeTime from 'dayjs/plugin/relativeTime'
-import { useRoute } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
import { ref, shallowRef, watch } from 'vue'
import { useBreadcrumbs } from '@/store/breadcrumbs'
import { handleError } from '@/store/notifications.js'
@@ -170,6 +170,7 @@ import { openUrl } from '@tauri-apps/plugin-opener'
dayjs.extend(relativeTime)
const route = useRoute()
+const router = useRouter()
const breadcrumbs = useBreadcrumbs()
const themeStore = useTheming()
@@ -192,6 +193,11 @@ const [allLoaders, allGameVersions] = await Promise.all([
async function fetchProjectData() {
const project = await get_project(route.params.id, 'must_revalidate').catch(handleError)
+ if (!project) {
+ handleError('Error loading project')
+ return
+ }
+
data.value = project
;[versions.value, members.value, categories.value, instance.value, instanceProjects.value] =
await Promise.all([
@@ -242,6 +248,9 @@ async function install(version) {
installedVersion.value = version
}
},
+ (profile) => {
+ router.push(`/instance/${profile}`)
+ },
)
}
diff --git a/apps/app-frontend/src/routes.js b/apps/app-frontend/src/routes.js
index 49eae8461..67172e68d 100644
--- a/apps/app-frontend/src/routes.js
+++ b/apps/app-frontend/src/routes.js
@@ -18,6 +18,14 @@ export default new createRouter({
breadcrumb: [{ name: 'Home' }],
},
},
+ {
+ path: '/worlds',
+ name: 'Worlds',
+ component: Pages.Worlds,
+ meta: {
+ breadcrumb: [{ name: 'Worlds' }],
+ },
+ },
{
path: '/browse/:projectType',
name: 'Discover content',
@@ -26,6 +34,14 @@ export default new createRouter({
breadcrumb: [{ name: 'Discover content' }],
},
},
+ {
+ path: '/skins',
+ name: 'Skins',
+ component: Pages.Skins,
+ meta: {
+ breadcrumb: [{ name: 'Skins' }],
+ },
+ },
{
path: '/library',
name: 'Library',
@@ -106,13 +122,31 @@ export default new createRouter({
component: Instance.Index,
props: true,
children: [
+ // {
+ // path: '',
+ // name: 'Overview',
+ // component: Instance.Overview,
+ // meta: {
+ // useRootContext: true,
+ // breadcrumb: [{ name: '?Instance' }],
+ // },
+ // },
+ {
+ path: 'worlds',
+ name: 'InstanceWorlds',
+ component: Instance.Worlds,
+ meta: {
+ useRootContext: true,
+ breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Worlds' }],
+ },
+ },
{
path: '',
name: 'Mods',
component: Instance.Mods,
meta: {
useRootContext: true,
- breadcrumb: [{ name: '?Instance' }],
+ breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
},
},
{
@@ -121,7 +155,7 @@ export default new createRouter({
component: Instance.Mods,
meta: {
useRootContext: true,
- breadcrumb: [{ name: '?Instance' }],
+ breadcrumb: [{ name: '?Instance', link: '/instance/{id}/' }, { name: 'Content' }],
},
},
{
diff --git a/apps/app-frontend/src/store/install.js b/apps/app-frontend/src/store/install.js
index 90ca66cd0..4746b9070 100644
--- a/apps/app-frontend/src/store/install.js
+++ b/apps/app-frontend/src/store/install.js
@@ -23,8 +23,8 @@ export const useInstall = defineStore('installStore', {
setInstallConfirmModal(ref) {
this.installConfirmModal = ref
},
- showInstallConfirmModal(project, version_id, onInstall) {
- this.installConfirmModal.show(project, version_id, onInstall)
+ showInstallConfirmModal(project, version_id, onInstall, createInstanceCallback) {
+ this.installConfirmModal.show(project, version_id, onInstall, createInstanceCallback)
},
setIncompatibilityWarningModal(ref) {
this.incompatibilityWarningModal = ref
@@ -41,7 +41,14 @@ export const useInstall = defineStore('installStore', {
},
})
-export const install = async (projectId, versionId, instancePath, source, callback = () => {}) => {
+export const install = async (
+ projectId,
+ versionId,
+ instancePath,
+ source,
+ callback = () => {},
+ createInstanceCallback = () => {},
+) => {
const project = await get_project(projectId, 'must_revalidate').catch(handleError)
if (project.project_type === 'modpack') {
@@ -49,7 +56,13 @@ export const install = async (projectId, versionId, instancePath, source, callba
const packs = await list().catch(handleError)
if (packs.length === 0 || !packs.find((pack) => pack.linked_data?.project_id === project.id)) {
- await packInstall(project.id, version, project.title, project.icon_url).catch(handleError)
+ await packInstall(
+ project.id,
+ version,
+ project.title,
+ project.icon_url,
+ createInstanceCallback,
+ ).catch(handleError)
trackEvent('PackInstall', {
id: project.id,
@@ -61,7 +74,7 @@ export const install = async (projectId, versionId, instancePath, source, callba
callback(version)
} else {
const install = useInstall()
- install.showInstallConfirmModal(project, version, callback)
+ install.showInstallConfirmModal(project, version, callback, createInstanceCallback)
}
} else {
if (instancePath) {
diff --git a/apps/app-frontend/src/store/state.js b/apps/app-frontend/src/store/state.js
index dd68a6eec..e9811e623 100644
--- a/apps/app-frontend/src/store/state.js
+++ b/apps/app-frontend/src/store/state.js
@@ -1,4 +1,4 @@
-import { useTheming } from './theme'
+import { useTheming } from './theme.ts'
import { useBreadcrumbs } from './breadcrumbs'
import { useLoading } from './loading'
import { useNotifications, handleError } from './notifications'
diff --git a/apps/app-frontend/src/store/theme.js b/apps/app-frontend/src/store/theme.js
deleted file mode 100644
index d9111f50c..000000000
--- a/apps/app-frontend/src/store/theme.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { defineStore } from 'pinia'
-
-export const useTheming = defineStore('themeStore', {
- state: () => ({
- themeOptions: ['dark', 'light', 'oled', 'system'],
- advancedRendering: true,
- selectedTheme: 'dark',
- toggleSidebar: false,
-
- devMode: false,
- featureFlags: {},
- }),
- actions: {
- setThemeState(newTheme) {
- if (this.themeOptions.includes(newTheme)) this.selectedTheme = newTheme
- else console.warn('Selected theme is not present. Check themeOptions.')
-
- this.setThemeClass()
- },
- setThemeClass() {
- for (const theme of this.themeOptions) {
- document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
- }
-
- let theme = this.selectedTheme
- if (this.selectedTheme === 'system') {
- const darkThemeMq = window.matchMedia('(prefers-color-scheme: dark)')
- if (darkThemeMq.matches) {
- theme = 'dark'
- } else {
- theme = 'light'
- }
- }
-
- document.getElementsByTagName('html')[0].classList.add(`${theme}-mode`)
- },
- },
-})
diff --git a/apps/app-frontend/src/store/theme.ts b/apps/app-frontend/src/store/theme.ts
new file mode 100644
index 000000000..a79094167
--- /dev/null
+++ b/apps/app-frontend/src/store/theme.ts
@@ -0,0 +1,70 @@
+import { defineStore } from 'pinia'
+
+export const DEFAULT_FEATURE_FLAGS = {
+ project_background: false,
+ page_path: false,
+ worlds_tab: false,
+ worlds_in_home: true,
+}
+
+export const THEME_OPTIONS = ['dark', 'light', 'oled', 'system'] as const
+
+export type FeatureFlag = keyof typeof DEFAULT_FEATURE_FLAGS
+export type FeatureFlags = Record
+
+ You don't have any worlds yet.
+
+ 
+
+
+
+
+
+
+
+
+ .env variables & command line options
@@ -73,14 +77,18 @@ The majority of configuration is done at runtime using [dotenvy](https://crates. `MEILISEARCH_KEY`: The name that MeiliSearch is given `BIND_ADDR`: The bind address for the server. Supports both IPv4 and IPv6 `MOCK_FILE_PATH`: The path used to store uploaded files; this has no default value and will panic if unspecified +`SMTP_USERNAME`: The username used to authenticate with the SMTP server +`SMTP_PASSWORD`: The password associated with the `SMTP_USERNAME` for SMTP authentication +`SMTP_HOST`: The hostname or IP address of the SMTP server +`SMTP_PORT`: The port number on which the SMTP server is listening (commonly 25, 465, or 587) +`SMTP_TLS`: The TLS mode to use for the SMTP connection, which can be one of the following: `none`, `opportunistic_start_tls`, `requires_start_tls`, `tls` #### CDN options -`STORAGE_BACKEND`: Controls what storage backend is used. This can be either `local`, `backblaze`, or `s3`, but defaults to `local` +`STORAGE_BACKEND`: Controls what storage backend is used. This can be either `local` or `s3`, but defaults to `local` -The Backblaze and S3 configuration options are fairly self-explanatory in name, so here's simply their names: -`BACKBLAZE_KEY_ID`, `BACKBLAZE_KEY`, `BACKBLAZE_BUCKET_ID` -`S3_ACCESS_TOKEN`, `S3_SECRET`, `S3_URL`, `S3_REGION`, `S3_BUCKET_NAME` +The S3 configuration options are fairly self-explanatory in name, so here's simply their names: +`S3_ACCESS_TOKEN`, `S3_SECRET`, `S3_URL`, `S3_REGION`, `S3_PUBLIC_BUCKET_NAME`, `S3_PRIVATE_BUCKET_NAME`, `S3_USES_PATH_STYLE_BUCKETS` #### Search, OAuth, and miscellaneous options diff --git a/apps/docs/src/content/docs/guide/oauth.md b/apps/docs/src/content/docs/guide/oauth.md new file mode 100644 index 000000000..a7833b103 --- /dev/null +++ b/apps/docs/src/content/docs/guide/oauth.md @@ -0,0 +1,95 @@ +--- +title: The hitchhiker's guide to OAuth +description: Guide for using Modrinth OAuth to interact with the API on users' behalf. +--- + +Modrinth allows developers to create applications which, once authorized by a Modrinth user, let the developer interact with the API on their behalf. The flow used to get an API token is based on the OAuth 2 protocol. It is recommended that most people use an existing OAuth library to handle the authentication. If you want to implement it from scratch, you will need to look into [RFC 6749]. If the only user of the application is yourself, a personal access token (PAT) may be a better fit. + +If you're familiar with OAuth 2, these are the URLs you will need: + +| Name | URL | +|--------------------|--------------------------------------------------| +| Authorization page | `https://modrinth.com/auth/authorize` | +| Token exchange | `https://api.modrinth.com/_internal/oauth/token` | + +The flow will generally look like this: + +1. User is redirected to Modrinth to authorize your application +2. User is redirected back to your site after authorizing, with an authorization code +3. Your backend exchanges this code for an access token + +## Register your application + +To start off, you need to [register an application] in Modrinth's systems. The settings chosen here can always be changed later. You need to select what permissions you need, called scopes. For security reasons you will want to select only the scopes you need. See the [principle of least privilege]. + +In addition to name and scopes, you will also need to add one or more redirect URIs. These are the URIs that the user can be redirected to after they authorize your application. + +After you've registered your application, it is important that you take note of the client secret somewhere safe. If the client secret is to ever leak, it is important that you regenerate it to ensure the security of your authorized users. If your client secret or access tokens are found exposed in the wild, your application may be disabled without prior notice. + +## Getting authorization + +Once the user is ready to authorize your application, you need to construct a URL to redirect them to. The authorization URL for Modrinth is `https://api.modrinth.com/_internal/oauth/token`. Supply the following query parameters: + +| Query parameter | Description | +|-----------------|-------------------------------------------------------------------------------------------| +| `response_type` | In Modrinth this always needs to be `code`, since only code grants are supported | +| `client_id` | The application identifier found in the settings | +| `scope` | The permissions you need access to | +| `state` | A mechanism to prevent certain attacks. Explained further below. Recommended but optional | +| `redirect_uri` | The URI the user is redirect to after finishing authorization | + +You might have noticed the `state` parameter. [CSRF] (Cross-site request forgery), and [clickjacking] are security vulnerabilities that you're recommended to protect against. In OAuth2 this is usually done with the `state` parameter. When the user initiates a request to start authorization, you include a `state` which is unique to this request. This can, for example, be saved in localStorge or a cookie. When the redirect URI is called, you verify that the `state` parameter is the same. Using `state` is optional, but recommended. + +The scope identifiers are currently best found in the backend source code located at [`apps/labrinth/src/models/v3/pats.rs`]. The scope parameter is an array of scope identifiers, seperated by a plus sign (`+`). + +The redirect URI is the endpoint on your server that will receive the code which can eventually be used to act on the user's behalf. For security reasons the redirect URI used has to be allowlisted in your application settings. The redirect will contain the following query parameters: + +| Query parameter | Description | +|-----------------|----------------------------------------------------| +| `code` | The code that can be exchanged for an access token | +| `client_id` | Your client id | +| `redirect_uri` | The redirect URI which was used | +| `grant_type` | Always `authorization_code` in Modrinth | + +## Exchanging tokens + +If you've followed the previous section on getting authorization, you should now have an authorization code. Before you can access the API, you need to exchange this code for an access token. This is done by sending a POST request to the exchange token endpoint, `https://api.modrinth.com/_internal/oauth/token`. This request has to be of type urlencoded form. Make sure the `Content-Type` header is set to `application/x-www-form-urlencoded`. To authenticate this request you need to place your client secret in the `Authorization` header. + +In the body use these fields: + +| Field | Description | +|----------------|--------------------------------------------------------------| +| `code` | The authorization code | +| `client_id` | Your client id, the same as in the authorization request | +| `redirect_uri` | The redirect URI which was redirected to after authorization | +| `grant_type` | Always `authorization_code` in Modrinth | + +If the request succeeds, you should receive a JSON payload with these fields: + +| Field | Description | +|----------------|------------------------------------------------------| +| `access_token` | The access token you can use to access the API | +| `token_type` | Currently only `Bearer` | +| `expires_in` | The amount of seconds until the access token expires | + +To use this access token, you attach it to API requests in the `Authorization` header. To get basic information about the authorizer, you can use the [`/user` endpoint], which automatically gets the user from the header. + +If you have any questions, you're welcome to ask in #api-development in the [Discord guild], or create a ticket on the [support portal]. + +[RFC 6749]: https://datatracker.ietf.org/doc/html/rfc6749 + +[register an application]: https://modrinth.com/settings/applications + +[principle of least privilege]: https://en.wikipedia.org/wiki/Principle_of_least_privilege + +[`apps/labrinth/src/models/v3/pats.rs`]: https://github.com/modrinth/code/blob/main/apps/labrinth/src/models/v3/pats.rs + +[CSRF]: https://en.wikipedia.org/wiki/Cross-site_request_forgery + +[Clickjacking]: https://en.wikipedia.org/wiki/Clickjacking + +[`/user` endpoint]: https://docs.modrinth.com/api/operations/getuserfromauth/ + +[Discord guild]: https://discord.modrinth.com + +[support portal]: https://support.modrinth.com/en/ diff --git a/apps/frontend/.env.local b/apps/frontend/.env.local new file mode 100644 index 000000000..29aad1d10 --- /dev/null +++ b/apps/frontend/.env.local @@ -0,0 +1,4 @@ +BASE_URL=http://127.0.0.1:8000/v2/ +BROWSER_BASE_URL=http://127.0.0.1:8000/v2/ +PYRO_BASE_URL=https://staging-archon.modrinth.com +PROD_OVERRIDE=true diff --git a/apps/frontend/.env.example b/apps/frontend/.env.prod similarity index 57% rename from apps/frontend/.env.example rename to apps/frontend/.env.prod index 43ceb1d53..8aebc57d5 100644 --- a/apps/frontend/.env.example +++ b/apps/frontend/.env.prod @@ -1,3 +1,4 @@ BASE_URL=https://api.modrinth.com/v2/ BROWSER_BASE_URL=https://api.modrinth.com/v2/ -PYRO_BASE_URL=https://archon.modrinth.com/ +PYRO_BASE_URL=https://archon.modrinth.com +PROD_OVERRIDE=true diff --git a/apps/frontend/.env.staging b/apps/frontend/.env.staging new file mode 100644 index 000000000..3dd5f73d3 --- /dev/null +++ b/apps/frontend/.env.staging @@ -0,0 +1,4 @@ +BASE_URL=https://staging-api.modrinth.com/v2/ +BROWSER_BASE_URL=https://staging-api.modrinth.com/v2/ +PYRO_BASE_URL=https://staging-archon.modrinth.com +PROD_OVERRIDE=true diff --git a/apps/frontend/package.json b/apps/frontend/package.json index c04ddc418..3c395e55c 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -10,7 +10,8 @@ "postinstall": "nuxi prepare", "lint": "eslint . && prettier --check .", "fix": "eslint . --fix && prettier --write .", - "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace" + "intl:extract": "formatjs extract \"{,src/components,src/composables,src/layouts,src/middleware,src/modules,src/pages,src/plugins,src/utils}/**/*.{vue,ts,tsx,js,jsx,mts,cts,mjs,cjs}\" \"src/error.vue\" --ignore '**/*.d.ts' --ignore 'node_modules' --out-file src/locales/en-US/index.json --format crowdin --preserve-whitespace", + "test": "nuxi build" }, "devDependencies": { "@formatjs/cli": "^6.2.12", @@ -39,7 +40,9 @@ "@modrinth/assets": "workspace:*", "@modrinth/ui": "workspace:*", "@modrinth/utils": "workspace:*", + "@modrinth/blog": "workspace:*", "@pinia/nuxt": "^0.5.1", + "@types/three": "^0.172.0", "@vintl/vintl": "^4.4.1", "@vueuse/core": "^11.1.0", "ace-builds": "^1.36.2", @@ -58,7 +61,6 @@ "qrcode.vue": "^3.4.0", "semver": "^7.5.4", "three": "^0.172.0", - "@types/three": "^0.172.0", "vue-multiselect": "3.0.0-alpha.2", "vue-typed-virtual-list": "^1.0.10", "vue3-ace-editor": "^2.2.4", diff --git a/apps/frontend/src/assets/images/external/gdlauncher.png b/apps/frontend/src/assets/images/external/gdlauncher.png index 060810828..4f02315e0 100644 Binary files a/apps/frontend/src/assets/images/external/gdlauncher.png and b/apps/frontend/src/assets/images/external/gdlauncher.png differ diff --git a/apps/frontend/src/assets/images/games/rinth.png b/apps/frontend/src/assets/images/games/rinth.png index 35b04a575..7b11a7fc5 100644 Binary files a/apps/frontend/src/assets/images/games/rinth.png and b/apps/frontend/src/assets/images/games/rinth.png differ diff --git a/apps/frontend/src/assets/images/servers/minecraft-background-dark.png b/apps/frontend/src/assets/images/servers/minecraft-background-dark.png index bb22629be..f71044f5f 100644 Binary files a/apps/frontend/src/assets/images/servers/minecraft-background-dark.png and b/apps/frontend/src/assets/images/servers/minecraft-background-dark.png differ diff --git a/apps/frontend/src/assets/images/servers/minecraft_server_icon.png b/apps/frontend/src/assets/images/servers/minecraft_server_icon.png index ec98382d4..32aa13d43 100644 Binary files a/apps/frontend/src/assets/images/servers/minecraft_server_icon.png and b/apps/frontend/src/assets/images/servers/minecraft_server_icon.png differ diff --git a/apps/frontend/src/assets/styles/components.scss b/apps/frontend/src/assets/styles/components.scss index 0cc476281..a1ea3a1e9 100644 --- a/apps/frontend/src/assets/styles/components.scss +++ b/apps/frontend/src/assets/styles/components.scss @@ -930,7 +930,7 @@ button { color: var(--color-text); padding: 0.5rem 0 0.5rem 1rem; font-weight: var(--font-weight-medium); - min-height: 40px; + min-height: 36px; box-sizing: border-box; width: fit-content; align-items: center; diff --git a/apps/frontend/src/assets/styles/global.scss b/apps/frontend/src/assets/styles/global.scss index 06d8568c4..b52b738ed 100644 --- a/apps/frontend/src/assets/styles/global.scss +++ b/apps/frontend/src/assets/styles/global.scss @@ -162,6 +162,18 @@ html { --landing-green-label-bg: rgba(0, 216, 69, 0.15); --landing-raw-bg: #fff; + + --banner-error-bg: #fee2e2; + --banner-error-text: #991b1b; + --banner-error-border: #ef4444; + + --banner-warning-bg: #ffedd5; + --banner-warning-text: #713f12; + --banner-warning-border: #f97316; + + --banner-info-bg: #dbeafe; + --banner-info-text: #1e3a8a; + --banner-info-border: #3b82f6; } .dark, @@ -286,6 +298,18 @@ html { --hover-filter: brightness(120%); --active-filter: brightness(140%); + + --banner-error-bg: #4c1515; + --banner-error-text: #fee2e2; + --banner-error-border: #7f1d1d; + + --banner-warning-bg: #4a2a0a; + --banner-warning-text: #ffe6c0; + --banner-warning-border: #b54708; + + --banner-info-bg: #1e2a44; + --banner-info-text: #dbeafe; + --banner-info-border: #2563eb; } .oled-mode { @@ -451,7 +475,7 @@ textarea { var(--shadow-inset-sm), 0 0 0 0 transparent; transition: box-shadow 0.1s ease-in-out; - min-height: 40px; + min-height: 36px; &:focus, &:focus-visible { diff --git a/apps/frontend/src/components/ui/AdPlaceholder.vue b/apps/frontend/src/components/ui/AdPlaceholder.vue index 83ac2d8cf..a812a60ce 100644 --- a/apps/frontend/src/components/ui/AdPlaceholder.vue +++ b/apps/frontend/src/components/ui/AdPlaceholder.vue @@ -1,15 +1,20 @@
-
+
+ 
+
-
-
-
-
-
-
diff --git a/apps/frontend/src/components/ui/ModalCreation.vue b/apps/frontend/src/components/ui/ModalCreation.vue
index 1de76a95e..bfc5b140f 100644
--- a/apps/frontend/src/components/ui/ModalCreation.vue
+++ b/apps/frontend/src/components/ui/ModalCreation.vue
@@ -183,7 +183,7 @@ async function createProject() {
app.$notify({
group: "main",
title: "An error occurred",
- text: err.data.description,
+ text: err.data ? err.data.description : err,
type: "error",
});
}
diff --git a/apps/frontend/src/components/ui/ModerationChecklist.vue b/apps/frontend/src/components/ui/ModerationChecklist.vue
index 9717384de..b21fd9954 100644
--- a/apps/frontend/src/components/ui/ModerationChecklist.vue
+++ b/apps/frontend/src/components/ui/ModerationChecklist.vue
@@ -9,7 +9,7 @@
@@ -256,7 +256,9 @@
-
-
- Support creators and Modrinth ad-free with
- Modrinth+
-
-
-
+ 75% of ad revenue goes to creators
-
+
+
@@ -18,8 +23,6 @@
diff --git a/apps/frontend/src/components/ui/Badge.vue b/apps/frontend/src/components/ui/Badge.vue
deleted file mode 100644
index 1ebb84510..000000000
--- a/apps/frontend/src/components/ui/Badge.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
- {{ capitalizeString(type) }}
-
-
-
-
-
-
-
-
-
-
-