diff --git a/apps/app-frontend/src/helpers/ads.js b/apps/app-frontend/src/helpers/ads.js
new file mode 100644
index 000000000..46f1500ef
--- /dev/null
+++ b/apps/app-frontend/src/helpers/ads.js
@@ -0,0 +1,24 @@
+import { invoke } from '@tauri-apps/api/core'
+
+export async function init_ads_window(overrideShown = false) {
+ return await invoke('plugin:ads|init_ads_window', {
+ overrideShown,
+ dpr: window.devicePixelRatio,
+ })
+}
+
+export async function show_ads_window() {
+ return await invoke('plugin:ads|show_ads_window', { dpr: window.devicePixelRatio })
+}
+
+export async function hide_ads_window(reset) {
+ return await invoke('plugin:ads|hide_ads_window', { reset })
+}
+
+export async function record_ads_click() {
+ return await invoke('plugin:ads|record_ads_click')
+}
+
+export async function open_ads_link(path, origin) {
+ return await invoke('plugin:ads|open_link', { path, origin })
+}
diff --git a/apps/app-frontend/src/helpers/analytics.js b/apps/app-frontend/src/helpers/analytics.js
index 76c3d0911..61b9de234 100644
--- a/apps/app-frontend/src/helpers/analytics.js
+++ b/apps/app-frontend/src/helpers/analytics.js
@@ -1,24 +1,24 @@
-// import { posthog } from 'posthog-js'
+import { posthog } from 'posthog-js'
export const initAnalytics = () => {
- // posthog.init('phc_9Iqi6lFs9sr5BSqh9RRNRSJ0mATS9PSgirDiX3iOYJ', {
- // persistence: 'localStorage',
- // api_host: 'https://posthog.modrinth.com',
- // })
+ posthog.init('phc_9Iqi6lFs9sr5BSqh9RRNRSJ0mATS9PSgirDiX3iOYJ', {
+ persistence: 'localStorage',
+ api_host: 'https://posthog.modrinth.com',
+ })
}
export const debugAnalytics = () => {
- // posthog.debug()
+ posthog.debug()
}
export const optOutAnalytics = () => {
- // posthog.opt_out_capturing()
+ posthog.opt_out_capturing()
}
export const optInAnalytics = () => {
- // posthog.opt_in_capturing()
+ posthog.opt_in_capturing()
}
export const trackEvent = (eventName, properties) => {
- // posthog.capture(eventName, properties)
+ posthog.capture(eventName, properties)
}
diff --git a/apps/app-frontend/src/helpers/auth.js b/apps/app-frontend/src/helpers/auth.js
index 61461f068..4e9ea9d8a 100644
--- a/apps/app-frontend/src/helpers/auth.js
+++ b/apps/app-frontend/src/helpers/auth.js
@@ -13,28 +13,6 @@ import { invoke } from '@tauri-apps/api/core'
// await authenticate_await_completion()
// }
-export async function offline_login(name) {
- return await invoke('plugin:auth|offline_login', { name: name })
-}
-
-// [AR] • Feature
-export async function elyby_login(uuid, login, accessToken) {
- return await invoke('plugin:auth|elyby_login', {
- uuid,
- login,
- accessToken
- })
-}
-
-// [AR] • Feature
-export async function elyby_auth_authenticate(login, password, clientToken) {
- return await invoke('plugin:auth|elyby_auth_authenticate', {
- login,
- password,
- clientToken,
- })
-}
-
/**
* Authenticate a user with Hydra - part 1.
* This begins the authentication flow quasi-synchronously.
diff --git a/apps/app-frontend/src/helpers/import.js b/apps/app-frontend/src/helpers/import.js
index 602d72597..f14ccca90 100644
--- a/apps/app-frontend/src/helpers/import.js
+++ b/apps/app-frontend/src/helpers/import.js
@@ -62,31 +62,3 @@ export async function is_valid_importable_instance(instanceFolder, launcherType)
export async function get_default_launcher_path(launcherType) {
return await invoke('plugin:import|get_default_launcher_path', { launcherType })
}
-
-/// Fetch CurseForge profile metadata from profile code
-/// eg: fetch_curseforge_profile_metadata("eSrNlKNo")
-export async function fetch_curseforge_profile_metadata(profileCode) {
- return await invoke('plugin:import|fetch_curseforge_profile_metadata', { profileCode })
-}
-
-/// Import a CurseForge profile from profile code
-/// eg: import_curseforge_profile("eSrNlKNo")
-export async function import_curseforge_profile(profileCode) {
- try {
- // First, fetch the profile metadata to get the actual name
- const metadata = await fetch_curseforge_profile_metadata(profileCode)
-
- // create a basic, empty instance using the actual profile name
- const profilePath = await create(metadata.name, '1.19.4', 'vanilla', 'latest', null, true)
-
- const result = await invoke('plugin:import|import_curseforge_profile', {
- profilePath,
- profileCode,
- })
-
- // Return the profile path for navigation
- return { result, profilePath }
- } catch (error) {
- throw error
- }
-}
diff --git a/apps/app-frontend/src/helpers/update.js b/apps/app-frontend/src/helpers/update.js
deleted file mode 100644
index 2aff285ba..000000000
--- a/apps/app-frontend/src/helpers/update.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import { getVersion } from '@tauri-apps/api/app'
-import { ref } from 'vue'
-
-import { getOS, initUpdateLauncher } from '@/helpers/utils.js'
-
-export const allowState = ref(false)
-export const installState = ref(false)
-export const updateState = ref(false)
-
-const currentOS = ref('')
-const api = `https://git.astralium.su/api/v1/repos/didirus/AstralRinth/releases/latest`
-
-const systems = ['macos', 'windows', 'linux']
-const macosExtensions = ['.dmg', '.pkg', '.app']
-const windowsExtensions = ['.exe', '.msi']
-
-const blacklistBeginPrefixes = [
- `dev`,
- `nightly`,
- `dirty`,
- `dirty-dev`,
- `dirty-nightly`,
- `dirty_dev`,
- `dirty_nightly`,
-] // This is blacklisted builds for download. For example, file.startsWith('dev') is not allowed.
-
-export async function getRemote(isDownloadState) {
- var releaseTag = null;
- var releaseTitle = null;
- var result = false;
- currentOS.value = await getOS();
- try {
- const response = await fetch(api);
- if (!response.ok) {
- throw new Error(response.status);
- }
- const remoteData = await response.json();
- releaseTag = document.getElementById('releaseTag');
- releaseTitle = document.getElementById('releaseTitle');
- if (releaseTag && releaseTitle) {
- releaseTag.textContent = remoteData.tag_name;
- releaseTitle.textContent = remoteData.name;
- }
- if (systems.includes(currentOS.value.toLowerCase())) {
- const localVersion = await getVersion();
- const isUpdateAvailable = !remoteData.tag_name.includes(localVersion);
- updateState.value = isUpdateAvailable;
- allowState.value = isUpdateAvailable;
- } else {
- updateState.value = false;
- allowState.value = false;
- }
- if (isDownloadState) {
- try {
- installState.value = true;
- const builds = remoteData.assets;
- const fileName = getInstaller(getExtension(), builds);
- result = fileName ? await initUpdateLauncher(fileName[1], fileName[0], currentOS.value, true) : false;
- installState.value = false;
- } catch (err) {
- installState.value = false;
- }
- }
- console.log('Update available state is', updateState.value);
- console.log('Remote version is', remoteData.tag_name);
- console.log('Remote title is', remoteData.name);
- console.log('Local version is', await getVersion());
- console.log('Operating System is', currentOS.value);
- return result;
- } catch (error) {
- console.error("Failed to fetch remote releases:", error);
- if (!releaseTag) {
- updateState.value = false;
- allowState.value = false;
- installState.value = false;
- }
- }
-}
-
-function getInstaller(osExtension, builds) {
- console.log(osExtension, builds)
- for (const build of builds) {
- if (blacklistBeginPrefixes.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;
-}
-
-function getExtension() {
- return systems.find(osName => osName === currentOS.value.toLowerCase())?.endsWith('macos')
- ? macosExtensions
- : windowsExtensions;
-}
diff --git a/apps/app-frontend/src/helpers/utils.js b/apps/app-frontend/src/helpers/utils.js
index 7eb675464..c9873b3e0 100644
--- a/apps/app-frontend/src/helpers/utils.js
+++ b/apps/app-frontend/src/helpers/utils.js
@@ -27,22 +27,6 @@ export async function getOS() {
return await invoke('plugin:utils|get_os')
}
-// [AR] Feature. Updater
-export async function initUpdateLauncher(downloadUrl, filename, osType, autoUpdateSupported) {
- console.log('Downloading build', downloadUrl, filename, osType, autoUpdateSupported)
- return await invoke('plugin:utils|init_update_launcher', { downloadUrl, filename, osType, autoUpdateSupported })
-}
-
-// [AR] Migration. Patch
-export async function applyMigrationFix(eol) {
- return await invoke('plugin:utils|apply_migration_fix', { eol })
-}
-
-// [AR] Feature. Ely.by
-export async function initAuthlibPatching(minecraftVersion, isMojang) {
- return await invoke('plugin:utils|init_authlib_patching', { minecraftVersion, isMojang })
-}
-
export async function isNetworkMetered() {
return await invoke('plugin:utils|is_network_metered')
}
diff --git a/apps/app-frontend/src/pages/Index.vue b/apps/app-frontend/src/pages/Index.vue
index d0c14e36f..8a1f3557e 100644
--- a/apps/app-frontend/src/pages/Index.vue
+++ b/apps/app-frontend/src/pages/Index.vue
@@ -103,7 +103,7 @@ onUnmounted(() => {
-
+
{
expandedGalleryItem.value = null
- // show_ads_window()
+ show_ads_window()
}
const nextImage = () => {
@@ -138,7 +138,7 @@ const previousImage = () => {
}
const expandImage = (item, index) => {
- // hide_ads_window()
+ hide_ads_window()
expandedGalleryItem.value = item
expandedGalleryIndex.value = index
zoomedIn.value = false
diff --git a/apps/app/build.rs b/apps/app/build.rs
index 7b57b51ac..468b5c271 100644
--- a/apps/app/build.rs
+++ b/apps/app/build.rs
@@ -12,9 +12,6 @@ fn main() {
"auth",
InlinedPlugin::new()
.commands(&[
- "offline_login",
- "elyby_login",
- "elyby_auth_authenticate",
"login",
"remove_user",
"get_default_user",
@@ -51,8 +48,6 @@ fn main() {
"import",
InlinedPlugin::new()
.commands(&[
- "fetch_curseforge_profile_metadata",
- "import_curseforge_profile",
"get_importable_instances",
"import_instance",
"is_valid_importable_instance",
@@ -227,9 +222,6 @@ fn main() {
"utils",
InlinedPlugin::new()
.commands(&[
- "init_authlib_patching",
- "apply_migration_fix",
- "init_update_launcher",
"get_os",
"is_network_metered",
"should_disable_mouseover",
@@ -243,6 +235,22 @@ fn main() {
DefaultPermissionRule::AllowAllCommands,
),
)
+ .plugin(
+ "ads",
+ InlinedPlugin::new()
+ .commands(&[
+ "init_ads_window",
+ "hide_ads_window",
+ "scroll_ads_window",
+ "show_ads_window",
+ "record_ads_click",
+ "open_link",
+ "get_ads_personalization",
+ ])
+ .default_permission(
+ DefaultPermissionRule::AllowAllCommands,
+ ),
+ )
.plugin(
"friends",
InlinedPlugin::new()
diff --git a/apps/app/capabilities/ads.json b/apps/app/capabilities/ads.json
new file mode 100644
index 000000000..e0479d6d3
--- /dev/null
+++ b/apps/app/capabilities/ads.json
@@ -0,0 +1,10 @@
+{
+ "identifier": "ads",
+ "description": "",
+ "local": false,
+ "remote": {
+ "urls": ["https://modrinth.com/*", "http://localhost:3000/*"]
+ },
+ "webviews": ["ads-window"],
+ "permissions": ["ads:default"]
+}
diff --git a/apps/app/capabilities/plugins.json b/apps/app/capabilities/plugins.json
index 58ea35fb5..588b59b59 100644
--- a/apps/app/capabilities/plugins.json
+++ b/apps/app/capabilities/plugins.json
@@ -2,9 +2,7 @@
"identifier": "plugins",
"description": "",
"local": true,
- "windows": [
- "main"
- ],
+ "windows": ["main"],
"permissions": [
"dialog:allow-open",
"dialog:allow-confirm",
@@ -21,17 +19,12 @@
"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/*"
- }
- ]
+ "allow": [{ "url": "https://modrinth.com/*" }, { "url": "https://*.modrinth.com/*" }]
},
+
"auth:default",
"import:default",
"jre:default",
@@ -47,6 +40,7 @@
"settings:default",
"tags:default",
"utils:default",
+ "ads:default",
"friends:default",
"worlds:default"
]
diff --git a/apps/app/icons/128x128.png b/apps/app/icons/128x128.png
index 0e9d7da37..3d402563c 100644
Binary files a/apps/app/icons/128x128.png and b/apps/app/icons/128x128.png differ
diff --git a/apps/app/icons/128x128@2x.png b/apps/app/icons/128x128@2x.png
index e00bf3ad5..4b7afa6e2 100644
Binary files a/apps/app/icons/128x128@2x.png and b/apps/app/icons/128x128@2x.png differ
diff --git a/apps/app/icons/Square107x107Logo.png b/apps/app/icons/Square107x107Logo.png
index 4579dcf79..739bd7003 100644
Binary files a/apps/app/icons/Square107x107Logo.png and b/apps/app/icons/Square107x107Logo.png differ
diff --git a/apps/app/icons/Square142x142Logo.png b/apps/app/icons/Square142x142Logo.png
index 7ddb3bfd7..5db44b079 100644
Binary files a/apps/app/icons/Square142x142Logo.png and b/apps/app/icons/Square142x142Logo.png differ
diff --git a/apps/app/icons/Square150x150Logo.png b/apps/app/icons/Square150x150Logo.png
index b268418f1..10037096e 100644
Binary files a/apps/app/icons/Square150x150Logo.png and b/apps/app/icons/Square150x150Logo.png differ
diff --git a/apps/app/icons/Square284x284Logo.png b/apps/app/icons/Square284x284Logo.png
index e838c0acd..0eb0bb8b9 100644
Binary files a/apps/app/icons/Square284x284Logo.png and b/apps/app/icons/Square284x284Logo.png differ
diff --git a/apps/app/icons/Square30x30Logo.png b/apps/app/icons/Square30x30Logo.png
index adc19b0e4..5a5535ade 100644
Binary files a/apps/app/icons/Square30x30Logo.png and b/apps/app/icons/Square30x30Logo.png differ
diff --git a/apps/app/icons/Square310x310Logo.png b/apps/app/icons/Square310x310Logo.png
index 11ef2e712..a4f460d99 100644
Binary files a/apps/app/icons/Square310x310Logo.png and b/apps/app/icons/Square310x310Logo.png differ
diff --git a/apps/app/icons/Square44x44Logo.png b/apps/app/icons/Square44x44Logo.png
index bbfd78b77..bd91178ab 100644
Binary files a/apps/app/icons/Square44x44Logo.png and b/apps/app/icons/Square44x44Logo.png differ
diff --git a/apps/app/icons/Square71x71Logo.png b/apps/app/icons/Square71x71Logo.png
index bcaecd52d..9d233188a 100644
Binary files a/apps/app/icons/Square71x71Logo.png and b/apps/app/icons/Square71x71Logo.png differ
diff --git a/apps/app/icons/Square89x89Logo.png b/apps/app/icons/Square89x89Logo.png
index 241bd6668..f7f8f47b7 100644
Binary files a/apps/app/icons/Square89x89Logo.png and b/apps/app/icons/Square89x89Logo.png differ
diff --git a/apps/app/icons/StoreLogo.png b/apps/app/icons/StoreLogo.png
index 97c9c13aa..c70dee80d 100644
Binary files a/apps/app/icons/StoreLogo.png and b/apps/app/icons/StoreLogo.png differ
diff --git a/apps/app/icons/favicon.ico b/apps/app/icons/favicon.ico
index 81e0afa75..c2ccbab90 100644
Binary files a/apps/app/icons/favicon.ico and b/apps/app/icons/favicon.ico differ
diff --git a/apps/app/icons/icon (1).png b/apps/app/icons/icon (1).png
deleted file mode 100644
index fc7a899f2..000000000
Binary files a/apps/app/icons/icon (1).png and /dev/null differ
diff --git a/apps/app/icons/icon.icns b/apps/app/icons/icon.icns
index 7e4a56573..9e9b2478a 100644
Binary files a/apps/app/icons/icon.icns and b/apps/app/icons/icon.icns differ
diff --git a/apps/app/icons/icon.ico b/apps/app/icons/icon.ico
index 69eec6cf0..8a6c96ef3 100644
Binary files a/apps/app/icons/icon.ico and b/apps/app/icons/icon.ico differ
diff --git a/apps/app/icons/icon.png b/apps/app/icons/icon.png
new file mode 100644
index 000000000..d64d8fbec
Binary files /dev/null and b/apps/app/icons/icon.png differ
diff --git a/apps/app/src/api/ads-init.js b/apps/app/src/api/ads-init.js
new file mode 100644
index 000000000..bd4582729
--- /dev/null
+++ b/apps/app/src/api/ads-init.js
@@ -0,0 +1,106 @@
+document.addEventListener(
+ 'click',
+ function (e) {
+ window.top.postMessage({ modrinthAdClick: true }, 'https://modrinth.com')
+
+ let target = e.target
+ while (target != null) {
+ if (target.matches('a')) {
+ e.preventDefault()
+ if (target.href) {
+ window.top.postMessage({ modrinthOpenUrl: target.href }, 'https://modrinth.com')
+ }
+ break
+ }
+ target = target.parentElement
+ }
+ },
+ true,
+)
+
+window.open = (url, target, features) => {
+ window.top.postMessage({ modrinthOpenUrl: url }, 'https://modrinth.com')
+}
+
+function muteAudioContext() {
+ if (window.AudioContext || window.webkitAudioContext) {
+ const AudioContext = window.AudioContext || window.webkitAudioContext
+ const originalCreateMediaElementSource = AudioContext.prototype.createMediaElementSource
+ const originalCreateMediaStreamSource = AudioContext.prototype.createMediaStreamSource
+ const originalCreateMediaStreamTrackSource = AudioContext.prototype.createMediaStreamTrackSource
+ const originalCreateBufferSource = AudioContext.prototype.createBufferSource
+ const originalCreateOscillator = AudioContext.prototype.createOscillator
+
+ AudioContext.prototype.createGain = function () {
+ const gain = originalCreateGain.call(this)
+ gain.gain.value = 0
+ return gain
+ }
+
+ AudioContext.prototype.createMediaElementSource = function (mediaElement) {
+ const source = originalCreateMediaElementSource.call(this, mediaElement)
+ source.connect(this.createGain())
+ return source
+ }
+
+ AudioContext.prototype.createMediaStreamSource = function (mediaStream) {
+ const source = originalCreateMediaStreamSource.call(this, mediaStream)
+ source.connect(this.createGain())
+ return source
+ }
+
+ AudioContext.prototype.createMediaStreamTrackSource = function (mediaStreamTrack) {
+ const source = originalCreateMediaStreamTrackSource.call(this, mediaStreamTrack)
+ source.connect(this.createGain())
+ return source
+ }
+
+ AudioContext.prototype.createBufferSource = function () {
+ const source = originalCreateBufferSource.call(this)
+ source.connect(this.createGain())
+ return source
+ }
+
+ AudioContext.prototype.createOscillator = function () {
+ const oscillator = originalCreateOscillator.call(this)
+ oscillator.connect(this.createGain())
+ return oscillator
+ }
+ }
+}
+
+function muteVideo(mediaElement) {
+ let count = Number(mediaElement.getAttribute('data-modrinth-muted-count') ?? 0)
+
+ if (!mediaElement.muted || mediaElement.volume !== 0) {
+ mediaElement.muted = true
+ mediaElement.volume = 0
+
+ mediaElement.setAttribute('data-modrinth-muted-count', count + 1)
+ }
+
+ if (count > 5) {
+ // Video is detected as malicious, so it is removed from the page
+ mediaElement.remove()
+ }
+}
+
+function muteVideos() {
+ document.querySelectorAll('video, audio').forEach(function (mediaElement) {
+ muteVideo(mediaElement)
+
+ if (!mediaElement.hasAttribute('data-modrinth-muted')) {
+ mediaElement.addEventListener('volumechange', () => muteVideo(mediaElement))
+
+ mediaElement.setAttribute('data-modrinth-muted', 'true')
+ }
+ })
+}
+
+document.addEventListener('DOMContentLoaded', () => {
+ muteVideos()
+ muteAudioContext()
+
+ const observer = new MutationObserver(muteVideos)
+ observer.observe(document.body, { childList: true, subtree: true })
+})
diff --git a/apps/app/src/api/ads.rs b/apps/app/src/api/ads.rs
new file mode 100644
index 000000000..40d00ce76
--- /dev/null
+++ b/apps/app/src/api/ads.rs
@@ -0,0 +1,235 @@
+use std::collections::HashSet;
+use std::time::{Duration, Instant};
+use tauri::plugin::TauriPlugin;
+use tauri::{Manager, PhysicalPosition, PhysicalSize, Runtime};
+use tauri_plugin_opener::OpenerExt;
+use theseus::settings;
+use tokio::sync::RwLock;
+
+pub struct AdsState {
+ pub shown: bool,
+ pub modal_shown: bool,
+ pub last_click: Option,
+ pub malicious_origins: HashSet,
+}
+
+const AD_LINK: &str = "https://modrinth.com/wrapper/app-ads-cookie";
+
+pub fn init() -> TauriPlugin {
+ tauri::plugin::Builder::::new("ads")
+ .setup(|app, _api| {
+ app.manage(RwLock::new(AdsState {
+ shown: true,
+ modal_shown: false,
+ last_click: None,
+ malicious_origins: HashSet::new(),
+ }));
+
+ // We refresh the ads window every 5 minutes for performance
+ let app = app.clone();
+ tauri::async_runtime::spawn(async move {
+ loop {
+ if let Some(webview) = app.webviews().get_mut("ads-window")
+ {
+ let _ = webview.navigate(AD_LINK.parse().unwrap());
+ }
+
+ tokio::time::sleep(std::time::Duration::from_secs(60 * 5))
+ .await;
+ }
+ });
+
+ Ok(())
+ })
+ .invoke_handler(tauri::generate_handler![
+ init_ads_window,
+ hide_ads_window,
+ show_ads_window,
+ record_ads_click,
+ open_link,
+ get_ads_personalization,
+ ])
+ .build()
+}
+
+fn get_webview_position(
+ app: &tauri::AppHandle,
+ dpr: f32,
+) -> crate::api::Result<(PhysicalPosition, PhysicalSize)> {
+ let main_window = app.get_window("main").unwrap();
+
+ let width = 300.0 * dpr;
+ let height = 250.0 * dpr;
+
+ let main_window_size = main_window.outer_size()?;
+ let x = (main_window_size.width as f32) - width;
+ let y = (main_window_size.height as f32) - height;
+
+ Ok((
+ PhysicalPosition::new(x, y),
+ PhysicalSize::new(width, height),
+ ))
+}
+
+#[tauri::command]
+#[cfg(not(target_os = "linux"))]
+pub async fn init_ads_window(
+ app: tauri::AppHandle,
+ dpr: f32,
+ override_shown: bool,
+) -> crate::api::Result<()> {
+ use tauri::WebviewUrl;
+
+ let state = app.state::>();
+ let mut state = state.write().await;
+
+ if override_shown {
+ state.shown = true;
+ }
+
+ if state.modal_shown {
+ return Ok(());
+ }
+
+ if let Ok((position, size)) = get_webview_position(&app, dpr) {
+ if let Some(webview) = app.webviews().get("ads-window") {
+ if state.shown {
+ let _ = webview.set_position(position);
+ let _ = webview.set_size(size);
+ } else {
+ let _ =
+ webview.set_position(PhysicalPosition::new(-1000, -1000));
+ }
+ } else if let Some(window) = app.get_window("main") {
+ let webview = window.add_child(
+ tauri::webview::WebviewBuilder::new(
+ "ads-window",
+ WebviewUrl::External(
+ AD_LINK.parse().unwrap(),
+ ),
+ )
+ .initialization_script_for_all_frames(include_str!("ads-init.js"))
+ .user_agent("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36")
+ .zoom_hotkeys_enabled(false)
+ .transparent(true)
+ .on_new_window(|_, _| tauri::webview::NewWindowResponse::Deny),
+ if state.shown {
+ position
+ } else {
+ PhysicalPosition::new(-1000.0, -1000.0)
+ },
+ size,
+ )?;
+
+ webview.with_webview(#[allow(unused_variables)] |webview2| {
+ #[cfg(windows)]
+ {
+ use webview2_com::Microsoft::Web::WebView2::Win32::ICoreWebView2_8;
+ use windows_core::Interface;
+
+ let webview2_controller = webview2.controller();
+ let Ok(webview2_8) = unsafe { webview2_controller.CoreWebView2() }
+ .and_then(|core_webview2| core_webview2.cast::())
+ else {
+ return;
+ };
+
+ unsafe { webview2_8.SetIsMuted(true) }.ok();
+ }
+ })?;
+ }
+ }
+
+ Ok(())
+}
+
+// TODO: make ads work on linux
+#[tauri::command]
+#[cfg(target_os = "linux")]
+pub async fn init_ads_window() {}
+
+#[tauri::command]
+pub async fn show_ads_window(
+ app: tauri::AppHandle,
+ dpr: f32,
+) -> crate::api::Result<()> {
+ if let Some(webview) = app.webviews().get("ads-window") {
+ let state = app.state::>();
+ let mut state = state.write().await;
+
+ state.modal_shown = false;
+
+ if state.shown {
+ let (position, size) = get_webview_position(&app, dpr)?;
+ let _ = webview.set_size(size);
+ let _ = webview.set_position(position);
+ }
+ }
+
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn hide_ads_window(
+ app: tauri::AppHandle,
+ reset: Option,
+) -> crate::api::Result<()> {
+ if let Some(webview) = app.webviews().get("ads-window") {
+ let state = app.state::>();
+ let mut state = state.write().await;
+
+ if reset.unwrap_or(false) {
+ state.shown = false;
+ } else {
+ state.modal_shown = true;
+ }
+
+ let _ = webview.set_position(PhysicalPosition::new(-1000, -1000));
+ }
+
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn record_ads_click(
+ app: tauri::AppHandle,
+) -> crate::api::Result<()> {
+ let state = app.state::>();
+
+ let mut state = state.write().await;
+ state.last_click = Some(Instant::now());
+
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn open_link(
+ app: tauri::AppHandle,
+ path: String,
+ origin: String,
+) -> crate::api::Result<()> {
+ let state = app.state::>();
+ let mut state = state.write().await;
+
+ if url::Url::parse(&path).is_ok()
+ && !state.malicious_origins.contains(&origin)
+ && let Some(last_click) = state.last_click
+ && last_click.elapsed() < Duration::from_millis(100)
+ {
+ let _ = app.opener().open_url(&path, None::);
+ state.last_click = None;
+
+ return Ok(());
+ }
+
+ tracing::info!("Malicious click: {path} origin {origin}");
+ state.malicious_origins.insert(origin);
+
+ Ok(())
+}
+
+#[tauri::command]
+pub async fn get_ads_personalization() -> crate::api::Result {
+ let res = settings::get().await?;
+ Ok(res.personalized_ads)
+}
diff --git a/apps/app/src/api/auth.rs b/apps/app/src/api/auth.rs
index c833fce61..d7bbe3a94 100644
--- a/apps/app/src/api/auth.rs
+++ b/apps/app/src/api/auth.rs
@@ -2,15 +2,11 @@ use crate::api::Result;
use chrono::{Duration, Utc};
use tauri::plugin::TauriPlugin;
use tauri::{Manager, Runtime, UserAttentionType};
-use tauri_plugin_http::reqwest::Client;
use theseus::prelude::*;
pub fn init() -> TauriPlugin {
tauri::plugin::Builder::::new("auth")
.invoke_handler(tauri::generate_handler![
- offline_login,
- elyby_login,
- elyby_auth_authenticate,
login,
remove_user,
get_default_user,
@@ -20,65 +16,6 @@ pub fn init() -> TauriPlugin {
.build()
}
-/// ### AR • Feature
-/// Create new offline user
-#[tauri::command]
-pub async fn offline_login(name: &str) -> Result {
- let credentials = minecraft_auth::offline_auth(name).await?;
- Ok(credentials)
-}
-
-/// ### AR • Feature
-/// Create new Ely.by user
-#[tauri::command]
-pub async fn elyby_login(
- uuid: uuid::Uuid,
- login: &str,
- access_token: &str
-) -> Result {
- let credentials = minecraft_auth::elyby_auth(uuid, login, access_token).await?;
- Ok(credentials)
-}
-
-/// ### AR • Feature
-/// Authenticate Ely.by user
-#[tauri::command]
-pub async fn elyby_auth_authenticate(
- login: &str,
- password: &str,
- client_token: &str,
-) -> Result {
- let client = Client::new();
- let auth_body = serde_json::json!({
- "username": login,
- "password": password,
- "clientToken": client_token,
- });
-
- let response = match client
- .post("https://authserver.ely.by/auth/authenticate")
- .header("Content-Type", "application/json")
- .json(&auth_body)
- .send()
- .await
- {
- Ok(resp) => resp,
- Err(e) => {
- tracing::error!("[AR] • Failed to send request: {}", e);
- return Ok("".to_string());
- }
- };
-
- let text = match response.text().await {
- Ok(body) => body,
- Err(e) => {
- tracing::error!("[AR] • Failed to read response text: {}", e);
- return Ok("".to_string());
- }
- };
- Ok(text)
-}
-
/// Authenticate a user with Hydra - part 1
/// This begins the authentication flow quasi-synchronously, returning a URL to visit (that the user will sign in at)
#[tauri::command]
diff --git a/apps/app/src/api/import.rs b/apps/app/src/api/import.rs
index b642aa902..0cab81cd5 100644
--- a/apps/app/src/api/import.rs
+++ b/apps/app/src/api/import.rs
@@ -2,11 +2,6 @@ use std::path::PathBuf;
use crate::api::Result;
use theseus::pack::import::ImportLauncherType;
-use theseus::pack::import::curseforge_profile::{
- CurseForgeProfileMetadata,
- fetch_curseforge_profile_metadata as fetch_cf_metadata,
- import_curseforge_profile as import_cf_profile,
-};
use theseus::pack::import;
@@ -17,8 +12,6 @@ pub fn init() -> tauri::plugin::TauriPlugin {
import_instance,
is_valid_importable_instance,
get_default_launcher_path,
- fetch_curseforge_profile_metadata,
- import_curseforge_profile,
])
.build()
}
@@ -75,24 +68,3 @@ pub async fn get_default_launcher_path(
) -> Result> {
Ok(import::get_default_launcher_path(launcher_type))
}
-
-/// Fetch CurseForge profile metadata from profile code
-/// eg: fetch_curseforge_profile_metadata("eSrNlKNo")
-#[tauri::command]
-pub async fn fetch_curseforge_profile_metadata(
- profile_code: String,
-) -> Result {
- Ok(fetch_cf_metadata(&profile_code).await?)
-}
-
-/// Import a CurseForge profile from profile code
-/// profile_path should be a blank profile for this purpose- if the function fails, it will be deleted
-/// eg: import_curseforge_profile("profile-path", "eSrNlKNo")
-#[tauri::command]
-pub async fn import_curseforge_profile(
- profile_path: String,
- profile_code: String,
-) -> Result<()> {
- import_cf_profile(&profile_code, &profile_path).await?;
- Ok(())
-}
diff --git a/apps/app/src/api/mod.rs b/apps/app/src/api/mod.rs
index bafa0cda5..a16271fe2 100644
--- a/apps/app/src/api/mod.rs
+++ b/apps/app/src/api/mod.rs
@@ -17,6 +17,7 @@ pub mod settings;
pub mod tags;
pub mod utils;
+pub mod ads;
pub mod cache;
pub mod friends;
pub mod worlds;
diff --git a/apps/app/src/api/utils.rs b/apps/app/src/api/utils.rs
index 89159d0d0..e96186f5b 100644
--- a/apps/app/src/api/utils.rs
+++ b/apps/app/src/api/utils.rs
@@ -10,15 +10,11 @@ use crate::api::{Result, TheseusSerializableError};
use dashmap::DashMap;
use std::path::{Path, PathBuf};
use theseus::prelude::canonicalize;
-use theseus::util::utils;
use url::Url;
pub fn init() -> tauri::plugin::TauriPlugin {
tauri::plugin::Builder::new("utils")
.invoke_handler(tauri::generate_handler![
- init_authlib_patching,
- apply_migration_fix,
- init_update_launcher,
get_os,
is_network_metered,
should_disable_mouseover,
@@ -31,42 +27,6 @@ pub fn init() -> tauri::plugin::TauriPlugin {
.build()
}
-/// [AR] Feature. Ely.by
-#[tauri::command]
-pub async fn init_authlib_patching(
- minecraft_version: &str,
- is_mojang: bool,
-) -> Result {
- let result =
- utils::init_authlib_patching(minecraft_version, is_mojang).await?;
- Ok(result)
-}
-
-/// [AR] Migration. Patch
-#[tauri::command]
-pub async fn apply_migration_fix(eol: &str) -> Result {
- let result = utils::apply_migration_fix(eol).await?;
- Ok(result)
-}
-
-/// [AR] Feature. Updater
-#[tauri::command]
-pub async fn init_update_launcher(
- download_url: &str,
- filename: &str,
- os_type: &str,
- auto_update_supported: bool,
-) -> Result<()> {
- let _ = utils::init_update_launcher(
- download_url,
- filename,
- os_type,
- auto_update_supported,
- )
- .await;
- Ok(())
-}
-
#[derive(Debug, Clone, Serialize, Deserialize)]
#[allow(clippy::enum_variant_names)]
pub enum OS {
diff --git a/apps/app/src/main.rs b/apps/app/src/main.rs
index b354b8d72..731565dc0 100644
--- a/apps/app/src/main.rs
+++ b/apps/app/src/main.rs
@@ -25,9 +25,10 @@ mod updater_impl_noop;
async fn initialize_state(app: tauri::AppHandle) -> api::Result<()> {
tracing::info!("Initializing app event state...");
theseus::EventState::init(app.clone()).await?;
+
tracing::info!("Initializing app state...");
State::init().await?;
- tracing::info!("AstralRinth state successfully initialized.");
+
let state = State::get().await?;
app.asset_protocol_scope()
.allow_directory(state.directories.caches_dir(), true)?;
@@ -110,10 +111,25 @@ fn main() {
*/
let _log_guard = theseus::start_logger();
- tracing::info!("Initialized tracing subscriber. Loading AstralRinth App!");
+ tracing::info!("Initialized tracing subscriber. Loading Modrinth App!");
let mut builder = tauri::Builder::default();
+ #[cfg(feature = "updater")]
+ {
+ use tauri_plugin_http::reqwest::header::{HeaderValue, USER_AGENT};
+ use theseus::LAUNCHER_USER_AGENT;
+ builder = builder.plugin(
+ tauri_plugin_updater::Builder::new()
+ .header(
+ USER_AGENT,
+ HeaderValue::from_str(LAUNCHER_USER_AGENT).unwrap(),
+ )
+ .unwrap()
+ .build(),
+ );
+ }
+
builder = builder
.plugin(tauri_plugin_single_instance::init(|app, args, _cwd| {
if let Some(payload) = args.get(1) {
@@ -135,20 +151,7 @@ fn main() {
.plugin(tauri_plugin_opener::init())
.plugin(
tauri_plugin_window_state::Builder::default()
- .with_filename(
- if std::env::current_dir()
- .ok()
- .map(|dir| dir.join("portable.txt").exists())
- .unwrap_or(false)
- {
- std::env::current_dir()
- .ok()
- .map(|dir| dir.join("UserData/app-window-state.json").to_string_lossy().into_owned())
- .unwrap()
- } else {
- "app-window-state.json".to_string()
- },
- )
+ .with_filename("app-window-state.json")
// Use *only* POSITION and SIZE state flags, because saving VISIBLE causes the `visible: false` to not take effect
.with_state_flags(
tauri_plugin_window_state::StateFlags::POSITION
@@ -156,7 +159,7 @@ fn main() {
| tauri_plugin_window_state::StateFlags::MAXIMIZED,
)
.build(),
- )
+ )
.setup(|app| {
#[cfg(target_os = "macos")]
{
@@ -222,6 +225,7 @@ fn main() {
.plugin(api::tags::init())
.plugin(api::utils::init())
.plugin(api::cache::init())
+ .plugin(api::ads::init())
.plugin(api::friends::init())
.plugin(api::worlds::init())
.manage(PendingUpdateData::default())
diff --git a/apps/app/tauri-release.conf.json b/apps/app/tauri-release.conf.json
index ac3ddd2f6..e3585db77 100644
--- a/apps/app/tauri-release.conf.json
+++ b/apps/app/tauri-release.conf.json
@@ -1,7 +1,37 @@
{
- "app": {
- "security": {
- "capabilities": ["core", "plugins"]
- }
- }
+ "bundle": {
+ "createUpdaterArtifacts": "v1Compatible",
+ "windows": {
+ "signCommand": {
+ "cmd": "jsign",
+ "args": [
+ "sign",
+ "--verbose",
+ "--storetype",
+ "DIGICERTONE",
+ "--keystore",
+ "https://clientauth.one.digicert.com",
+ "--storepass",
+ "env:DIGICERT_ONE_SIGNER_CREDENTIALS",
+ "--tsaurl",
+ "https://timestamp.sectigo.com,http://timestamp.digicert.com",
+ "%1"
+ ]
+ }
+ }
+ },
+ "build": {
+ "features": ["updater"]
+ },
+ "app": {
+ "security": {
+ "capabilities": ["ads", "core", "plugins", "updater"]
+ }
+ },
+ "plugins": {
+ "updater": {
+ "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIwMzM5QkE0M0FCOERBMzkKUldRNTJyZzZwSnN6SUdPRGdZREtUUGxMblZqeG9OVHYxRUlRTzJBc2U3MUNJaDMvZDQ1UytZZmYK",
+ "endpoints": ["https://launcher-files.modrinth.com/updates.json"]
+ }
+ }
}
diff --git a/apps/app/tauri.conf.json b/apps/app/tauri.conf.json
index 0b676d389..6075dde24 100644
--- a/apps/app/tauri.conf.json
+++ b/apps/app/tauri.conf.json
@@ -12,12 +12,7 @@
"copyright": "",
"targets": "all",
"externalBin": [],
- "icon": [
- "icons/128x128.png",
- "icons/128x128@2x.png",
- "icons/icon.icns",
- "icons/icon.ico"
- ],
+ "icon": ["icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"],
"windows": {
"nsis": {
"installMode": "currentUser",
@@ -40,23 +35,19 @@
},
"fileAssociations": [
{
- "ext": [
- "mrpack"
- ],
+ "ext": ["mrpack"],
"mimeType": "application/x-modrinth-modpack+zip"
}
]
},
- "productName": "AstralRinth App",
- "version": "0.10.1601",
- "mainBinaryName": "AstralRinth App",
- "identifier": "AstralRinthApp",
+ "productName": "Modrinth App",
+ "version": "../app-frontend/package.json",
+ "mainBinaryName": "Modrinth App",
+ "identifier": "ModrinthApp",
"plugins": {
"deep-link": {
"desktop": {
- "schemes": [
- "modrinth"
- ]
+ "schemes": ["modrinth"]
},
"mobile": []
}
@@ -71,7 +62,7 @@
"fullscreen": false,
"height": 800,
"resizable": true,
- "title": "AstralRinth",
+ "title": "Modrinth App",
"label": "main",
"width": 1280,
"minHeight": 700,
@@ -93,16 +84,11 @@
],
"enable": true
},
- "capabilities": [
- "core",
- "plugins"
- ],
+ "capabilities": ["ads", "core", "plugins"],
"csp": {
"default-src": "'self' customprotocol: asset:",
- "connect-src": "ipc: https://git.astralium.su https://authserver.ely.by http://ipc.localhost https://modrinth.com https://*.modrinth.com https://*.sentry.io https://api.mclo.gs 'self' data: blob:",
- "font-src": [
- "https://cdn-raw.modrinth.com/fonts/"
- ],
+ "connect-src": "ipc: 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 https://tally.so/widgets/embed.js 'self'",
diff --git a/apps/app/tauri.linux.conf.json b/apps/app/tauri.linux.conf.json
index f7f53e1da..5b2e9ec68 100644
--- a/apps/app/tauri.linux.conf.json
+++ b/apps/app/tauri.linux.conf.json
@@ -1,3 +1,3 @@
{
- "mainBinaryName": "AstralRinthApp"
+ "mainBinaryName": "ModrinthApp"
}
diff --git a/apps/app/tauri.macos.conf.json b/apps/app/tauri.macos.conf.json
index a50c693c6..363f00e85 100644
--- a/apps/app/tauri.macos.conf.json
+++ b/apps/app/tauri.macos.conf.json
@@ -7,7 +7,7 @@
"fullscreen": false,
"height": 800,
"resizable": true,
- "title": "AstralRinth App",
+ "title": "Modrinth App",
"width": 1280,
"minHeight": 700,
"minWidth": 1100,
diff --git a/apps/frontend/src/composables/featureFlags.ts b/apps/frontend/src/composables/featureFlags.ts
index 1a53a7249..2eb9a93d8 100644
--- a/apps/frontend/src/composables/featureFlags.ts
+++ b/apps/frontend/src/composables/featureFlags.ts
@@ -20,7 +20,7 @@ export const DEFAULT_FEATURE_FLAGS = validateValues({
// Developer flags
developerMode: false,
showVersionFilesInTable: false,
- // showAdsWithPlus: false,
+ showAdsWithPlus: false,
alwaysShowChecklistAsPopup: true,
testTaxForm: false,
diff --git a/apps/frontend/src/pages/[type]/[id].vue b/apps/frontend/src/pages/[type]/[id].vue
index bcdce409a..ff480bfb7 100644
--- a/apps/frontend/src/pages/[type]/[id].vue
+++ b/apps/frontend/src/pages/[type]/[id].vue
@@ -810,7 +810,7 @@
:v3-metadata="projectV3"
class="card flex-card experimental-styles-within"
/>
-
+