From 22230e0584be34371327feca79952003d73f16bd Mon Sep 17 00:00:00 2001
From: Reinaldo Neto <reinaldonetof@hotmail.com>
Date: Fri, 6 Jan 2023 19:20:45 -0300
Subject: [PATCH] refactor useAvatarETag

---
 app/containers/Avatar/useAvatarETag.ts | 69 ++++++++++++--------------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/app/containers/Avatar/useAvatarETag.ts b/app/containers/Avatar/useAvatarETag.ts
index 8d6436f9c..0d36988c2 100644
--- a/app/containers/Avatar/useAvatarETag.ts
+++ b/app/containers/Avatar/useAvatarETag.ts
@@ -1,5 +1,5 @@
 import { Q } from '@nozbe/watermelondb';
-import { useEffect, useRef, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Observable, Subscription } from 'rxjs';
 
 import { TSubscriptionModel, TUserModel } from '../../definitions';
@@ -16,50 +16,45 @@ export const useAvatarETag = ({
 	text: string;
 	rid?: string;
 }) => {
-	const subscription = useRef<Subscription>();
 	const [avatarETag, setAvatarETag] = useState<string | undefined>('');
 
 	const isDirect = () => type === 'd';
 
-	const unsubscribeQuery = () => {
-		if (subscription?.current?.unsubscribe) {
-			subscription.current.unsubscribe();
-		}
-	};
-
-	const init = async () => {
-		unsubscribeQuery();
-		const db = database.active;
-		const usersCollection = db.get('users');
-		const subsCollection = db.get('subscriptions');
-
-		let record;
-		try {
-			if (isDirect() || username === text) {
-				const [user] = await usersCollection.query(Q.where('username', text)).fetch();
-				record = user;
-			} else if (rid) {
-				record = await subsCollection.find(rid);
-			}
-		} catch {
-			// Record not found
-		}
-
-		if (record) {
-			const observable = record.observe() as Observable<TSubscriptionModel | TUserModel>;
-			subscription.current = observable.subscribe(r => {
-				setAvatarETag(r.avatarETag);
-			});
-		}
-	};
-
 	useEffect(() => {
+		let subscription: Subscription;
 		if (!avatarETag) {
-			init();
+			(async () => {
+				const db = database.active;
+				const usersCollection = db.get('users');
+				const subsCollection = db.get('subscriptions');
+
+				let record;
+				try {
+					if (isDirect() || username === text) {
+						const [user] = await usersCollection.query(Q.where('username', text)).fetch();
+						record = user;
+					} else if (rid) {
+						record = await subsCollection.find(rid);
+					}
+				} catch {
+					// Record not found
+				}
+
+				if (record) {
+					const observable = record.observe() as Observable<TSubscriptionModel | TUserModel>;
+					subscription = observable.subscribe(r => {
+						setAvatarETag(r.avatarETag);
+					});
+				}
+			})();
+
+			return () => {
+				if (subscription?.unsubscribe) {
+					subscription.unsubscribe();
+				}
+			};
 		}
 	}, [text]);
 
-	useEffect(() => () => unsubscribeQuery(), []);
-
 	return { avatarETag };
 };