Salastil/odysseus
1
0
Fork 0
mirror of https://github.com/pewdiepie-archdaemon/odysseus.git synced 2026-06-17 10:15:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clarify slow email send status

Browse Source
This commit is contained in:
pewdiepie-archdaemon
2026-06-01 14:01:38 +09:00
parent 4c0aadbb5e
commit d6c4b70507
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/document.js
+13 -1
View File
@@ -2806,6 +2806,7 @@ import * as Modals from './modalManager.js';
let sendSpinner = null; let sendSpinner = null;
let origBtnHtml = ''; let origBtnHtml = '';
let detachedEmailDoc = null; let detachedEmailDoc = null;
let slowSendTimer = null;
if (btn) { if (btn) {
btn.disabled = true; btn.disabled = true;
origBtnHtml = btn.innerHTML; origBtnHtml = btn.innerHTML;
@@ -2851,7 +2852,10 @@ import * as Modals from './modalManager.js';
if (uiModule) uiModule.showToast('Send undone'); if (uiModule) uiModule.showToast('Send undone');
return; return;
} }
if (uiModule) uiModule.showToast('Sending...', 15000); if (uiModule) uiModule.showToast('Sending...', 3500);
slowSendTimer = setTimeout(() => {
if (uiModule) uiModule.showToast('Still sending in background...', 12000);
}, 2000);
const activeAccountId = await _resolveComposeSendAccountId(); const activeAccountId = await _resolveComposeSendAccountId();
const res = await fetch(`${API_BASE}/api/email/send`, { const res = await fetch(`${API_BASE}/api/email/send`, {
@@ -2866,6 +2870,10 @@ import * as Modals from './modalManager.js';
}), }),
}); });
const data = await res.json(); const data = await res.json();
if (slowSendTimer) {
clearTimeout(slowSendTimer);
slowSendTimer = null;
}
if (data.success) { if (data.success) {
if (uiModule) { if (uiModule) {
uiModule.showToast('Message sent', { uiModule.showToast('Message sent', {
@@ -2932,6 +2940,10 @@ import * as Modals from './modalManager.js';
if (uiModule) uiModule.showError(data.error || 'Failed to send'); if (uiModule) uiModule.showError(data.error || 'Failed to send');
} }
} catch (e) { } catch (e) {
if (slowSendTimer) {
clearTimeout(slowSendTimer);
slowSendTimer = null;
}
_restoreDetachedEmailDoc(detachedEmailDoc); _restoreDetachedEmailDoc(detachedEmailDoc);
detachedEmailDoc = null; detachedEmailDoc = null;
if (uiModule) uiModule.showError(e?.message ? `Failed to send email: ${e.message}` : 'Failed to send email'); if (uiModule) uiModule.showError(e?.message ? `Failed to send email: ${e.message}` : 'Failed to send email');