Added new setting const:sender:defer_times

nodemailer · Dec 14, 2023 · 96084ff · 96084ff
1 parent 1fe0481
commit 96084ff
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/settings-handler.js b/lib/settings-handler.js
@@ -125,6 +125,18 @@ const SETTING_KEYS = [
         type: 'number',
         constKey: 'MAX_FILTERS',
         schema: Joi.number()
+    },
+
+    {
+        key: 'const:sender:defer_times',
+        name: 'Deferred email delay',
+        description: 'Comma separated list of times between deferred delivery attempts. Eg. "5m, 15m, 20m, 1h, 1h, 1h"',
+        type: 'string',
+        confValue: '5m, 7m, 8m, 25m, 75m, 2h, 4h, 4h, 4h, 4h, 4h, 4h, 4h, 4h, 4h, 4h, 4h',
+        schema: Joi.string()
+            .allow('')
+            .trim()
+            .pattern(/^\d+\s*[a-z]*(\s*,\s*\d+\s*[a-z]*)*$/)
     }
 ];
 

diff --git a/public/public/config.html b/public/public/config.html
@@ -191,8 +191,18 @@
 
                 if (setting.default) {
                     let defaultTextElm = document.createElement('code');
-                    defaultTextElm.textContent = formatNumber(setting.default, setting.type);
-                    defaultTdElm.title = setting.description;
+
+                    let formattedValue = formatNumber(setting.default, setting.type);
+                    let settingTitle = setting.description;
+
+                    if (typeof formattedValue !== 'string' || formattedValue.length < 12) {
+                        defaultTextElm.textContent = formattedValue;
+                    } else {
+                        defaultTextElm.textContent = formattedValue.substr(0, 8) + '…';
+                        settingTitle += '\nDefault: "' + formattedValue + '"';
+                    }
+
+                    defaultTdElm.title = settingTitle;
                     defaultTdElm.appendChild(defaultTextElm);
                 } else {
                     defaultTdElm.textContent = ' ';