From 6765f4bb5d0db9cbb66e8d2d812fa85e8a9b737b Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Wed, 14 Dec 2022 09:42:34 +0100
Subject: [PATCH] Resolve #764

---
 plugins/avatars/avatars.js | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
index 125470db4..48e2f1eb3 100644
--- a/plugins/avatars/avatars.js
+++ b/plugins/avatars/avatars.js
@@ -158,24 +158,28 @@
 
 	ko.bindingHandlers.fromPic = {
 		init: (element, self, dummy, msg) => {
-			if (msg?.from?.[0]) {
-				let url = getAvatar(msg),
-					from = msg.from[0],
-					fn = url=>{element.src = url};
-				if (url) {
-					fn(url);
-				} else if (msg.avatar || isMobile()) {
-					if (msg.avatar.startsWith('data:')) {
-						fn(msg.avatar);
-					} else if (isMobile()) {
-						setIdenticon(from, fn);
+			try {
+				if (msg?.from?.[0]) {
+					let url = getAvatar(msg),
+						from = msg.from[0],
+						fn = url=>{element.src = url};
+					if (url) {
+						fn(url);
+					} else if (msg.avatar || isMobile()) {
+						if (msg.avatar?.startsWith('data:')) {
+							fn(msg.avatar);
+						} else if (isMobile()) {
+							setIdenticon(from, fn);
+						} else {
+							element.onerror = () => setIdenticon(from, fn);
+							fn(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${msg.avatar}`);
+						}
 					} else {
-						element.onerror = () => setIdenticon(from, fn);
-						fn(`?Avatar/${'pass' == from.dkimStatus ? 1 : 0}/${msg.avatar}`);
+						addQueue(msg, fn);
 					}
-				} else {
-					addQueue(msg, fn);
 				}
+			} catch (e) {
+				console.error(e);
 			}
 		}
 	};