domma-cms 0.115.2 → 0.115.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.115.2",
+  "version": "0.115.3",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/plugins/free-tier.lock.json

@@ -1,6 +1,6 @@
 {
   "note": "Written by `make sync-free-tier` in dcms-marketplace. Do not edit these plugins here - edit them there and sync.",
-  "source": "dcms-marketplace@26a9062",
+  "source": "dcms-marketplace@9b9543d",
   "plugins": {
     "blog": {
       "version": "1.9.4",
@@ -224,7 +224,7 @@
       }
     },
     "support": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "files": {
         "CLAUDE.md": "a54f3af90bc273622e67d0da0502da39a9e0962633d43d82eebf1228cf996f79",
         "admin/css/index.css": "43a792dbc08acafc9f79757ac96c3675a49abb39aab05a553c6871f6f2050a1e",
@@ -232,17 +232,17 @@
         "admin/templates/support.html": "2bb69d0443a367a402e6160fe68f4af3e8983b578cfff9575b4df9a534fcb480",
         "admin/views/desk.js": "f0770c750dd340b83438c8f41b222b814c0937081201cb06b851a3fdea2952fd",
         "admin/views/inbox.js": "fac961363a827ce5139689464a6b9a65c685752b0771f4bf956fb1dcd8d95ccb",
-        "admin/views/support.js": "448595a7087f7cff633bf5844755a931d1ca461af1c418f275dadb97673502dc",
+        "admin/views/support.js": "f5621fd99782e40d9faeeddf187c5c8b0412ee621ab53f03fb96d60b3f144478",
         "collections/support-tickets.json": "aa1e6b4814fdfbbcd46d097edd93dfb838cc49f5232a86ba76b54c9b29d82ac5",
-        "config.js": "07a72a5c7900d5eb3e2464f7f58b316fd2217f41f57fdad43ce917fe2da80b82",
-        "lib/mail.js": "4365511b2c3ab93bbe6e2635e4e2ebe39eb841f968a836507331b426ab6f4c1c",
+        "config.js": "eb7ccc1169fa8b2be52a213536825492fedaec5fa73fd749cba9f498dd54b503",
+        "lib/mail.js": "d14aae3a59aad6af61451863cdaaf94fc4a87810b16e1dcb9c655dda6c803b3b",
         "lib/receiver.js": "ef958be2a8fadcec10169ff76f10404d395f9c6b401a51642ede9218547d6262",
         "lib/sender.js": "71e9146729e443df401a1b84e9778e9243d057012462e48a05e32a73f7309aa2",
         "lib/shape.js": "7bef95c823ee4c6d4041152a58fdb2279dbe6797710a89e1339f8aca60cd0f89",
-        "plugin.js": "50db3f804ad987490d322c265be0d00e11202af265c5067b20816defa6ff990d",
-        "plugin.json": "75d1eaf11416b855e5255ae565781f2f7c144b42384362cd0f00f7da85f046ab",
-        "tests/api.test.js": "57a00bd19ba3569246f0841d8fb8f3d488fcf420c4c0556bfe07331576d74cf5",
-        "tests/shape.test.js": "cd7c44c8e2f676734c90044f25acc0583ab6074c1661cce05103fd0cbe307796"
+        "plugin.js": "240cd2e0f0cd26037e7bcc76ce376caa29a54323a3bab4a96abc5e0558a9be06",
+        "plugin.json": "239630f28577b687cdafb53b6f4be3e0dc0c48fb24a20092d094bfab68cb6f7b",
+        "tests/api.test.js": "f2d3632fce50e926e1d0d6f965e1d10358f13a71cfcece0bdee8150d7dc70c07",
+        "tests/shape.test.js": "6d7b7a23dcb1933e4ed6e2f4b9fce2bf0b50125073f6ec60d15d6f2e6d7f8aa1"
       }
     }
   }

package/plugins/support/admin/views/support.js

@@ -46,7 +46,7 @@ export const supportView = {
         try {
             [mode, meta] = await Promise.all([api.mode(), api.meta()]);
         } catch (err) {
-            fail(`Support could not load: ${err.message || err}. You can always email support@dommajs.org.`);
+            fail(`Support could not load: ${err.message || err}. You can always email support@domma-cms.com.`);
             return;
         }
         if (!here()) return;

package/plugins/support/config.js

@@ -17,12 +17,12 @@
  *   perSiteMinutes the window for perSiteMax
  */
 export default {
-    email: 'support@dommajs.org',
+    email: 'support@domma-cms.com',
     phone: '',
     hours: 'Monday to Friday, 9am to 5pm (UK time)',
     responseTime: 'We answer within one working day, and urgent requests first.',
     syncMinutes: 5,
-    notifyEmail: 'support@dommajs.org',
+    notifyEmail: 'support@domma-cms.com',
     perSiteMax: 20,
     perSiteMinutes: 10
 };

package/plugins/support/lib/mail.js

@@ -31,7 +31,7 @@ export function siteUrl() {
  * must never fail the request that caused it, and callers do not await it - an
  * unhandled rejection stops the whole server.
  *
- * @param {{to: string, subject: string, html: string, text: string, replyTo?: string}} msg
+ * @param {{to: string, subject: string, html: string, text: string, replyTo?: string, from?: string}} msg
  * @returns {Promise<boolean>}
  */
 export async function send(msg, {log} = {}) {
@@ -44,7 +44,8 @@ export async function send(msg, {log} = {}) {
         const key = JSON.stringify([smtp.host, smtp.port, smtp.user, smtp.secure]);
         if (!transport || transportFor !== key) { transport = await createTransport(smtp); transportFor = key; }
         await sendEmail(transport, {
-            from: smtp.fromAddress || 'noreply@example.com',
+            // `msg.from`: the support mailbox, for mail TO a customer (a reply then reaches it).
+            from: msg.from || smtp.fromAddress || 'noreply@example.com',
             fromName: 'Domma Support',
             to: msg.to, subject: msg.subject, html: msg.html, text: msg.text,
             ...(msg.replyTo && {replyTo: msg.replyTo})

package/plugins/support/plugin.js

@@ -327,8 +327,10 @@ async function receiverRoutes(fastify, {can, notify, mail, receiverMod, settings
         const d = next.data;
         // The customer hears of a reply, and of their request being resolved - not of a quiet status change back to open.
         if (d.userEmail && (body || (d.status === 'closed' && e.data.status !== 'closed'))) {
-            mail.send({to: d.userEmail, ...toCustomerEmail({ticket: d, siteName: siteOf(d.site).name, link: siteLink(d.site, d.ref), body,
-                resolved: d.status === 'closed'})}, {log});
+            // From the support mailbox and replying to it: a customer who answers the email reaches Domma Support.
+            const support = contactCard(settings).email;
+            mail.send({to: d.userEmail, ...(support && {from: support, replyTo: support}),
+                ...toCustomerEmail({ticket: d, siteName: siteOf(d.site).name, link: siteLink(d.site, d.ref), body, resolved: d.status === 'closed'})}, {log});
         }
         return row(next);
     });

package/plugins/support/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "support",
   "displayName": "Support",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "tier": "free",
   "description": "Get help from Domma straight from your admin: our email, phone and hours always to hand, and a conversation with the Domma team for anything you need - urgent requests first.",
   "author": "Domma CMS",
@@ -15,14 +15,26 @@
       "icon": "headphones",
       "description": "Ask Domma for help and follow the conversation (send). On the Domma server itself: the inbox of every site's requests (manage).",
       "actions": [
-        {"key": "send", "label": "Send", "description": "Ask Domma for help and read this site's requests and replies"},
-        {"key": "manage", "label": "Manage", "description": "On the Domma server: read and answer every site's requests"}
+        {
+          "key": "send",
+          "label": "Send",
+          "description": "Ask Domma for help and read this site's requests and replies"
+        },
+        {
+          "key": "manage",
+          "label": "Manage",
+          "description": "On the Domma server: read and answer every site's requests"
+        }
       ],
-      "grant": ["admin"]
+      "grant": [
+        "admin"
+      ]
     }
   ],
   "admin": {
-    "css": ["admin/css/index.css"],
+    "css": [
+      "admin/css/index.css"
+    ],
     "sidebar": [
       {
         "id": "support",
@@ -35,8 +47,16 @@
       }
     ],
     "routes": [
-      {"path": "/plugins/support", "view": "plugin-support", "title": "Support - Domma CMS"},
-      {"path": "/plugins/support/:id", "view": "plugin-support", "title": "Support - Domma CMS"}
+      {
+        "path": "/plugins/support",
+        "view": "plugin-support",
+        "title": "Support - Domma CMS"
+      },
+      {
+        "path": "/plugins/support/:id",
+        "view": "plugin-support",
+        "title": "Support - Domma CMS"
+      }
     ],
     "views": {
       "plugin-support": {

package/plugins/support/tests/api.test.js

@@ -108,6 +108,8 @@ test('Domma replies: the customer is emailed a link to their own admin, and the
     assert.equal(r.body.status, 'answered');
     const toAnn = mails.find(x => x.to === 'ann@acme.test');
     assert.equal(toAnn.subject, 'Re: How do I add a page?');
+    assert.equal(toAnn.from, 'support@domma-cms.com', 'from the support mailbox');
+    assert.equal(toAnn.replyTo, 'support@domma-cms.com', 'so answering the email reaches support');
     assert.ok(toAnn.text.includes(`https://acme.example.test/admin/#/plugins/support/${s.ref}`));
 
     const list = await call(acme, 'GET', '/tickets');
@@ -179,7 +181,7 @@ test('the contact card: the manager\'s reaches every site; a standalone site sti
     const alone = await site({env: {}});
     const mode = (await call(alone, 'GET', '/mode')).body;
     assert.equal(mode.connected, false);
-    assert.equal(mode.contact.email, 'support@dommajs.org');
+    assert.equal(mode.contact.email, 'support@domma-cms.com');
     assert.equal((await call(alone, 'POST', '/tickets', {subject: 's', body: 'b'})).status, 409);
 });
 

package/plugins/support/tests/shape.test.js

@@ -74,8 +74,8 @@ test('inbox updates are checked', () => {
 });
 
 test('the contact card lets through only what is well-formed', () => {
-    assert.deepEqual(contactCard({email: 'support@dommajs.org', phone: '+44 (0)1234 567890', hours: 'Mon\nFri', responseTime: 'Soon'}),
-        {email: 'support@dommajs.org', phone: '+44 (0)1234 567890', hours: 'Mon Fri', responseTime: 'Soon'});
+    assert.deepEqual(contactCard({email: 'support@domma-cms.com', phone: '+44 (0)1234 567890', hours: 'Mon\nFri', responseTime: 'Soon'}),
+        {email: 'support@domma-cms.com', phone: '+44 (0)1234 567890', hours: 'Mon Fri', responseTime: 'Soon'});
     assert.deepEqual(contactCard({email: 'javascript:alert(1)', phone: 'call me'}), {email: '', phone: '', hours: '', responseTime: ''});
     assert.equal(telHref('+44 (0)1234 567890'), 'tel:+4401234567890');
 });