Support for latest Modrinth Upstream

apps/app-frontend/src/App.vue

@@ -23,7 +23,7 @@ import { useLoading, useTheming } from '@/store/state'
 // import ModrinthAppLogo from '@/assets/modrinth_app.svg?component'
 import AccountsCard from '@/components/ui/AccountsCard.vue'
 import InstanceCreationModal from '@/components/ui/InstanceCreationModal.vue'
-import { get } from '@/helpers/settings'
+import { get, set } from '@/helpers/settings'
 import Breadcrumbs from '@/components/ui/Breadcrumbs.vue'
 import RunningAppBar from '@/components/ui/RunningAppBar.vue'
 import SplashScreen from '@/components/ui/SplashScreen.vue'
@@ -100,6 +100,14 @@ onUnmounted(() => {
 
 async function setupApp() {
   stateInitialized.value = true
+
+  const settings = await get()
+
+  // Patched
+  settings.personalized_ads = false
+  settings.telemetry = false
+  await set(settings)
+
   const {
     native_decorations,
     theme,
@@ -112,7 +120,8 @@ async function setupApp() {
     toggle_sidebar,
     developer_mode,
     feature_flags,
-  } = await get()
+  } = settings
+
 
   if (default_page === 'Library') {
     await router.push('/library')
@@ -141,9 +150,13 @@ async function setupApp() {
 
   initAnalytics()
   if (!telemetry) {
-    console.info("[AstralRinth] Telemetry disabled by default (Hard patched in code).")
+    console.info("[AR] Telemetry disabled by default (Hard patched).")
     optOutAnalytics()
   }
+  if (!personalized_ads) {
+    console.info("[AR] Personalized ads disabled by default (Hard patched).")
+  }
+
   if (dev) debugAnalytics()
   trackEvent('Launched', { version, dev, onboarded })
 

apps/app-frontend/src/components/ui/modal/AppSettingsModal.vue

@@ -146,7 +146,7 @@ function devModeCount() {
               <ModrinthIcon class="w-6 h-6" />
             </button>
             <div>
-              <p class="m-0">Modrinth App {{ version }}</p>
+              <p class="m-0">AstralRinth App {{ version }}</p>
               <p class="m-0">
                 <span v-if="osPlatform === 'macos'">MacOS</span>
                 <span v-else class="capitalize">{{ osPlatform }}</span>

apps/app-frontend/src/components/ui/modal/ConfirmModalWrapper.vue

@@ -37,10 +37,10 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
-  showAdOnClose: {
-    type: Boolean,
-    default: true,
-  },
+  // showAdOnClose: {
+  //   type: Boolean,
+  //   default: true,
+  // },
 })
 
 const emit = defineEmits(['proceed'])
@@ -51,7 +51,7 @@ defineExpose({
     modal.value.show()
   },
   hide: () => {
-    onModalHide()
+    // onModalHide()
     modal.value.hide()
   },
 })

apps/app-frontend/src/components/ui/modal/ModalWrapper.vue

@@ -21,10 +21,10 @@ const props = defineProps({
       return () => { }
     },
   },
-  showAdOnClose: {
-    type: Boolean,
-    default: true,
-  },
+  // showAdOnClose: {
+  //   type: Boolean,
+  //   default: true,
+  // },
 })
 const modal = ref(null)
 

apps/app-frontend/src/components/ui/settings/PrivacySettings.vue

@@ -26,7 +26,7 @@ watch(
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast">Personalized ads</h2>
       <p class="m-0 text-sm">
-        Modrinth's ad provider, Aditude, shows ads based on your preferences. By disabling this
+        (Hard disabled by AR) • 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.
       </p>
     </div>
@@ -34,6 +34,7 @@ watch(
       id="personalized-ads"
       :model-value="settings.personalized_ads"
       :checked="settings.personalized_ads"
+      :disabled="!settings.personalized_ads"
       @update:model-value="
         (e) => {
           settings.personalized_ads = e
@@ -46,7 +47,7 @@ watch(
     <div>
       <h2 class="m-0 text-lg font-extrabold text-contrast">Telemetry</h2>
       <p class="m-0 text-sm">
-        Modrinth collects anonymized analytics and usage data to improve our user experience and
+        (Hard disabled by AR) • Modrinth collects anonymized analytics and usage data to improve our user experience and
         customize your experience. By disabling this option, you opt out and your data will no
         longer be collected.
       </p>
@@ -55,6 +56,7 @@ watch(
       id="opt-out-analytics"
       :model-value="settings.telemetry"
       :checked="settings.telemetry"
+      :disabled="!settings.telemetry"
       @update:model-value="
         (e) => {
           settings.telemetry = e