Merge pull request #94 from emailerfacu-spec/dev

hotfix

src/lib/components/BotonSeguir.svelte

@@ -11,7 +11,7 @@
 	import { seguirUsuario } from '@/hooks/seguirUsuario';
 	import type { Post } from '../../types';
 	import CardError from './CardError.svelte';
-	import { cacheSeguidos } from '@/stores/cacheSeguidos.svelte';
+	import { cacheSeguidos } from '@/stores/cacheSeguidos.js';
 
 	let {
 		post,
@@ -41,16 +41,13 @@
 	});
 
 	async function cargarSeguido() {
-		let a = cacheSeguidos.get(post.authorId);
-		if (a === undefined) {
-			const seguidoStatus = await esSeguido(post as Post);
-			if (seguidoStatus) {
-				cacheSeguidos.set(post.authorId, seguidoStatus.isFollowing || false);
-				seguido = seguidoStatus.isFollowing || false;
+		seguido = await cacheSeguidos.getOrFetch(
+			post.authorId,
+			async () => {
+				const seguidoStatus = await esSeguido(post as Post);
+				return seguidoStatus?.isFollowing || false;
 			}
-			return;
-		}
-		seguido = a;
+		);
 	}
 
 	let mensajeError: string | null = $state(null);

src/lib/components/TablaUsuarios.svelte

@@ -92,26 +92,6 @@
 		return sortDirection === 'asc' ? '↑' : '↓';
 	}
 
-	function handleCambiarContraseña(usuario: UserResponseDto) {
-		open = true;
-		usuarioCambioPass = usuario;
-	}
-
-	function handleModificar(usuario: UserResponseDto) {
-		openModificarUsuario = true;
-		usuarioModificar = usuario;
-	}
-
-	function handleBorrar(usuario: UserResponseDto) {
-		openBorrar = true;
-		usuarioBorrar = usuario;
-	}
-
-	function handleDarAdmin(usuario: UserResponseDto) {
-		openDarAdmin = true;
-		usuarioDarAdmin = usuario;
-	}
-
 	// $inspect(usuarios);
 	let timeoutId: ReturnType<typeof setTimeout> | number | undefined;
 	function buscarUsuarios() {
@@ -196,7 +176,11 @@
 					<TableCell class="flex gap-2">
 						<Tooltip>
 							<TooltipTrigger>
-								<Button onclick={() => handleCambiarContraseña(usuario)}><KeyIcon></KeyIcon></Button
+								<Button
+									onclick={() => {
+										open = true;
+										usuarioCambioPass = usuario;
+									}}><KeyIcon></KeyIcon></Button
 								>
 							</TooltipTrigger>
 							<TooltipContent>
@@ -205,7 +189,12 @@
 						</Tooltip>
 						<Tooltip>
 							<TooltipTrigger>
-								<Button onclick={() => handleModificar(usuario)}><UserPen /></Button>
+								<Button
+									onclick={() => {
+										openModificarUsuario = true;
+										usuarioModificar = usuario;
+									}}><UserPen /></Button
+								>
 							</TooltipTrigger>
 							<TooltipContent>
 								<p>Modificar Usuario</p>
@@ -215,7 +204,10 @@
 							<TooltipTrigger>
 								<Button
 									disabled={usuario.isAdmin}
-									onclick={() => handleBorrar(usuario)}
+									onclick={() => {
+										openBorrar = true;
+										usuarioBorrar = usuario;
+									}}
 									variant="destructive"><Trash_2 /></Button
 								>
 							</TooltipTrigger>
@@ -231,7 +223,10 @@
 						<Tooltip>
 							<TooltipTrigger>
 								<Button
-									onclick={() => handleDarAdmin(usuario)}
+									onclick={() => {
+										openDarAdmin = true;
+										usuarioDarAdmin = usuario;
+									}}
 									variant={usuario.isAdmin ? 'destructive' : 'default'}
 								>
 									<Shield />

src/lib/hooks/logout.ts

@@ -1,5 +1,5 @@
 import { goto } from '$app/navigation';
-import { cacheSeguidos } from '@/stores/cacheSeguidos.svelte';
+import { cacheSeguidos } from '@/stores/cacheSeguidos';
 import { apiBase } from '@/stores/url';
 import { sesionStore } from '@/stores/usuario';
 import { get } from 'svelte/store';

src/lib/stores/cacheSeguidos.js

@@ -0,0 +1,134 @@
+import { browser } from '$app/environment';
+import { writable } from 'svelte/store';
+
+class FollowCache {
+	constructor() {
+		if (browser) {
+			this.loadFromStorage();
+		}
+	}
+
+	/** @type {Map<string, boolean | Promise<boolean>>} */
+	#cache = new Map();
+
+	/** @type {import('svelte/store').Writable<Map<string, boolean>>} */
+	store = writable(new Map());
+
+	/** @param {string} userId */
+	get(userId) {
+		const value = this.#cache.get(userId);
+		return value instanceof Promise ? undefined : value;
+	}
+
+  	/** @param {string} userId */
+	has(userId) {
+		return this.#cache.has(userId);
+	}
+
+	/**
+	 * @param {string} userId
+	 * @param {() => Promise<boolean>} fetchFn
+	 */
+	async getOrFetch(userId, fetchFn) {
+		const existing = this.#cache.get(userId);
+
+		if (existing !== undefined) {
+			if (existing instanceof Promise) {
+				return existing;
+			}
+			return existing;
+		}
+
+		const promise = fetchFn()
+			.then((result) => {
+				this.#setFinal(userId, result);
+				return result;
+			})
+			.catch((err) => {
+				this.#cache.delete(userId);
+				this.#updateStore();
+				throw err;
+			});
+
+		this.#cache.set(userId, promise);
+		this.#updateStore();
+
+		return promise;
+	}
+
+	/**
+	 * @param {string} userId
+	 * @param {boolean} isFollowed
+	 */
+	set(userId, isFollowed) {
+		this.#setFinal(userId, isFollowed);
+	}
+
+	/**
+	 * @param {string} userId
+	 * @param {boolean} value
+	 */
+	#setFinal(userId, value) {
+		this.#cache.set(userId, value);
+		this.#updateStore();
+		this.saveToStorage();
+
+		if (browser) {
+			window.dispatchEvent(
+				new CustomEvent('followCacheUpdated', {
+					detail: { userId, isFollowed: value }
+				})
+			);
+		}
+	}
+
+	#updateStore() {
+		const filtered = Array.from(this.#cache.entries())
+			.filter(([_, v]) => typeof v === 'boolean');
+
+		this.store.set(
+			/** @type {Map<string, boolean>} */
+			(new Map(filtered))
+		);
+	}
+
+	/** @param {string} userId */
+	delete(userId) {
+		this.#cache.delete(userId);
+		this.#updateStore();
+		this.saveToStorage();
+	}
+
+	clear() {
+		this.#cache.clear();
+		this.store.set(new Map());
+		this.saveToStorage();
+	}
+
+	saveToStorage() {
+		if (!browser) return;
+		const filtered = Array.from(this.#cache.entries())
+			.filter(([_, v]) => typeof v === 'boolean');
+
+		const data = Object.fromEntries(filtered);
+		sessionStorage.setItem('follow-cache', JSON.stringify(data));
+	}
+
+	loadFromStorage() {
+		if (!browser) return;
+
+		try {
+			const stored = sessionStorage.getItem('follow-cache');
+			if (!stored) return;
+			const data = JSON.parse(stored);
+
+			this.#cache = new Map(Object.entries(data));
+			this.#updateStore();
+
+		} catch (err) {
+			console.error('Error cargando follow-cache:', err);
+		}
+	}
+}
+
+export const cacheSeguidos = new FollowCache();

src/lib/stores/cacheSeguidos.svelte.js

@@ -1,105 +0,0 @@
-import { browser } from '$app/environment';
-import { writable } from 'svelte/store';
-
-class FollowCache {
-	constructor() {
-		if (browser) {
-			this.loadFromStorage();
-		}
-	}
-
-	/** @type {Map<string, boolean>} */
-	#cache = new Map();
-
-	/** @type {import('svelte/store').Writable<Map<string, boolean>>} */
-	store = writable(this.#cache);
-
-	/**
-	 * @param {string} userId
-	 * @returns {boolean | undefined}
-	 */
-	get(userId) {
-		return this.#cache.get(userId);
-	}
-
-	/**
-	 * @param {string} userId
-	 * @param {boolean} isFollowed
-	 */
-	set(userId, isFollowed) {
-		this.#cache.set(userId, isFollowed);
-		this.store.set(this.#cache);
-		this.saveToStorage();
-
-		if (browser) {
-			window.dispatchEvent(
-				new CustomEvent('followCacheUpdated', {
-					detail: { userId, isFollowed }
-				})
-			);
-		}
-	}
-
-	/**
-	 * @param {string} userId
-	 * @returns {boolean}
-	 */
-	has(userId) {
-		return this.#cache.has(userId);
-	}
-
-	/**
-	 * @param {string} userId
-	 */
-	delete(userId) {
-		this.#cache.delete(userId);
-		this.store.set(this.#cache);
-		this.saveToStorage();
-
-		if (browser) {
-			window.dispatchEvent(
-				new CustomEvent('followCacheUpdated', {
-					detail: { userId, isFollowed: false }
-				})
-			);
-		}
-	}
-
-	clear() {
-		this.#cache.clear();
-		this.store.set(this.#cache);
-		this.saveToStorage();
-
-		if (browser) {
-			window.dispatchEvent(
-				new CustomEvent('followCacheUpdated', {
-					detail: { clearAll: true }
-				})
-			);
-		}
-	}
-
-	saveToStorage() {
-		if (browser) {
-			const data = Object.fromEntries(this.#cache);
-			sessionStorage.setItem('follow-cache', JSON.stringify(data));
-		}
-	}
-
-	loadFromStorage() {
-		if (browser) {
-			try {
-				const stored = sessionStorage.getItem('follow-cache');
-				if (stored) {
-					const data = JSON.parse(stored);
-					this.#cache = new Map(Object.entries(data));
-					this.store.set(this.#cache);
-				}
-			} catch (error) {
-				console.error('Error cargando desde sesion:', error);
-			}
-		}
-	}
-}
-
-export const cacheSeguidos = new FollowCache();