fix: DI nonsense (#4174)

* fix: DI nonsense

* fix: lint

* fix: client try di issue

* fix: injects outside of context

* fix: use .catch

* refactor: convert projects.vue to composition API.

* fix: moderation checklist notif pos change watcher

* fix: lint issues

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

@@ -165,7 +165,14 @@ const handleOptionsClick = async (args) => {
 			await navigator.clipboard.writeText(args.item.path)
 			break
 		case 'install': {
-			await installVersion(args.item.project_id, null, null, 'ProjectCardContextMenu')
+			await installVersion(
+				args.item.project_id,
+				null,
+				null,
+				'ProjectCardContextMenu',
+				() => {},
+				() => {},
+			).catch(handleError)
 
 			break
 		}

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

@@ -94,7 +94,7 @@ const stop = async (e, context) => {
 const repair = async (e) => {
 	e?.stopPropagation()
 
-	await finish_install(props.instance)
+	await finish_install(props.instance).catch(handleError)
 }
 
 const openFolder = async () => {

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

@@ -118,7 +118,7 @@
 
 <script setup>
 import { CheckIcon, DownloadIcon, HeartIcon, PlusIcon, TagsIcon } from '@modrinth/assets'
-import { Avatar, ButtonStyled } from '@modrinth/ui'
+import { Avatar, ButtonStyled, injectNotificationManager } from '@modrinth/ui'
 import { formatCategory, formatNumber } from '@modrinth/utils'
 import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
@@ -128,6 +128,8 @@ import { useRouter } from 'vue-router'
 import { install as installVersion } from '@/store/install.js'
 dayjs.extend(relativeTime)
 
+const { handleError } = injectNotificationManager()
+
 const router = useRouter()
 
 const props = defineProps({
@@ -175,7 +177,7 @@ async function install() {
 		(profile) => {
 			router.push(`/instance/${profile}`)
 		},
-	)
+	).catch(handleError)
 }
 
 const modpack = computed(() => props.project.project_type === 'modpack')

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

@@ -39,7 +39,14 @@ defineExpose({
 
 async function install() {
 	confirmModal.value.hide()
-	await installVersion(project.value.id, version.value.id, null, 'URLConfirmModal')
+	await installVersion(
+		project.value.id,
+		version.value.id,
+		null,
+		'URLConfirmModal',
+		() => {},
+		() => {},
+	).catch(handleError)
 }
 </script>
 

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

@@ -110,7 +110,7 @@ async function install(instance) {
 	}
 
 	await installMod(instance.path, version.id).catch(handleError)
-	await installVersionDependencies(instance, version)
+	await installVersionDependencies(instance, version).catch(handleError)
 
 	instance.installedMod = true
 	instance.installing = false
@@ -185,7 +185,7 @@ const createInstance = async () => {
 	await router.push(`/instance/${encodeURIComponent(id)}/`)
 
 	const instance = await get(id, true)
-	await installVersionDependencies(instance, versions.value[0])
+	await installVersionDependencies(instance, versions.value[0]).catch(handleError)
 
 	trackEvent('InstanceCreate', {
 		profile_name: name.value,

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

@@ -16,7 +16,7 @@ const { formatMessage } = useVIntl()
 
 const props = defineProps<InstanceSettingsTabProps>()
 
-const globalSettings = (await get().catch(handleError)) as AppSettings
+const globalSettings = (await get().catch(handleError)) as unknown as AppSettings
 
 const overrideJavaInstall = ref(!!props.instance.java_path)
 const optimalJava = readonly(await get_optimal_jre_key(props.instance.path).catch(handleError))
@@ -36,7 +36,10 @@ const envVars = ref(
 
 const overrideMemorySettings = ref(!!props.instance.memory)
 const memory = ref(props.instance.memory ?? globalSettings.memory)
-const { maxMemory, snapPoints } = await useMemorySlider()
+const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
+	maxMemory: number
+	snapPoints: number[]
+}
 
 const editProfileObject = computed(() => {
 	const editProfile: {

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

@@ -1,17 +1,22 @@
 <script setup lang="ts">
-import { Slider, Toggle } from '@modrinth/ui'
+import { injectNotificationManager, Slider, Toggle } from '@modrinth/ui'
 import { ref, watch } from 'vue'
 
 import useMemorySlider from '@/composables/useMemorySlider'
 import { get, set } from '@/helpers/settings.ts'
 
+const { handleError } = injectNotificationManager()
+
 const fetchSettings = await get()
 fetchSettings.launchArgs = fetchSettings.extra_launch_args.join(' ')
 fetchSettings.envVars = fetchSettings.custom_env_vars.map((x) => x.join('=')).join(' ')
 
 const settings = ref(fetchSettings)
 
-const { maxMemory, snapPoints } = await useMemorySlider()
+const { maxMemory, snapPoints } = (await useMemorySlider().catch(handleError)) as unknown as {
+	maxMemory: number
+	snapPoints: number[]
+}
 
 watch(
 	settings,

apps/app-frontend/src/composables/useMemorySlider.js

@@ -1,11 +1,9 @@
-import { injectNotificationManager } from '@modrinth/ui'
 import { computed, ref } from 'vue'
 
 import { get_max_memory } from '@/helpers/jre.js'
 
 export default async function () {
-	const { handleError } = injectNotificationManager()
-	const maxMemory = ref(Math.floor((await get_max_memory().catch(handleError)) / 1024))
+	const maxMemory = ref(Math.floor((await get_max_memory()) / 1024))
 
 	const snapPoints = computed(() => {
 		let points = []

apps/app-frontend/src/helpers/fetch.js

@@ -1,4 +1,3 @@
-import { injectNotificationManager } from '@modrinth/ui'
 import { getVersion } from '@tauri-apps/api/app'
 import { fetch } from '@tauri-apps/plugin-http'
 
@@ -11,9 +10,9 @@ export const useFetch = async (url, item, isSilent) => {
 		})
 	} catch (err) {
 		if (!isSilent) {
-			const { handleError } = injectNotificationManager()
-			handleError({ message: `Error fetching ${item}` })
+			throw err
+		} else {
+			console.error(err)
 		}
-		console.error(err)
 	}
 }

apps/app-frontend/src/helpers/profile.js

@@ -3,7 +3,6 @@
  * So, for example, addDefaultInstance creates a blank Profile object, where the Rust struct is serialized,
  *  and deserialized into a usable JS object.
  */
-import { injectNotificationManager } from '@modrinth/ui'
 import { invoke } from '@tauri-apps/api/core'
 
 import { install_to_existing_profile } from '@/helpers/pack.js'
@@ -194,7 +193,6 @@ export async function edit_icon(path, iconPath) {
 }
 
 export async function finish_install(instance) {
-	const { handleError } = injectNotificationManager()
 	if (instance.install_stage !== 'pack_installed') {
 		let linkedData = instance.linked_data
 		await install_to_existing_profile(
@@ -202,8 +200,8 @@ export async function finish_install(instance) {
 			linkedData.version_id,
 			instance.name,
 			instance.path,
-		).catch(handleError)
+		)
 	} else {
-		await install(instance.path, false).catch(handleError)
+		await install(instance.path, false)
 	}
 }

apps/app-frontend/src/helpers/skins.ts

@@ -1,4 +1,3 @@
-import { injectNotificationManager } from '@modrinth/ui'
 import { arrayBufferToBase64 } from '@modrinth/utils'
 import { invoke } from '@tauri-apps/api/core'
 
@@ -39,8 +38,7 @@ export const DEFAULT_MODELS: Record<string, SkinModel> = {
 
 export function filterSavedSkins(list: Skin[]) {
 	const customSkins = list.filter((s) => s.source !== 'default')
-	const { handleError } = injectNotificationManager()
-	fixUnknownSkins(customSkins).catch(handleError)
+	fixUnknownSkins(customSkins)
 	return customSkins
 }
 

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

@@ -66,7 +66,14 @@ const defaultCape = ref<Cape>()
 const originalSelectedSkin = ref<Skin | null>(null)
 const originalDefaultCape = ref<Cape>()
 
-const savedSkins = computed(() => filterSavedSkins(skins.value))
+const savedSkins = computed(() => {
+	try {
+		return filterSavedSkins(skins.value)
+	} catch (error) {
+		handleError(error as Error)
+		return []
+	}
+})
 const defaultSkins = computed(() => filterDefaultSkins(skins.value))
 
 const currentCape = computed(() => {

apps/app-frontend/src/pages/instance/Index.vue

@@ -331,7 +331,7 @@ const stopInstance = async (context) => {
 }
 
 const repairInstance = async () => {
-	await finish_install(instance.value)
+	await finish_install(instance.value).catch(handleError)
 }
 
 const handleRightClick = (event) => {

apps/app-frontend/src/pages/project/Index.vue

@@ -252,7 +252,7 @@ async function install(version) {
 		(profile) => {
 			router.push(`/instance/${profile}`)
 		},
-	)
+	).catch(handleError)
 }
 
 const options = ref(null)

apps/app-frontend/src/store/install.js

@@ -1,4 +1,3 @@
-import { injectNotificationManager } from '@modrinth/ui'
 import dayjs from 'dayjs'
 import { defineStore } from 'pinia'
 
@@ -50,12 +49,11 @@ export const install = async (
 	callback = () => {},
 	createInstanceCallback = () => {},
 ) => {
-	const { handleError } = injectNotificationManager()
-	const project = await get_project(projectId, 'must_revalidate').catch(handleError)
+	const project = await get_project(projectId, 'must_revalidate')
 
 	if (project.project_type === 'modpack') {
 		const version = versionId ?? project.versions[project.versions.length - 1]
-		const packs = await list().catch(handleError)
+		const packs = await list()
 
 		if (packs.length === 0 || !packs.find((pack) => pack.linked_data?.project_id === project.id)) {
 			await packInstall(
@@ -64,7 +62,7 @@ export const install = async (
 				project.title,
 				project.icon_url,
 				createInstanceCallback,
-			).catch(handleError)
+			)
 
 			trackEvent('PackInstall', {
 				id: project.id,
@@ -81,8 +79,8 @@ export const install = async (
 	} else {
 		if (instancePath) {
 			const [instance, instanceProjects, versions] = await Promise.all([
-				await get(instancePath).catch(handleError),
-				await get_projects(instancePath).catch(handleError),
+				await get(instancePath),
+				await get_projects(instancePath),
 				await get_version_many(project.versions, 'must_revalidate'),
 			])
 
@@ -119,7 +117,7 @@ export const install = async (
 					}
 				}
 
-				await add_project_from_version(instance.path, version.id).catch(handleError)
+				await add_project_from_version(instance.path, version.id)
 				await installVersionDependencies(instance, version)
 
 				trackEvent('ProjectInstall', {
@@ -144,7 +142,7 @@ export const install = async (
 				)
 			}
 		} else {
-			const versions = (await get_version_many(project.versions).catch(handleError)).sort(
+			const versions = (await get_version_many(project.versions)).sort(
 				(a, b) => dayjs(b.date_published) - dayjs(a.date_published),
 			)
 
@@ -168,36 +166,27 @@ export const install = async (
 }
 
 export const installVersionDependencies = async (profile, version) => {
-	const { handleError } = injectNotificationManager()
 	for (const dep of version.dependencies) {
 		if (dep.dependency_type !== 'required') continue
 		// disallow fabric api install on quilt
 		if (dep.project_id === 'P7dR8mSH' && profile.loader === 'quilt') continue
 		if (dep.version_id) {
-			if (
-				dep.project_id &&
-				(await check_installed(profile.path, dep.project_id).catch(handleError))
-			)
-				continue
+			if (dep.project_id && (await check_installed(profile.path, dep.project_id))) continue
 			await add_project_from_version(profile.path, dep.version_id)
 		} else {
-			if (
-				dep.project_id &&
-				(await check_installed(profile.path, dep.project_id).catch(handleError))
+			if (dep.project_id && (await check_installed(profile.path, dep.project_id))) continue
+
+			const depProject = await get_project(dep.project_id, 'must_revalidate')
+
+			const depVersions = (await get_version_many(depProject.versions, 'must_revalidate')).sort(
+				(a, b) => dayjs(b.date_published) - dayjs(a.date_published),
 			)
-				continue
-
-			const depProject = await get_project(dep.project_id, 'must_revalidate').catch(handleError)
-
-			const depVersions = (
-				await get_version_many(depProject.versions, 'must_revalidate').catch(handleError)
-			).sort((a, b) => dayjs(b.date_published) - dayjs(a.date_published))
 
 			const latest = depVersions.find(
 				(v) => v.game_versions.includes(profile.game_version) && v.loaders.includes(profile.loader),
 			)
 			if (latest) {
-				await add_project_from_version(profile.path, latest.id).catch(handleError)
+				await add_project_from_version(profile.path, latest.id)
 			}
 		}
 	}