Merge commit '7fa442fb28a2b9156690ff147206275163e7aec8' into beta

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)
 }

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

@@ -63,6 +63,10 @@ export type AppSettings = {
 
 	developer_mode: boolean
 	feature_flags: Record<FeatureFlag, boolean>
+
+	skipped_update: string | null
+	pending_update_toast_for_version: string | null
+	auto_download_updates: boolean | null
 }
 
 // Get full settings object

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

@@ -6,6 +6,22 @@ export async function isDev() {
 	return await invoke('is_dev')
 }
 
+export async function areUpdatesEnabled() {
+	return await invoke('are_updates_enabled')
+}
+
+export async function getUpdateSize(updateRid) {
+	return await invoke('get_update_size', { rid: updateRid })
+}
+
+export async function enqueueUpdateForInstallation(updateRid) {
+	return await invoke('enqueue_update_for_installation', { rid: updateRid })
+}
+
+export async function removeEnqueuedUpdate() {
+	return await invoke('remove_enqueued_update')
+}
+
 // One of 'Windows', 'Linux', 'MacOS'
 export async function getOS() {
 	return await invoke('plugin:utils|get_os')
@@ -27,6 +43,10 @@ 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')
+}
+
 export async function openPath(path) {
 	return await invoke('plugin:utils|open_path', { path })
 }
@@ -54,13 +74,6 @@ export async function restartApp() {
 	return await invoke('restart_app')
 }
 
-/**
- * @deprecated This method is no longer needed, and just returns its parameter
- */
-export function sanitizePotentialFileUrl(url) {
-	return url
-}
-
 export const releaseColor = (releaseType) => {
 	switch (releaseType) {
 		case 'release':

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

@@ -1,5 +1,5 @@
-import { autoToHTML } from '@geometrically/minecraft-motd-parser'
 import type { GameVersion } from '@modrinth/ui'
+import { autoToHTML } from '@sfirew/minecraft-motd-parser'
 import { invoke } from '@tauri-apps/api/core'
 import dayjs from 'dayjs'