From 1e5b1c78e7e5595856dd881a6f5012c9504bdd99 Mon Sep 17 00:00:00 2001
From: Diego Mello <diegolmello@gmail.com>
Date: Fri, 17 May 2024 15:33:29 -0300
Subject: [PATCH] small cleanup

---
 app/lib/methods/sendFileMessage.ts | 83 ++++++++++++------------------
 1 file changed, 33 insertions(+), 50 deletions(-)

diff --git a/app/lib/methods/sendFileMessage.ts b/app/lib/methods/sendFileMessage.ts
index 4aaaf56ce..f783c188f 100644
--- a/app/lib/methods/sendFileMessage.ts
+++ b/app/lib/methods/sendFileMessage.ts
@@ -125,49 +125,36 @@ export function sendFileMessage(
 			uploadQueue[uploadPath].then(async response => {
 				// If response is all good...
 				if (response.respInfo.status >= 200 && response.respInfo.status < 400) {
-					try {
-						const json = response.json();
-						let content;
-						if (getContent) {
-							content = await getContent(json.file._id, json.file.url);
-						}
-						await fetch(`${server}/api/v1/rooms.mediaConfirm/${rid}/${json.file._id}`, {
-							method: 'POST',
-							headers: {
-								...headers,
-								'Content-Type': 'application/json'
-							},
-							body: JSON.stringify({
-								// msg: '', TODO: backwards compatibility
-								tmid,
-								description: fileInfo.description,
-								t: 'e2e',
-								content
-							})
-						});
+					const json = response.json();
+					let content;
+					if (getContent) {
+						content = await getContent(json.file._id, json.file.url);
+					}
+					await fetch(`${server}/api/v1/rooms.mediaConfirm/${rid}/${json.file._id}`, {
+						method: 'POST',
+						headers: {
+							...headers,
+							'Content-Type': 'application/json'
+						},
+						body: JSON.stringify({
+							// msg: '', TODO: backwards compatibility
+							tmid,
+							description: fileInfo.description,
+							t: 'e2e',
+							content
+						})
+					});
 
-						await db.write(async () => {
-							await uploadRecord.destroyPermanently();
-						});
-						resolve(response);
-					} catch (e) {
-						log(e);
-					}
+					await db.write(async () => {
+						await uploadRecord.destroyPermanently();
+					});
+					resolve(response);
 				} else {
-					try {
-						await db.write(async () => {
-							await uploadRecord.update(u => {
-								u.error = true;
-							});
+					await db.write(async () => {
+						await uploadRecord.update(u => {
+							u.error = true;
 						});
-					} catch (e) {
-						log(e);
-					}
-					try {
-						reject(response);
-					} catch (e) {
-						reject(e);
-					}
+					});
 				}
 			});
 
@@ -181,22 +168,18 @@ export function sendFileMessage(
 				} catch (e) {
 					log(e);
 				}
-				reject(error);
+				throw error;
 			});
 
 			uploadQueue[uploadPath].uploadProgress(async (loaded: number, total: number) => {
-				try {
-					await db.write(async () => {
-						await uploadRecord.update(u => {
-							u.progress = Math.floor((loaded / total) * 100);
-						});
+				await db.write(async () => {
+					await uploadRecord.update(u => {
+						u.progress = Math.floor((loaded / total) * 100);
 					});
-				} catch (e) {
-					log(e);
-				}
+				});
 			});
 		} catch (e) {
-			log(e);
+			reject(e);
 		}
 	});
 }