refactor: remove telemetry and fix launcher workflows

apps/app-frontend/src/components/RowDisplay.vue

@@ -28,7 +28,6 @@ import LegacyProjectCard from '@/components/ui/LegacyProjectCard.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
 import { useNetworkStatus } from '@/composables/useNetworkStatus'
-import { trackEvent } from '@/helpers/analytics'
 import { install_duplicate_instance } from '@/helpers/install'
 import { kill, remove, run } from '@/helpers/instance'
 import { get_by_instance_id } from '@/helpers/process.js'
@@ -158,17 +157,9 @@ const handleOptionsClick = async (args) => {
 				})
 				if (!handled) handleSevereError(err, { instanceId: args.item.id })
 			})
-			trackEvent('InstanceStart', {
-				loader: args.item.loader,
-				game_version: args.item.game_version,
-			})
 			break
 		case 'stop':
 			await kill(args.item.id).catch(handleError)
-			trackEvent('InstanceStop', {
-				loader: args.item.loader,
-				game_version: args.item.game_version,
-			})
 			break
 		case 'add_content':
 			await router.push({

apps/app-frontend/src/components/home/HomeCalendar.vue

@@ -18,7 +18,6 @@ import { computed, ref, watch } from 'vue'
 import { useHomeDashboardRuntime } from '@/components/home/home-dashboard-runtime'
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import {
 	type DailyPlaytime,
 	type DailyPlaytimeEntry,
@@ -200,11 +199,6 @@ function selectDay(dateKey: string) {
 async function playInstance(instance: GameInstance) {
 	try {
 		await run(instance.id)
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomeCalendar',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -216,11 +210,6 @@ async function playInstance(instance: GameInstance) {
 
 async function stopInstance(instance: GameInstance) {
 	await kill(instance.id).catch(handleError)
-	trackEvent('InstanceStop', {
-		loader: instance.loader,
-		game_version: instance.game_version,
-		source: 'HomeCalendar',
-	})
 }
 
 watch(() => anchor.value.getTime(), refreshPlaytime, { immediate: true })

apps/app-frontend/src/components/home/HomeMinimal.vue

@@ -25,7 +25,6 @@ import HomeGreeting from '@/components/home/HomeGreeting.vue'
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
 import { useNetworkStatus } from '@/composables/useNetworkStatus'
-import { trackEvent } from '@/helpers/analytics'
 import { process_listener } from '@/helpers/events'
 import { install_existing_instance, install_pack_to_existing_instance } from '@/helpers/install'
 import { kill, run } from '@/helpers/instance'
@@ -126,11 +125,6 @@ async function playInstance() {
 	loading.value = true
 	try {
 		await run(instance.id)
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomeMinimal',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -149,11 +143,6 @@ async function stopInstance() {
 
 	await kill(instance.id).catch(handleError)
 	running.value = false
-	trackEvent('InstanceStop', {
-		loader: instance.loader,
-		game_version: instance.game_version,
-		source: 'HomeMinimal',
-	})
 }
 
 async function installInstance() {

apps/app-frontend/src/components/home/HomePinnedServers.vue

@@ -22,7 +22,6 @@ import { computed, ref } from 'vue'
 import type { HomeWidgetSize } from '@/components/home/home-dashboard'
 import { useHomeDashboardRuntime } from '@/components/home/home-dashboard-runtime'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import { kill } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import {
@@ -107,11 +106,6 @@ async function joinServer(world: ServerWorld & WorldWithInstance, instance: Game
 
 	try {
 		await start_join_server(world.instance_id, world.address)
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomePinnedServer',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -125,11 +119,6 @@ async function joinServer(world: ServerWorld & WorldWithInstance, instance: Game
 
 async function stopInstance(instance: GameInstance) {
 	await kill(instance.id).catch(handleError)
-	trackEvent('InstanceStop', {
-		loader: instance.loader,
-		game_version: instance.game_version,
-		source: 'HomePinnedServer',
-	})
 }
 
 async function unpinServer(world: ServerWorld & WorldWithInstance) {

apps/app-frontend/src/components/home/HomePinnedWorlds.vue

@@ -7,7 +7,6 @@ import { getHomeWidgetCardDensity, type HomeWidgetSize } from '@/components/home
 import { useHomeDashboardRuntime } from '@/components/home/home-dashboard-runtime'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import { kill, run } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import {
@@ -73,11 +72,6 @@ async function joinWorld(world: WorldWithInstance, instance: GameInstance) {
 	try {
 		await start_join_singleplayer_world(world.instance_id, world.path)
 		playingWorldKey.value = key
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomePinnedWorld',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -92,11 +86,6 @@ async function joinWorld(world: WorldWithInstance, instance: GameInstance) {
 async function playInstance(instance: GameInstance) {
 	try {
 		await run(instance.id)
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomePinnedWorld',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -109,11 +98,6 @@ async function playInstance(instance: GameInstance) {
 async function stopInstance(instance: GameInstance) {
 	await kill(instance.id).catch(handleError)
 	playingWorldKey.value = null
-	trackEvent('InstanceStop', {
-		loader: instance.loader,
-		game_version: instance.game_version,
-		source: 'HomePinnedWorld',
-	})
 }
 </script>
 

apps/app-frontend/src/components/home/HomeRecentWorlds.vue

@@ -15,7 +15,6 @@ import { useHomeDashboardRuntime } from '@/components/home/home-dashboard-runtim
 import InstanceItem from '@/components/ui/world/InstanceItem.vue'
 import WorldItem from '@/components/ui/world/WorldItem.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import { kill, run } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import {
@@ -117,11 +116,6 @@ async function joinWorld(world: WorldWithInstance, instance: GameInstance) {
 			await start_join_singleplayer_world(world.instance_id, world.path)
 		}
 		playingWorldKey.value = key
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomeRecentWorld',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -136,11 +130,6 @@ async function joinWorld(world: WorldWithInstance, instance: GameInstance) {
 async function playInstance(instance: GameInstance) {
 	try {
 		await run(instance.id)
-		trackEvent('InstanceStart', {
-			loader: instance.loader,
-			game_version: instance.game_version,
-			source: 'HomeRecentWorld',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.id,
@@ -153,11 +142,6 @@ async function playInstance(instance: GameInstance) {
 async function stopInstance(instance: GameInstance) {
 	await kill(instance.id).catch(handleError)
 	playingWorldKey.value = null
-	trackEvent('InstanceStop', {
-		loader: instance.loader,
-		game_version: instance.game_version,
-		source: 'HomeRecentWorld',
-	})
 }
 </script>
 

apps/app-frontend/src/components/home/HomeShortcutWidget.vue

@@ -28,7 +28,6 @@ import type { HomeWidgetPlacement, HomeWidgetSize } from '@/components/home/home
 import { useHomeDashboardRuntime } from '@/components/home/home-dashboard-runtime'
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import { kill, run } from '@/helpers/instance'
 import type { GameInstance } from '@/helpers/types'
 import {
@@ -205,11 +204,6 @@ async function playInstance(targetInstance: GameInstance) {
 	starting.value = true
 	try {
 		await run(targetInstance.id)
-		trackEvent('InstanceStart', {
-			loader: targetInstance.loader,
-			game_version: targetInstance.game_version,
-			source: 'HomeInstanceWidget',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: targetInstance.id,
@@ -230,11 +224,6 @@ async function playWorld() {
 		} else {
 			await start_join_singleplayer_world(instance.value.id, world.value.path)
 		}
-		trackEvent('InstanceStart', {
-			loader: instance.value.loader,
-			game_version: instance.value.game_version,
-			source: 'HomeShortcutWidget',
-		})
 	} catch (error) {
 		const handled = await handleMinecraftLaunchError(error, {
 			instance_id: instance.value.id,

apps/app-frontend/src/components/ui/AccountsCard.vue

@@ -280,7 +280,6 @@ import MinecraftLoginModal from '@/components/ui/MinecraftLoginModal.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { useNetworkStatus } from '@/composables/useNetworkStatus'
 import { compareMinecraftAccounts } from '@/helpers/accounts'
-import { trackEvent } from '@/helpers/analytics'
 import {
 	begin_yggdrasil_login,
 	delete_yggdrasil_password,
@@ -678,7 +677,6 @@ async function onMicrosoftLogin(account: MinecraftCredential) {
 	loginDisabled.value = true
 	try {
 		await setAccount(account)
-		trackEvent('AccountLogIn')
 	} catch (error) {
 		handleSevereError(error)
 	} finally {
@@ -833,7 +831,6 @@ async function addYggdrasilAccount() {
 			await persistYggdrasilPasswordPreference()
 			yggdrasilAccountModal.value?.hide()
 			await setAccount(result.credentials)
-			trackEvent('YggdrasilAccountAdd')
 		} else {
 			pendingYggdrasilFlowId.value = result.flow_id
 			pendingYggdrasilProfiles.value = result.profiles
@@ -859,7 +856,6 @@ async function selectYggdrasilProfile(profileId: string) {
 		await persistYggdrasilPasswordPreference()
 		yggdrasilProfileModal.value?.hide()
 		await setAccount(account)
-		trackEvent('YggdrasilAccountAdd')
 	} catch (error) {
 		handleError(error as Error)
 	} finally {
@@ -875,7 +871,6 @@ async function logout(account: MinecraftCredential) {
 	} else {
 		notifyAccountChange()
 	}
-	trackEvent('AccountLogOut')
 }
 
 async function copyAccountUuid(account: MinecraftCredential) {

apps/app-frontend/src/components/ui/AppActionBar.vue

@@ -212,7 +212,6 @@ import { useRoute, useRouter } from 'vue-router'
 import AppUpdateButton from '@/components/ui/app-update-button/index.vue'
 import { useInstallJobNotifications } from '@/composables/browse/install-job-notifications'
 import { useNetworkStatus } from '@/composables/useNetworkStatus'
-import { trackEvent } from '@/helpers/analytics'
 import { loading_listener, process_listener } from '@/helpers/events'
 import { get_many as getInstances } from '@/helpers/instance'
 import { get_all as getRunningProcesses, kill as killProcess } from '@/helpers/process'
@@ -437,11 +436,6 @@ const stop = async (process: RunningProcess) => {
 	try {
 		await killProcess(process.uuid).catch(handleError)
 
-		trackEvent('InstanceStop', {
-			loader: process.instance.loader,
-			game_version: process.instance.game_version,
-			source: 'AppBar',
-		})
 	} catch (e) {
 		console.error(e)
 	}

apps/app-frontend/src/components/ui/ErrorModal.vue

@@ -23,7 +23,6 @@ import { computed, ref } from 'vue'
 import { ChatIcon } from '@/assets/icons'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
 import { AxolotlBrandConfig } from '@/config'
-import { trackEvent } from '@/helpers/analytics'
 import { login as login_flow, set_default_user } from '@/helpers/auth.js'
 import { install_existing_instance } from '@/helpers/install'
 import { cancel_directory_change } from '@/helpers/settings.ts'
@@ -241,7 +240,6 @@ async function loginMinecraft() {
 			await set_default_user(loggedIn.profile.id).catch(handleError)
 		}
 
-		await trackEvent('AccountLogIn', { source: 'ErrorModal' })
 		loadingMinecraft.value = false
 		errorModal.value.hide()
 	} catch (err) {

apps/app-frontend/src/components/ui/Instance.vue

@@ -23,7 +23,6 @@ import { useRouter } from 'vue-router'
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
 import { useNetworkStatus } from '@/composables/useNetworkStatus'
-import { trackEvent } from '@/helpers/analytics'
 import { process_listener } from '@/helpers/events'
 import { install_existing_instance, install_pack_to_existing_instance } from '@/helpers/install'
 import { kill, run } from '@/helpers/instance'
@@ -121,11 +120,6 @@ const play = async (e, context) => {
 			if (!handled) handleSevereError(err, { instanceId: props.instance.id })
 		})
 		.finally(() => {
-			trackEvent('InstanceStart', {
-				loader: props.instance.loader,
-				game_version: props.instance.game_version,
-				source: context,
-			})
 		})
 	loading.value = false
 }
@@ -136,11 +130,6 @@ const stop = async (e, context) => {
 
 	await kill(props.instance.id).catch(handleError)
 
-	trackEvent('InstanceStop', {
-		loader: props.instance.loader,
-		game_version: props.instance.game_version,
-		source: context,
-	})
 }
 
 const repair = async (e) => {

apps/app-frontend/src/components/ui/JavaDetectionModal.vue

@@ -59,7 +59,6 @@ import {
 import { onUnmounted, ref } from 'vue'
 
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { java_discovery_listener } from '@/helpers/events'
 import { find_filtered_jres } from '@/helpers/jre.js'
 
@@ -131,9 +130,5 @@ const emit = defineEmits(['submit'])
 function setJavaInstall(javaInstall) {
 	emit('submit', javaInstall)
 	detectJavaModal.value.hide()
-	trackEvent('JavaAutoDetect', {
-		path: javaInstall.path,
-		version: javaInstall.version,
-	})
 }
 </script>

apps/app-frontend/src/components/ui/JavaSelector.vue

@@ -112,7 +112,6 @@ import { computed, ref, watch } from 'vue'
 
 import JavaDetectionModal from '@/components/ui/JavaDetectionModal.vue'
 import useJavaTest from '@/composables/useJavaTest'
-import { trackEvent } from '@/helpers/analytics'
 import { auto_install_java, find_filtered_jres, get_jre } from '@/helpers/jre.js'
 
 const { handleError } = injectNotificationManager()
@@ -196,9 +195,9 @@ const recommendedInstalled = computed(() => {
 let hasInitialized = false
 
 async function runTest(path) {
-	await testJavaInstallation(path, testVersion.value, true)
+	await testJavaInstallation(path, testVersion.value)
 	if (props.version != null) {
-		await recommendedJavaTest.testJavaInstallation(path, props.version, false)
+		await recommendedJavaTest.testJavaInstallation(path, props.version)
 	}
 }
 
@@ -212,9 +211,9 @@ watch(
 	(newPath) => {
 		if (newPath) {
 			if (!hasInitialized) {
-				testJavaInstallation(newPath, testVersion.value, false)
+			testJavaInstallation(newPath, testVersion.value)
 				if (props.version != null) {
-					recommendedJavaTest.testJavaInstallation(newPath, props.version, false)
+				recommendedJavaTest.testJavaInstallation(newPath, props.version)
 				}
 				hasInitialized = true
 			} else {
@@ -242,9 +241,6 @@ async function handleJavaFileInput() {
 			}
 		}
 
-		trackEvent('JavaManualSelect', {
-			version: props.version,
-		})
 
 		commitSelection(result)
 	}
@@ -279,7 +275,6 @@ async function reinstallJava() {
 			}
 		}
 
-		trackEvent('JavaReInstall', { path: path, version: props.version })
 		commitSelection(result)
 		runTest(result.path)
 	} finally {

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

@@ -14,7 +14,6 @@ import { computed, ref } from 'vue'
 
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import ModalWrapper from '@/components/ui/modal/ModalWrapper.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { list } from '@/helpers/instance'
 import { add_server_to_instance, get_instance_worlds } from '@/helpers/worlds.ts'
 
@@ -91,7 +90,6 @@ defineExpose({
 		instances.value = instanceValues
 		modal.value.show()
 
-		trackEvent('AddServerToInstanceStart', { source: 'AddServerToInstanceModal' })
 	},
 })
 
@@ -102,11 +100,6 @@ async function addServer(instance) {
 		instance.added = true
 		await queryClient.invalidateQueries({ queryKey: ['worlds', instance.id] })
 
-		trackEvent('AddServerToInstance', {
-			server_name: serverName.value,
-			instance_name: instance.name,
-			source: 'AddServerToInstanceModal',
-		})
 	} catch (err) {
 		handleError(err)
 	}

apps/app-frontend/src/components/ui/instance_settings/GeneralSettings.vue

@@ -18,7 +18,6 @@ import { useRouter } from 'vue-router'
 
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import ConfirmDeleteInstanceModal from '@/components/ui/modal/ConfirmDeleteInstanceModal.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { install_duplicate_instance } from '@/helpers/install'
 import { edit, edit_icon, get_full_path, remove } from '@/helpers/instance'
 import { injectInstanceSettings } from '@/providers/instance-settings'
@@ -49,10 +48,6 @@ const installing = computed(() => instance.value.install_stage !== 'installed')
 
 async function duplicateInstance() {
 	await install_duplicate_instance(instance.value.id).catch(handleError)
-	trackEvent('InstanceDuplicate', {
-		loader: instance.value.loader,
-		game_version: instance.value.game_version,
-	})
 }
 
 function formatReleaseChannelLabel(channel: ReleaseChannel) {
@@ -104,7 +99,6 @@ watch(selectedReleaseChannel, async (channel, previousChannel) => {
 async function resetIcon() {
 	icon.value = undefined
 	await edit_icon(instance.value.id, null).catch(handleError)
-	trackEvent('InstanceRemoveIcon')
 }
 
 async function setIcon() {
@@ -116,7 +110,6 @@ async function setIcon() {
 		icon.value = picked.path
 		try {
 			await edit_icon(instance.value.id, picked.path)
-			trackEvent('InstanceSetIcon')
 		} catch (error) {
 			icon.value = previousIcon
 			handleError(error)
@@ -253,10 +246,6 @@ async function removeInstance() {
 	removing.value = true
 	const path = instance.value.id
 
-	trackEvent('InstanceRemove', {
-		loader: instance.value.loader,
-		game_version: instance.value.game_version,
-	})
 
 	await router.push({ path: '/' })
 	await remove(path).catch(handleError)

apps/app-frontend/src/components/ui/instance_settings/InstallationSettings.vue

@@ -22,7 +22,6 @@ import { useQuery, useQueryClient } from '@tanstack/vue-query'
 import { computed, ref } from 'vue'
 
 import SymlinkInstanceWarning from '@/components/ui/SymlinkInstanceWarning.vue'
-import { trackEvent } from '@/helpers/analytics'
 import { get_project_versions, get_version } from '@/helpers/cache'
 import { type CurseForgeFile, updateManagedCurseForgeModpack } from '@/helpers/curseforge'
 import {
@@ -333,10 +332,6 @@ provideInstallationSettings({
 	afterSave: async () => {
 		debug('afterSave: installing', { instanceId: instance.value.id })
 		await install_existing_instance(instance.value.id, false).catch(handleError)
-		trackEvent('InstanceRepair', {
-			loader: instance.value.loader,
-			game_version: instance.value.game_version,
-		})
 		debug('afterSave: done')
 	},
 
@@ -345,40 +340,27 @@ provideInstallationSettings({
 		repairing.value = true
 		await install_existing_instance(instance.value.id, true).catch(handleError)
 		repairing.value = false
-		trackEvent('InstanceRepair', {
-			loader: instance.value.loader,
-			game_version: instance.value.game_version,
-		})
 		debug('repair: done')
 	},
 
 	async reinstallModpack() {
 		debug('reinstallModpack: called', { instanceId: instance.value.id })
 		reinstalling.value = true
-		let shouldTrack = false
 		try {
 			if (isImportedModpack.value) {
-				shouldTrack = await installLocalModpackFromPicker()
+				await installLocalModpackFromPicker()
 			} else if (isCurseForgeLinkedModpack.value) {
 				const fileId = Number(instance.value.link?.version_id)
 				if (!Number.isFinite(fileId)) {
 					throw new Error('Invalid CurseForge file ID')
 				}
 				await updateManagedCurseForgeModpack(instance.value.id, fileId).catch(handleError)
-				shouldTrack = true
 			} else {
 				await update_repair_modrinth(instance.value.id).catch(handleError)
-				shouldTrack = true
 			}
 		} finally {
 			reinstalling.value = false
 		}
-		if (shouldTrack) {
-			trackEvent('InstanceRepair', {
-				loader: instance.value.loader,
-				game_version: instance.value.game_version,
-			})
-		}
 		debug('reinstallModpack: done')
 	},
 
@@ -386,13 +368,7 @@ provideInstallationSettings({
 		debug('swapModpack: called', { instanceId: instance.value.id })
 		reinstalling.value = true
 		try {
-			const installed = await installLocalModpackFromPicker()
-			if (installed) {
-				trackEvent('InstanceRepair', {
-					loader: instance.value.loader,
-					game_version: instance.value.game_version,
-				})
-			}
+			await installLocalModpackFromPicker()
 		} finally {
 			reinstalling.value = false
 		}

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

@@ -1,145 +0,0 @@
-<script setup lang="ts">
-import { ExternalIcon, ShieldIcon, SpinnerIcon } from '@modrinth/assets'
-import {
-	ButtonStyled,
-	defineMessages,
-	injectNotificationManager,
-	NewModal,
-	Toggle,
-	useVIntl,
-} from '@modrinth/ui'
-import { openUrl } from '@tauri-apps/plugin-opener'
-import { ref } from 'vue'
-
-import { type PrivacySettings, savePrivacySettings } from '@/helpers/settings'
-
-const emit = defineEmits<{
-	saved: [privacy: PrivacySettings]
-}>()
-
-const CONSENT_VERSION = 1
-const { formatMessage } = useVIntl()
-const { handleError } = injectNotificationManager()
-const modal = ref<InstanceType<typeof NewModal>>()
-const telemetry = ref(true)
-const discordRpc = ref(true)
-const saving = ref(false)
-
-const messages = defineMessages({
-	title: {
-		id: 'app.privacy-consent.title',
-		defaultMessage: 'Privacy & security',
-	},
-	intro: {
-		id: 'app.privacy-consent.intro',
-		defaultMessage:
-			'Choose what Starlight may send or display. Nothing is sent until you confirm these choices.',
-	},
-	telemetry: {
-		id: 'app.privacy-consent.telemetry',
-		defaultMessage: 'Allow anonymous telemetry',
-	},
-	telemetryDescription: {
-		id: 'app.privacy-consent.telemetry-description',
-		defaultMessage:
-			'Helps count opted-in installations and daily active users. Full Minecraft logs and account credentials are never uploaded.',
-	},
-	discordRpc: {
-		id: 'app.privacy-consent.discord-rpc',
-		defaultMessage: 'Discord Rich Presence',
-	},
-	discordRpcDescription: {
-		id: 'app.privacy-consent.discord-rpc-description',
-		defaultMessage:
-			'Shows your current launcher or game activity in Discord when Discord is running.',
-	},
-	privacyPolicy: {
-		id: 'app.privacy-consent.privacy-policy',
-		defaultMessage: 'Read the privacy policy',
-	},
-	continue: {
-		id: 'app.privacy-consent.continue',
-		defaultMessage: 'Save and continue',
-	},
-})
-
-function show(current: PrivacySettings) {
-	telemetry.value = true
-	discordRpc.value = current.discord_rpc
-	modal.value?.show()
-}
-
-async function save() {
-	if (saving.value) return
-	saving.value = true
-	try {
-		const privacy = await savePrivacySettings({
-			telemetry: telemetry.value,
-			discord_rpc: discordRpc.value,
-			consent_version: CONSENT_VERSION,
-		})
-		modal.value?.hide()
-		emit('saved', privacy)
-	} catch (error) {
-		handleError(error)
-	} finally {
-		saving.value = false
-	}
-}
-
-defineExpose({ show })
-</script>
-
-<template>
-	<NewModal ref="modal" :header="formatMessage(messages.title)" :closable="false" max-width="600px">
-		<div class="flex flex-col gap-6">
-			<div class="flex items-start gap-3">
-				<ShieldIcon class="mt-0.5 size-6 shrink-0 text-brand" />
-				<p class="m-0 leading-relaxed text-primary">
-					{{ formatMessage(messages.intro) }}
-				</p>
-			</div>
-
-			<div class="flex items-center justify-between gap-5">
-				<div class="min-w-0">
-					<label for="consent-telemetry" class="font-semibold text-contrast">
-						{{ formatMessage(messages.telemetry) }}
-					</label>
-					<p class="mb-0 mt-1 text-sm leading-relaxed text-secondary">
-						{{ formatMessage(messages.telemetryDescription) }}
-					</p>
-				</div>
-				<Toggle id="consent-telemetry" v-model="telemetry" :disabled="saving" />
-			</div>
-
-			<div class="flex items-center justify-between gap-5">
-				<div class="min-w-0">
-					<label for="consent-discord-rpc" class="font-semibold text-contrast">
-						{{ formatMessage(messages.discordRpc) }}
-					</label>
-					<p class="mb-0 mt-1 text-sm leading-relaxed text-secondary">
-						{{ formatMessage(messages.discordRpcDescription) }}
-					</p>
-				</div>
-				<Toggle id="consent-discord-rpc" v-model="discordRpc" :disabled="saving" />
-			</div>
-		</div>
-
-		<template #actions>
-			<div class="flex items-center justify-between gap-4">
-				<ButtonStyled type="transparent">
-					<button type="button" :disabled="saving" @click="openUrl('https://axlmc.org/privacy')">
-						<ExternalIcon />
-						{{ formatMessage(messages.privacyPolicy) }}
-					</button>
-				</ButtonStyled>
-				<ButtonStyled color="brand">
-					<button type="button" :disabled="saving" @click="save">
-						<SpinnerIcon v-if="saving" class="animate-spin" />
-						{{ formatMessage(messages.continue) }}
-					</button>
-				</ButtonStyled>
-			</div>
-		</template>
-	</NewModal>
-</template>

apps/app-frontend/src/components/ui/onboarding/onboardingConfig.ts

@@ -204,15 +204,6 @@ export const onboardingMessages = defineMessages({
 		defaultMessage:
 			'Choose how content downloads and installs, from download sources to safety checks.',
 	},
-	privacyTitle: {
-		id: 'app.onboarding.privacy.title',
-		defaultMessage: 'Your data, your call',
-	},
-	privacyDescription: {
-		id: 'app.onboarding.privacy.description',
-		defaultMessage:
-			'Manage anonymous telemetry, Discord Rich Presence, and the Minecraft log analysis service whenever you need to.',
-	},
 	updatesTitle: { id: 'app.onboarding.updates.title', defaultMessage: 'Stay in the loop' },
 	updatesDescription: {
 		id: 'app.onboarding.updates.description',

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

@@ -21,7 +21,6 @@ import JetBrainsLogo from '@/assets/java-vendors/jetbrains.png'
 import MicrosoftLogo from '@/assets/java-vendors/microsoft.png'
 import OracleLogo from '@/assets/java-vendors/oracle.png'
 import SapLogo from '@/assets/java-vendors/sap.png'
-import { trackEvent } from '@/helpers/analytics'
 import { download_java, list_java_feed_vendors, list_java_feed_versions } from '@/helpers/jre'
 
 const { handleError } = injectNotificationManager()
@@ -117,7 +116,6 @@ function backToVendors() {
 
 async function downloadVersion(info) {
 	downloading.value = info.major_version
-	trackEvent('JavaDownload', { vendor: info.vendor, version: info.major_version })
 	modal.value?.hide()
 
 	const job = await download_java(info.vendor, info.major_version).catch(handleError)

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

@@ -23,7 +23,6 @@ const { formatMessage } = useVIntl()
 const { addNotification } = injectNotificationManager()
 const isDevEnvironment = await isDev()
 const previewMinecraftCrashModal = inject<() => void>('previewMinecraftCrashModal')
-const previewPrivacyConsentModal = inject<() => Promise<void>>('previewPrivacyConsentModal')
 const messages = defineMessages({
 	resetToDefault: {
 		id: 'app.settings.feature-flags.reset-to-default',
@@ -53,10 +52,6 @@ const messages = defineMessages({
 		id: 'app.settings.about.preview-minecraft-crash-modal',
 		defaultMessage: 'Preview Minecraft crash window',
 	},
-	previewPrivacyConsentModal: {
-		id: 'app.settings.about.preview-privacy-consent-modal',
-		defaultMessage: 'Preview privacy & security modal',
-	},
 })
 
 const settings = ref(await getSettings())
@@ -127,9 +122,6 @@ watch(
 			<Button type="base" @click="previewMinecraftCrashModal?.()">
 				<WrenchIcon /> {{ formatMessage(messages.previewMinecraftCrashModal) }}
 			</Button>
-			<Button type="base" @click="previewPrivacyConsentModal?.()">
-				<WrenchIcon /> {{ formatMessage(messages.previewPrivacyConsentModal) }}
-			</Button>
 		</div>
 	</SettingsSection>
 </template>

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

@@ -19,7 +19,6 @@ import MemoryAllocationDisplay from '@/components/ui/MemoryAllocationDisplay.vue
 import DownloadJavaModal from '@/components/ui/settings/DownloadJavaModal.vue'
 import InstalledJavaModal from '@/components/ui/settings/InstalledJavaModal.vue'
 import useMemorySlider from '@/composables/useMemorySlider'
-import { trackEvent } from '@/helpers/analytics'
 import { collectGcContext } from '@/helpers/gc/context'
 import { wait_for_install_job } from '@/helpers/install'
 import { getJavaArgumentPresets } from '@/helpers/java-argument-presets'
@@ -249,7 +248,6 @@ async function runScan(exhaustive) {
 
 	scanning.value = true
 	scanMode.value = 'quick'
-	trackEvent('JavaQuickScan', { source: 'settings' })
 	try {
 		await find_filtered_jres(null, false, true, false).catch(handleError)
 	} finally {
@@ -262,7 +260,6 @@ async function confirmDeepScan() {
 	showDeepScanConfirm.value = false
 	scanning.value = true
 	scanMode.value = 'deep'
-	trackEvent('JavaDeepScan', { source: 'settings' })
 	try {
 		await find_filtered_jres(null, true, true, true).catch(handleError)
 	} finally {
@@ -280,7 +277,6 @@ async function handleManualAdd() {
 	if (!javaInfo) return
 
 	await set_java_version(javaInfo).catch(handleError)
-	trackEvent('JavaManualSelect', { path: filePath })
 }
 
 async function onJavaDownloaded(job) {

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

@@ -1,156 +0,0 @@
-<script setup lang="ts">
-import { defineMessages, injectNotificationManager, Toggle, useVIntl } from '@modrinth/ui'
-import { computed, ref } from 'vue'
-
-import { getPrivacySettings, setDiscordRpcEnabled, setTelemetryEnabled } from '@/helpers/settings'
-
-import SettingsRow from './SettingsRow.vue'
-import SettingsSaveStatus from './SettingsSaveStatus.vue'
-
-const { formatMessage } = useVIntl()
-const { handleError } = injectNotificationManager()
-const privacy = ref(await getPrivacySettings())
-const telemetrySaving = ref(false)
-const discordSaving = ref(false)
-const lastSaveState = ref<'idle' | 'saved' | 'error'>('idle')
-const retrySave = ref<(() => void) | undefined>()
-
-const messages = defineMessages({
-	telemetry: {
-		id: 'app.settings.privacy.telemetry',
-		defaultMessage: 'Allow telemetry',
-	},
-	telemetryDescription: {
-		id: 'app.settings.privacy.telemetry-description',
-		defaultMessage:
-			'Send one anonymous daily activity signal to improve usage statistics. Minecraft logs and account credentials are never uploaded.',
-	},
-	discordRpc: {
-		id: 'app.settings.privacy.discord-rpc',
-		defaultMessage: 'Discord Rich Presence',
-	},
-	discordRpcDescription: {
-		id: 'app.settings.privacy.discord-rpc-description',
-		defaultMessage: 'Show your current launcher or game activity in Discord.',
-	},
-	dataHandling: {
-		id: 'app.settings.privacy.data-handling',
-		defaultMessage:
-			'Telemetry uses a random installation identifier and sends only a daily activity signal. Turning telemetry off clears pending data immediately.',
-	},
-})
-const saveStatus = computed(() => {
-	if (telemetrySaving.value || discordSaving.value) return 'saving'
-	return lastSaveState.value
-})
-
-async function updateTelemetry(value: boolean) {
-	if (telemetrySaving.value) return
-	const previous = privacy.value.telemetry
-	privacy.value.telemetry = value
-	telemetrySaving.value = true
-	lastSaveState.value = 'idle'
-	retrySave.value = undefined
-	try {
-		const saved = await setTelemetryEnabled(value)
-		privacy.value.telemetry = saved.telemetry
-		privacy.value.consent_version = saved.consent_version
-		lastSaveState.value = 'saved'
-	} catch (error) {
-		privacy.value.telemetry = previous
-		retrySave.value = () => void updateTelemetry(value)
-		lastSaveState.value = 'error'
-		handleError(error)
-	} finally {
-		telemetrySaving.value = false
-	}
-}
-
-async function updateDiscordRpc(value: boolean) {
-	if (discordSaving.value) return
-	const previous = privacy.value.discord_rpc
-	privacy.value.discord_rpc = value
-	discordSaving.value = true
-	lastSaveState.value = 'idle'
-	retrySave.value = undefined
-	try {
-		const saved = await setDiscordRpcEnabled(value)
-		privacy.value.discord_rpc = saved.discord_rpc
-		lastSaveState.value = 'saved'
-	} catch (error) {
-		privacy.value.discord_rpc = previous
-		retrySave.value = () => void updateDiscordRpc(value)
-		lastSaveState.value = 'error'
-		handleError(error)
-	} finally {
-		discordSaving.value = false
-	}
-}
-</script>
-
-<template>
-	<div class="flex w-full flex-col gap-4">
-		<header class="settings-page-header">
-			<SettingsSaveStatus :status="saveStatus" :retry="retrySave" />
-		</header>
-		<div class="settings-page-card">
-			<SettingsRow>
-				<template #label>
-					<span id="settings-target-privacy-telemetry" tabindex="-1">
-						{{ formatMessage(messages.telemetry) }}
-					</span>
-				</template>
-				<template #description>{{ formatMessage(messages.telemetryDescription) }}</template>
-				<template #control>
-					<Toggle
-						id="privacy-telemetry"
-						:model-value="privacy.telemetry"
-						:disabled="telemetrySaving"
-						@update:model-value="(value) => updateTelemetry(!!value)"
-					/>
-				</template>
-			</SettingsRow>
-			<SettingsRow>
-				<template #label>
-					<span id="settings-target-privacy-discord-rpc" tabindex="-1">
-						{{ formatMessage(messages.discordRpc) }}
-					</span>
-				</template>
-				<template #description>{{ formatMessage(messages.discordRpcDescription) }}</template>
-				<template #control>
-					<Toggle
-						id="privacy-discord-rpc"
-						:model-value="privacy.discord_rpc"
-						:disabled="discordSaving"
-						@update:model-value="(value) => updateDiscordRpc(!!value)"
-					/>
-				</template>
-			</SettingsRow>
-		</div>
-
-		<p class="settings-page-note">{{ formatMessage(messages.dataHandling) }}</p>
-	</div>
-</template>
-
-<style scoped>
-.settings-page-card {
-	overflow: hidden;
-	border: 1px solid
-		var(--settings-card-border, color-mix(in srgb, var(--surface-4) 72%, transparent));
-	border-radius: var(--radius-md);
-	background: var(--surface-2);
-}
-
-.settings-page-header {
-	display: flex;
-	min-height: 0;
-	justify-content: flex-end;
-}
-
-.settings-page-note {
-	margin: 0;
-	color: var(--color-secondary);
-	font-size: 0.8125rem;
-	line-height: 1.5;
-}
-</style>

apps/app-frontend/src/components/ui/settings/settings-category-definitions.ts

@@ -10,7 +10,6 @@ export type SettingsCategoryId =
 	| 'content-downloads'
 	| 'network-multiplayer'
 	| 'storage-backups'
-	| 'privacy-data'
 	| 'updates'
 	| 'about'
 	| 'feature-flags'
@@ -106,15 +105,6 @@ export const settingsCategoryDefinitions: SettingsCategoryDefinition[] = [
 		group: 'data-privacy',
 		onboardingId: 'settings-tab-storage-backups',
 	},
-	{
-		id: 'privacy-data',
-		name: defineMessage({
-			id: 'app.settings.tabs.privacy-data',
-			defaultMessage: 'Privacy & data sharing',
-		}),
-		group: 'data-privacy',
-		onboardingId: 'settings-tab-privacy-data',
-	},
 	{
 		id: 'updates',
 		name: defineMessage({ id: 'app.settings.tabs.updates', defaultMessage: 'Updates' }),

apps/app-frontend/src/components/ui/settings/settings-registry.ts

@@ -72,10 +72,6 @@ const categoryContent: Record<SettingsCategoryId, Pick<SettingsCategory, 'icon'
 		icon: ArchiveIcon,
 		content: defineAsyncComponent(() => import('./StorageBackupSettings.vue')),
 	},
-	'privacy-data': {
-		icon: ShieldIcon,
-		content: defineAsyncComponent(() => import('./PrivacySettings.vue')),
-	},
 	updates: {
 		icon: RefreshCwIcon,
 		content: defineAsyncComponent(() => import('./UpdateSettings.vue')),

apps/app-frontend/src/components/ui/settings/settings-search-index.ts

@@ -221,18 +221,6 @@ export const settingsSearchEntries: SettingsSearchEntry[] = [
 		label: message('app.crash-analysis.ai.settings.title', 'Crash AI explanation'),
 		keywords: [message('app.settings.tabs.launch-defaults', 'Launch & instance defaults')],
 	},
-	{
-		id: 'privacy-telemetry',
-		categoryId: 'privacy-data',
-		targetId: 'settings-target-privacy-telemetry',
-		label: message('app.settings.privacy.telemetry', 'Telemetry'),
-	},
-	{
-		id: 'privacy-discord-rpc',
-		categoryId: 'privacy-data',
-		targetId: 'settings-target-privacy-discord-rpc',
-		label: message('app.settings.privacy.discord-rpc', 'Discord rich presence'),
-	},
 	{
 		id: 'java-installations',
 		categoryId: 'java-performance',

apps/app-frontend/src/components/ui/settings/settings-search.test.ts

@@ -28,7 +28,6 @@ const settingsComponentFiles = {
 	'content-downloads': ['./AppearanceSettings.vue', './ResourceManagementSettings.vue'],
 	'network-multiplayer': ['./ResourceManagementSettings.vue', './MultiplayerSettings.vue'],
 	'storage-backups': ['./ResourceManagementSettings.vue', './StorageSettings.vue'],
-	'privacy-data': ['./PrivacySettings.vue'],
 	updates: ['./UpdateSettings.vue'],
 	about: ['./AboutSettings.vue'],
 	'feature-flags': ['./FeatureFlagSettings.vue'],
@@ -169,7 +168,7 @@ test('developer-only settings stay out of the normal search categories', () => {
 		'content-downloads',
 		'network-multiplayer',
 	])
-	assert.deepEqual(categoriesForGroup('data-privacy'), ['storage-backups', 'privacy-data'])
+	assert.deepEqual(categoriesForGroup('data-privacy'), ['storage-backups'])
 	assert.deepEqual(categoriesForGroup('support'), ['updates', 'about'])
 	assert.deepEqual(categoriesForGroup('developer'), [])
 	assert.deepEqual(categoriesForGroup('developer', true), ['feature-flags'])

apps/app-frontend/src/components/ui/world/InstanceItem.vue

@@ -26,7 +26,6 @@ import { useRouter } from 'vue-router'
 
 import InstanceIcon from '@/components/ui/InstanceIcon.vue'
 import { useMinecraftLaunchError } from '@/composables/useMinecraftLaunchError'
-import { trackEvent } from '@/helpers/analytics'
 import { get_project } from '@/helpers/cache'
 import { process_listener } from '@/helpers/events'
 import { kill, run } from '@/helpers/instance'
@@ -108,11 +107,6 @@ const play = async (event: MouseEvent) => {
 			if (!handled) handleSevereError(err, { instanceId: props.instance.id })
 		})
 		.finally(() => {
-			trackEvent('InstanceStart', {
-				loader: props.instance.loader,
-				game_version: props.instance.game_version,
-				source: 'InstanceItem',
-			})
 		})
 	emit('play')
 	loading.value = false
@@ -122,11 +116,6 @@ const stop = async (event: MouseEvent) => {
 	event?.stopPropagation()
 	loading.value = true
 	await kill(props.instance.id).catch(handleError)
-	trackEvent('InstanceStop', {
-		loader: props.instance.loader,
-		game_version: props.instance.game_version,
-		source: 'InstanceItem',
-	})
 	emit('stop')
 	loading.value = false
 }