From 2c4bd445a5d19f2b9085ba6c3c2093995baa341b Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 1 Aug 2022 13:59:14 +0200
Subject: [PATCH] Resolve #471 by extending fetch messagelist to 60 seconds and
 handling timeout/abort

---
 dev/Remote/AbstractFetch.js    | 2 +-
 dev/Remote/User/Fetch.js       | 2 +-
 dev/Stores/User/Messagelist.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js
index 57c2bab1d..b07fc1805 100644
--- a/dev/Remote/AbstractFetch.js
+++ b/dev/Remote/AbstractFetch.js
@@ -175,7 +175,7 @@ export class AbstractFetchRemote
 		)
 		.catch(err => {
 			console.error(err);
-			fCallback && fCallback(err.name == 'AbortError' ? 2 : 1);
+			fCallback && fCallback(err.name == 'AbortError' ? 2 : 1, err);
 		});
 	}
 
diff --git a/dev/Remote/User/Fetch.js b/dev/Remote/User/Fetch.js
index c99ccbb9a..7122b677f 100644
--- a/dev/Remote/User/Fetch.js
+++ b/dev/Remote/User/Fetch.js
@@ -54,7 +54,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		this.request('MessageList',
 			fCallback,
 			params,
-			30000,
+			60000, // 60 seconds before aborting
 			sGetAdd,
 			bSilent ? [] : ['MessageList']
 		);
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index 6a95964d4..9151b43fa 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -171,8 +171,8 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCach
 			if (iError) {
 				if (Notification.RequestAborted !== iError) {
 					MessagelistUserStore([]);
-					MessagelistUserStore.error(getNotification(iError));
 				}
+				MessagelistUserStore.error(getNotification(iError) || oData.message);
 			} else {
 				const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached);
 				if (collection) {
@@ -387,7 +387,7 @@ MessagelistUserStore.removeMessagesFromList = (
 	if (MessagelistUserStore.threadUid()) {
 		if (
 			messageList.length &&
-			!!messageList.find(item => !!(item && item.deleted() && item.uid == MessagelistUserStore.threadUid()))
+			messageList.find(item => item && item.deleted() && item.uid == MessagelistUserStore.threadUid())
 		) {
 			const message = messageList.find(item => item && !item.deleted());
 			let setHash;