fix more

apps/app-frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@modrinth/app-frontend",
   "private": true,
-  "version": "0.8.7",
+  "version": "0.8.8",
   "type": "module",
   "scripts": {
     "dev": "vite",

apps/app-frontend/src/components/ui/install_flow/ModInstallModal.vue

@@ -230,7 +230,7 @@ const createInstance = async () => {
             @click="installModal.hide()"
           >
             <Avatar
-              :src="profile.icon_path ? tauri.convertFileSrc(profile.icon_path) : null"
+              :src="profile.icon_path ? convertFileSrc(profile.icon_path) : null"
               class="profile-image"
             />
             {{ profile.name }}

apps/app-frontend/src/pages/Settings.vue

@@ -363,6 +363,25 @@ async function purgeCache() {
           <span class="label__title size-card-header">Privacy</span>
         </h3>
       </div>
+      <div class="adjacent-input">
+        <label for="opt-out-analytics">
+          <span class="label__title">Personalized ads</span>
+          <span class="label__description">
+            Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this
+            option, you opt out and ads will no longer be shown based on your interests.
+          </span>
+        </label>
+        <Toggle
+          id="opt-out-analytics"
+          :model-value="settings.personalized_ads"
+          :checked="settings.personalized_ads"
+          @update:model-value="
+            (e) => {
+              settings.personalized_ads = e
+            }
+          "
+        />
+      </div>
       <div class="adjacent-input">
         <label for="opt-out-analytics">
           <span class="label__title">Telemetry</span>

apps/app/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.8.7"
+version = "0.8.8"
 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/"

apps/app/build.rs

@@ -228,6 +228,7 @@ fn main() {
                         "show_ads_window",
                         "record_ads_click",
                         "open_link",
+                        "get_ads_personalization",
                     ])
                     .default_permission(
                         DefaultPermissionRule::AllowAllCommands,

apps/app/gen/schemas/desktop-schema.json

@@ -330,6 +330,11 @@
           "type": "string",
           "const": "ads:default"
         },
+        {
+          "description": "Enables the get_ads_personalization command without any pre-configured scope.",
+          "type": "string",
+          "const": "ads:allow-get-ads-personalization"
+        },
         {
           "description": "Enables the hide_ads_window command without any pre-configured scope.",
           "type": "string",
@@ -360,6 +365,11 @@
           "type": "string",
           "const": "ads:allow-show-ads-window"
         },
+        {
+          "description": "Denies the get_ads_personalization command without any pre-configured scope.",
+          "type": "string",
+          "const": "ads:deny-get-ads-personalization"
+        },
         {
           "description": "Denies the hide_ads_window command without any pre-configured scope.",
           "type": "string",

apps/app/gen/schemas/macOS-schema.json

@@ -330,6 +330,11 @@
           "type": "string",
           "const": "ads:default"
         },
+        {
+          "description": "Enables the get_ads_personalization command without any pre-configured scope.",
+          "type": "string",
+          "const": "ads:allow-get-ads-personalization"
+        },
         {
           "description": "Enables the hide_ads_window command without any pre-configured scope.",
           "type": "string",
@@ -360,6 +365,11 @@
           "type": "string",
           "const": "ads:allow-show-ads-window"
         },
+        {
+          "description": "Denies the get_ads_personalization command without any pre-configured scope.",
+          "type": "string",
+          "const": "ads:deny-get-ads-personalization"
+        },
         {
           "description": "Denies the hide_ads_window command without any pre-configured scope.",
           "type": "string",

apps/app/src/api/ads.rs

@@ -4,6 +4,7 @@ use std::time::{Duration, Instant};
 use tauri::plugin::TauriPlugin;
 use tauri::{Emitter, LogicalPosition, LogicalSize, Manager, Runtime};
 use tauri_plugin_shell::ShellExt;
+use theseus::settings;
 use tokio::sync::RwLock;
 
 pub struct AdsState {
@@ -50,6 +51,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
             show_ads_window,
             record_ads_click,
             open_link,
+            get_ads_personalization,
         ])
         .build()
 }
@@ -82,7 +84,7 @@ pub async fn init_ads_window<R: Runtime>(
             let _ = webview.set_size(LogicalSize::new(width, height));
         }
     } else if let Some(window) = app.get_window("main") {
-        let window = window.add_child(
+        let _ = window.add_child(
             tauri::webview::WebviewBuilder::new(
                 "ads-window",
                 WebviewUrl::External(
@@ -206,3 +208,9 @@ pub async fn open_link<R: Runtime>(
 
     Ok(())
 }
+
+#[tauri::command]
+pub async fn get_ads_personalization() -> crate::api::Result<bool> {
+    let res = settings::get().await?;
+    Ok(res.personalized_ads)
+}

apps/app/tauri.conf.json

@@ -52,7 +52,7 @@
     ]
   },
   "productName": "Modrinth App",
-  "version": "0.8.7",
+  "version": "0.8.8",
   "mainBinaryName": "Modrinth App",
   "identifier": "ModrinthApp",
   "plugins": {

apps/frontend/src/public/promo-frame.html

@@ -44,19 +44,27 @@
   </head>
   <body>
     <div class="ads-container">
-      <a id="plus-link" href="https://modrinth.com/plus" target="_blank"></a>
+      <div id="plus-link"></div>
       <div id="modrinth-rail-1" />
     </div>
     <script>
-      window.tude = window.tude || { cmd: [] };
-      tude.cmd.push(function () {
-        tude.refreshAdsViaDivMappings([
-          {
-            divId: "modrinth-rail-1",
-            baseDivId: "pb-slot-square-2",
-          },
-        ]);
-      });
+      window.__TAURI_INTERNALS__.invoke("plugin:ads|get_ads_personalization", {})
+        .then((personalized) => {
+          window.tude = window.tude || { cmd: [] };
+
+          tude.cmd.push(function () {
+            tude.refreshAdsViaDivMappings([
+              {
+                divId: "modrinth-rail-1",
+                baseDivId: "pb-slot-square-2",
+              },
+            ]);
+
+            tude.setPrivacySettings({
+              personalizedAds: personalized ?? true,
+            })
+          });
+        });
 
       window.addEventListener(
         "message",
@@ -84,6 +92,15 @@
       });
 
       document.addEventListener("contextmenu", (event) => event.preventDefault());
+
+      const plusLink = document.getElementById("plus-link");
+      plusLink.addEventListener('click', function() {
+        window.__TAURI_INTERNALS__.invoke("plugin:ads|record_ads_click", {});
+        window.__TAURI_INTERNALS__.invoke("plugin:ads|open_link", {
+          path: 'https://modrinth.com/plus',
+          origin: 'https://modrinth.com',
+        });
+      });
     </script>
   </body>
 </html>

packages/app-lib/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus"
-version = "0.8.7"
+version = "0.8.8"
 authors = ["Jai A <[email protected]>"]
 edition = "2021"
 

packages/app-lib/migrations/20240930001852_disable-personalized-ads.sql

@@ -0,0 +1 @@
+ALTER TABLE settings ADD COLUMN personalized_ads INTEGER NOT NULL DEFAULT TRUE;