Improved engine auto export/import

materialious/src/lib/api/index.ts

@@ -220,11 +220,8 @@ export async function notificationsMarkAsRead(fetchOptions: RequestInit = {}) {
 	return notificationsMarkAsReadInvidious(fetchOptions);
 }
 
-export async function getSubscriptions(
-	fetchOptions: RequestInit = {},
-	bypassYTBackend: boolean = false
-): Promise<Subscription[]> {
-	if (isYTBackend() && !bypassYTBackend) {
+export async function getSubscriptions(fetchOptions: RequestInit = {}): Promise<Subscription[]> {
+	if (isYTBackend()) {
 		if (isOwnBackend()?.internalAuth && get(rawMasterKeyStore)) {
 			return (await getSubscriptionsBackend()).map((sub) => {
 				return {

materialious/src/lib/components/settings/Engine.svelte

@@ -12,9 +12,10 @@
 	import { useEngineFallback, type EngineFallback } from '$lib/api/misc';
 	import { get } from 'svelte/store';
 	import { getSubscriptions } from '$lib/api';
-	import { addToast } from '../Toast.svelte';
+	import { addToast, toaster } from '../Toast.svelte';
 	import { importSubscriptions } from '$lib/importExport';
 	import { postSubscribeInvidious } from '$lib/api/invidious/subscribe';
+	import { getSubscriptionsInvidious } from '$lib/api/invidious/feed';
 
 	const engineFallbacks: EngineFallback[] = [
 		'Channel',
@@ -46,16 +47,20 @@
 	}
 
 	async function importInvidiousSubs() {
-		const importedSubs = await getSubscriptions({}, true);
+		const importedSubs = await getSubscriptionsInvidious();
 
 		addToast({
 			data: {
 				text: $_('layout.backendEngine.importingToMaterialious')
-			}
+			},
+			id: 'import-to-materialious',
+			closeDelay: 0
 		});
 
 		await importSubscriptions(importedSubs);
 
+		toaster.removeToast('import-to-materialious');
+
 		addToast({
 			data: {
 				text: $_('layout.backendEngine.importingToMaterialiousFinished')
@@ -69,7 +74,9 @@
 		addToast({
 			data: {
 				text: $_('layout.backendEngine.exportingToInvidious')
-			}
+			},
+			id: 'export-to-invidious',
+			closeDelay: 0
 		});
 
 		const subPromises: Promise<void>[] = [];
@@ -79,6 +86,8 @@
 
 		await Promise.all(subPromises);
 
+		toaster.removeToast('export-to-invidious');
+
 		addToast({
 			data: {
 				text: $_('layout.backendEngine.exportingToInvidiousFinished')