fix: pre-release shared instances fixes (#6856)

* fix: dedupe notifications

* fix: notifs + members btn robustness

* fix: temp fix for external file wrongly showing updated

* fix: fmt

apps/app-frontend/src/components/ui/shared-instances/SharedInstanceUpdateModal.vue

@@ -56,16 +56,19 @@ const { formatMessage } = useVIntl()
 const { notifySharedInstanceError } = useSharedInstanceErrors()
 const diffs = computed<ContentDiffItem[]>(
 	() =>
-		preview.value?.diffs.map((diff) => ({
-			type: diff.type,
-			projectName: diff.projectName ?? undefined,
-			fileName: diff.fileName ?? undefined,
-			currentVersionName: diff.currentVersionName ?? undefined,
-			newVersionName: diff.newVersionName ?? undefined,
-			fileCount: diff.configFileCount ?? undefined,
-			disabled: diff.disabled,
-			external: diff.type === 'added' && !diff.projectId && !!diff.fileName,
-		})) ?? [],
+		preview.value?.diffs
+			// TODO: This is TEMP!!! Hashing needs to be done on backend
+			.filter((diff) => !(diff.type === 'updated' && !diff.projectId && diff.fileName))
+			.map((diff) => ({
+				type: diff.type,
+				projectName: diff.projectName ?? undefined,
+				fileName: diff.fileName ?? undefined,
+				currentVersionName: diff.currentVersionName ?? undefined,
+				newVersionName: diff.newVersionName ?? undefined,
+				fileCount: diff.configFileCount ?? undefined,
+				disabled: diff.disabled,
+				external: diff.type === 'added' && !diff.projectId && !!diff.fileName,
+			})) ?? [],
 )
 
 async function update() {

apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/index.vue

@@ -28,6 +28,7 @@ const accountRequiredModal = ref<InstanceType<typeof ModrinthAccountRequiredModa
 const {
 	handleNotification,
 	installFromInviteId,
+	clearNotifications,
 	handleAlreadyInstalledCancel,
 	handleAlreadyInstalledGoToInstance,
 	handleAlreadyInstalledInstallAnyway,
@@ -42,5 +43,6 @@ async function requestAuth(flow: ModrinthAuthFlow) {
 defineExpose<SharedInstanceInviteHandler>({
 	handleNotification,
 	installFromInviteId,
+	clearNotifications,
 })
 </script>

apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/shared-instance-invite-types.ts

@@ -26,4 +26,5 @@ export type SharedInstanceInvite = {
 export type SharedInstanceInviteHandler = {
 	handleNotification(notification: AppNotification): Promise<boolean>
 	installFromInviteId(inviteId: string): Promise<void>
+	clearNotifications(): void
 }

apps/app-frontend/src/components/ui/shared-instances/shared-instance-invite-handler/use-shared-instance-invite-handler.ts

@@ -47,11 +47,14 @@ export function useSharedInstanceInviteHandler(
 	const auth = injectAuth()
 	const client = injectModrinthClient()
 	const { handleError } = injectNotificationManager()
-	const { addPopupNotification } = injectPopupNotificationManager()
+	const popupNotificationManager = injectPopupNotificationManager()
 	const queryClient = useQueryClient()
 	const router = useRouter()
 	const themeStore = useTheming()
 	const displayedNotifications = new Set<string | number>()
+	const displayedNotificationKeys = new Set<string>()
+	const popupNotificationIds = new Set<string | number>()
+	let notificationGeneration = 0
 	let pendingAlreadyInstalled:
 		| {
 				instanceId: string
@@ -183,9 +186,23 @@ export function useSharedInstanceInviteHandler(
 		if (!parsedInvite) return false
 		if (displayedNotifications.has(notification.id)) return true
 
+		const generation = notificationGeneration
 		displayedNotifications.add(notification.id)
 		const invite = await resolveInvite(parsedInvite)
-		addPopupNotification({
+		if (generation !== notificationGeneration) return true
+
+		const notificationKey = JSON.stringify([
+			invite.invitedById ?? invite.invitedByUsername,
+			invite.sharedInstanceName,
+			invite.instanceIconUrl,
+		])
+		if (displayedNotificationKeys.has(notificationKey)) {
+			await markNotificationRead(notification).catch((error) => handleError(toError(error)))
+			return true
+		}
+
+		displayedNotificationKeys.add(notificationKey)
+		const popupNotification = popupNotificationManager.addPopupNotification({
 			title: invite.sharedInstanceName,
 			autoCloseMs: null,
 			toast: {
@@ -204,9 +221,21 @@ export function useSharedInstanceInviteHandler(
 				},
 			},
 		})
+		popupNotificationIds.add(popupNotification.id)
 		return true
 	}
 
+	function clearNotifications() {
+		notificationGeneration++
+		for (const id of popupNotificationIds) {
+			popupNotificationManager.removeNotification(id)
+		}
+		displayedNotifications.clear()
+		displayedNotificationKeys.clear()
+		popupNotificationIds.clear()
+		pendingAlreadyInstalled = undefined
+	}
+
 	async function requireAccount() {
 		if (!auth.isReady?.value) {
 			await new Promise<void>((resolve) => {
@@ -245,6 +274,7 @@ export function useSharedInstanceInviteHandler(
 	return {
 		handleNotification,
 		installFromInviteId,
+		clearNotifications,
 		handleAlreadyInstalledCancel,
 		handleAlreadyInstalledGoToInstance,
 		handleAlreadyInstalledInstallAnyway,