ghost 5.25.3 → 5.25.5

package/core/built/admin/assets/{vendor-0d29a566ca9747f2cfba9d7c98e39f53.js → vendor-a5908fe1facfc5cd41d8b915a996bfed.js}

@@ -12319,8 +12319,9 @@ let e=this.container
 e.dataset.kgHasLinkToolbar=!0,this._addEventListener(e,"mouseover",this._handleMouseover),this._addEventListener(e,"mouseout",this._handleMouseout)}willDestroyElement(){super.willDestroyElement(...arguments),this._removeAllEventListeners()}edit(){let e=this._getLinkRange()
 this.editLink(e,this._targetRect)}remove(){let e=this.editor,t=this._getLinkRange(),r=e.range
 e.run((e=>{e.toggleMarkup("a",t)})),this.set("showToolbar",!1),e.selectRange(r)}_getLinkRange(){if(!this._target)return
-let e=this.editor,t=this._targetRect.x+this._targetRect.width/2,r=this._targetRect.y+this._targetRect.height/2,n=e.positionAtPoint(t,r),i=n.marker&&n.marker.markups.findBy("tagName","a")
-if(i){return n.toRange().expandByMarker((e=>!!e.markups.includes(i)))}}_handleMouseover(e){if(this._canShowToolbar){let t=(0,n.getEventTargetMatchingTag)("a",e.target,this.container)
+const e=this.editor,t=this._targetRect.x+this._targetRect.width/2,r=this._targetRect.y+this._targetRect.height/2
+try{const n=e.positionAtPoint(t,r),i=n.marker&&n.marker.markups.findBy("tagName","a")
+if(i){return n.toRange().expandByMarker((e=>!!e.markups.includes(i)))}}catch(n){console.error(n)}}_handleMouseover(e){if(this._canShowToolbar){let t=(0,n.getEventTargetMatchingTag)("a",e.target,this.container)
 t&&t.isContentEditable&&t.closest("[data-kg-has-link-toolbar=true]")===this.container&&(this._timeout=Ember.run.later(this,(function(){this._showToolbar(t,{x:e.clientX,y:e.clientY})}),120))}}_handleMouseout(e){if(this._cancelTimeouts(),this.showToolbar){let t=e.toElement||e.relatedTarget
 t&&t!==this.element&&t!==this._target&&!t.closest(`#${this.elementId}`)&&this.set("showToolbar",!1)}}_showToolbar(e,r){this._target=e
 let n=e.getAttribute("href"),i=this.config.blogUrl
@@ -12379,7 +12380,7 @@ e&&e.focus()}_handleWindowMousedown(e){e.target.closest(`#${this.elementId}, .fu
 r<this.element.parentNode.getBoundingClientRect().left&&(r+=40)
 try{let e=i.positionAtPoint(r,n)
 if(e){let t=e.toRange()
-this._showOrHideButton(t)}}catch(t){if(t instanceof TypeError==!1)throw t}!this.showButton&&this._hasCursorButton&&this._showOrHideButton(this.editorRange)}this._mousemoveTicking=!1}_handleKeydown(e){if("Escape"===e.key)return this._moveCaretToCachedEditorRange(),void this._hideMenu();["ArrowUp","ArrowDown","ArrowLeft","ArrowRight"].includes(e.key)&&this._hideMenu()}_handleResize(){this.showButton&&(this._throttleResize=Ember.run.throttle(this,this._positionMenu,100))}_moveCaretToCachedEditorRange(){this._ignoreRangeChange=!0,this.set("editorRange",this._editorRange),this.editor.selectRange(this._editorRange)}},m(p.prototype,"style",[s],Object.getOwnPropertyDescriptor(p.prototype,"style"),p.prototype),m(p.prototype,"itemSections",[l],Object.getOwnPropertyDescriptor(p.prototype,"itemSections"),p.prototype),m(p.prototype,"openMenu",[u],Object.getOwnPropertyDescriptor(p.prototype,"openMenu"),p.prototype),m(p.prototype,"closeMenu",[d],Object.getOwnPropertyDescriptor(p.prototype,"closeMenu"),p.prototype),m(p.prototype,"itemClicked",[c],Object.getOwnPropertyDescriptor(p.prototype,"itemClicked"),p.prototype),h=p))||h)||h)
+this._showOrHideButton(t)}}catch(t){t instanceof TypeError==!1&&console.error(t)}!this.showButton&&this._hasCursorButton&&this._showOrHideButton(this.editorRange)}this._mousemoveTicking=!1}_handleKeydown(e){if("Escape"===e.key)return this._moveCaretToCachedEditorRange(),void this._hideMenu();["ArrowUp","ArrowDown","ArrowLeft","ArrowRight"].includes(e.key)&&this._hideMenu()}_handleResize(){this.showButton&&(this._throttleResize=Ember.run.throttle(this,this._positionMenu,100))}_moveCaretToCachedEditorRange(){this._ignoreRangeChange=!0,this.set("editorRange",this._editorRange),this.editor.selectRange(this._editorRange)}},m(p.prototype,"style",[s],Object.getOwnPropertyDescriptor(p.prototype,"style"),p.prototype),m(p.prototype,"itemSections",[l],Object.getOwnPropertyDescriptor(p.prototype,"itemSections"),p.prototype),m(p.prototype,"openMenu",[u],Object.getOwnPropertyDescriptor(p.prototype,"openMenu"),p.prototype),m(p.prototype,"closeMenu",[d],Object.getOwnPropertyDescriptor(p.prototype,"closeMenu"),p.prototype),m(p.prototype,"itemClicked",[c],Object.getOwnPropertyDescriptor(p.prototype,"itemClicked"),p.prototype),h=p))||h)||h)
 e.default=v,Ember._setComponentTemplate(g,v)})),define("koenig-editor/components/koenig-settings-panel",["exports","@glimmer/component","ember-concurrency"],(function(e,t,r){"use strict"
 var n,i,o,a,s
 function l(e,t,r,n,i){var o={}
@@ -13339,4 +13340,4 @@ return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStor
 r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=s,Object.setPrototypeOf(s.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}})}))
 
-//# sourceMappingURL=vendor-0d29a566ca9747f2cfba9d7c98e39f53.map
+//# sourceMappingURL=vendor-a5908fe1facfc5cd41d8b915a996bfed.map

package/core/built/admin/index.html

@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-0d29a566ca9747f2cfba9d7c98e39f53.js"></script>
-<script src="assets/chunk.613.551c7c3e872b9a811863.js"></script>
-<script src="assets/chunk.143.37f5727f90df66ade091.js"></script>
-    <script src="assets/ghost-15f77300dbb6762873d6692e0485a37a.js"></script>
+    <script src="assets/vendor-a5908fe1facfc5cd41d8b915a996bfed.js"></script>
+<script src="assets/chunk.613.7e15b585f6a677d191bb.js"></script>
+<script src="assets/chunk.143.ce979d0e79756c847be1.js"></script>
+    <script src="assets/ghost-04991abb5f64c0b3442a093dbfa55a67.js"></script>
 </body>
 </html>

package/core/frontend/helpers/get.js

@@ -117,9 +117,59 @@ function parseOptions(globals, data, options) {
     return options;
 }
 
+/**
+ *
+ * @param {String} resource
+ * @param {String} controllerName
+ * @param {String} action
+ * @param {Object} apiOptions
+ * @returns {Promise<Object>}
+ */
+async function makeAPICall(resource, controllerName, action, apiOptions) {
+    const controller = api[controllerName];
+
+    let timer;
+
+    try {
+        let response;
+
+        if (config.get('optimization:getHelper:timeout:threshold')) {
+            const logLevel = config.get('optimization:getHelper:timeout:level') || 'error';
+            const threshold = config.get('optimization:getHelper:timeout:threshold');
+
+            const apiResponse = controller[action](apiOptions);
+
+            const timeout = new Promise((resolve) => {
+                timer = setTimeout(() => {
+                    logging[logLevel](new errors.HelperWarning({
+                        message: `{{#get}} took longer than ${threshold}ms and was aborted`,
+                        code: 'ABORTED_GET_HELPER',
+                        errorDetails: {
+                            api: `${controllerName}.${action}`,
+                            apiOptions
+                        }
+                    }));
+
+                    resolve({[resource]: []});
+                }, threshold);
+            });
+
+            response = await Promise.race([apiResponse, timeout]);
+            clearTimeout(timer);
+        } else {
+            response = await controller[action](apiOptions);
+        }
+
+        return response;
+    } catch (err) {
+        clearTimeout(timer);
+        throw err;
+    }
+}
+
 /**
  * ## Get
- * @param {Object} resource
+ * @param {String} resource
  * @param {Object} options
  * @returns {Promise<any>}
  */
@@ -149,7 +199,6 @@ module.exports = async function get(resource, options) {
     }
 
     const controllerName = RESOURCES[resource].alias;
-    const controller = api[controllerName];
     const action = isBrowse(apiOptions) ? 'browse' : 'read';
 
     // Parse the options we're going to pass to the API
@@ -157,7 +206,7 @@ module.exports = async function get(resource, options) {
     apiOptions.context = {member: data.member};
 
     try {
-        const response = await controller[action](apiOptions);
+        const response = await makeAPICall(resource, controllerName, action, apiOptions);
 
         // prepare data properties for use with handlebars
         if (response[resource] && response[resource].length) {
@@ -185,19 +234,21 @@ module.exports = async function get(resource, options) {
         data.error = error.message;
         return options.inverse(self, {data: data});
     } finally {
-        const totalMs = Date.now() - start;
-        const logLevel = config.get('logging:slowHelper:level');
-        const threshold = config.get('logging:slowHelper:threshold');
-        if (totalMs > threshold) {
-            logging[logLevel](new errors.HelperWarning({
-                message: `{{#get}} helper took ${totalMs}ms to complete`,
-                code: 'SLOW_GET_HELPER',
-                errorDetails: {
-                    api: `${controllerName}.${action}`,
-                    apiOptions,
-                    returnedRows: returnedRowsCount
-                }
-            }));
+        if (config.get('optimization:getHelper:notify:threshold')) {
+            const totalMs = Date.now() - start;
+            const logLevel = config.get('optimization:getHelper:notify:level') || 'warn';
+            const threshold = config.get('optimization:getHelper:notify:threshold');
+            if (totalMs > threshold) {
+                logging[logLevel](new errors.HelperWarning({
+                    message: `{{#get}} helper took ${totalMs}ms to complete`,
+                    code: 'SLOW_GET_HELPER',
+                    errorDetails: {
+                        api: `${controllerName}.${action}`,
+                        apiOptions,
+                        returnedRows: returnedRowsCount
+                    }
+                }));
+            }
         }
     }
 };

package/core/server/api/endpoints/db.js

@@ -83,7 +83,7 @@ module.exports = {
         permissions: true,
         query(frame) {
             const siteTimezone = settingsCache.get('timezone');
-            const importTag = `Import ${moment().tz(siteTimezone).format('YYYY-MM-DD HH:mm')}`;
+            const importTag = `#Import ${moment().tz(siteTimezone).format('YYYY-MM-DD HH:mm')}`;
             return importer.importFromFile(frame.file, {
                 user: {
                     email: frame.user.get('email')

package/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js

@@ -10,6 +10,7 @@ module.exports = (model, frame) => {
             name: jsonModel.name,
             description: jsonModel.description,
             slug: jsonModel.slug,
+            sender_email: jsonModel.sender_email,
             subscribe_on_signup: jsonModel.subscribe_on_signup,
             visibility: jsonModel.visibility,
             sort_order: jsonModel.sort_order,

package/core/server/data/importer/importers/data/data-importer.js

@@ -55,7 +55,7 @@ DataImporter = {
             importData.data.tags.push({
                 id: tagId,
                 name: importOptions.importTag,
-                slug: slugify(importOptions.importTag)
+                slug: slugify(importOptions.importTag.replace(/^#/, 'hash-'))
             });
             if (!('posts_tags' in importData.data)) {
                 importData.data.posts_tags = [];

package/core/server/services/mega/mega.js

@@ -571,19 +571,25 @@ async function createEmailBatches({emailModel, memberRows, memberSegment, option
     return batchIds;
 }
 
-const statusChangedHandler = (emailModel, options) => {
+const statusChangedHandler = async (emailModel, options) => {
     const emailRetried = emailModel.wasChanged()
         && emailModel.get('status') === 'pending'
         && emailModel.previous('status') === 'failed';
 
     if (emailRetried) {
-        pendingEmailHandler(emailModel, options);
+        await pendingEmailHandler(emailModel, options);
     }
 };
 
 function listen() {
-    events.on('email.added', pendingEmailHandler);
-    events.on('email.edited', statusChangedHandler);
+    events.on('email.added', (emailModel, options) => pendingEmailHandler(emailModel, options).catch((e) => {
+        logging.error('Error in email.added event handler');
+        logging.error(e);
+    }));
+    events.on('email.edited', (emailModel, options) => statusChangedHandler(emailModel, options).catch((e) => {
+        logging.error('Error in email.edited event handler');
+        logging.error(e);
+    }));
 }
 
 // Public API

package/core/server/services/members/middleware.js

@@ -77,7 +77,10 @@ const deleteSession = async function (req, res) {
         res.writeHead(204);
         res.end();
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);
@@ -101,11 +104,20 @@ const getMemberData = async function (req, res) {
 const deleteSuppression = async function (req, res) {
     try {
         const member = await membersService.ssr.getMemberDataFromSession(req, res);
+        const options = {
+            id: member.id,
+            withRelated: ['newsletters']
+        };
         await emailSuppressionList.removeEmail(member.email);
+        await membersService.api.members.update({subscribed: true}, options);
+
         res.writeHead(204);
         res.end();
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);
@@ -188,7 +200,10 @@ const updateMemberData = async function (req, res) {
             res.json(null);
         }
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);

package/core/server/services/members-events/index.js

@@ -23,13 +23,16 @@ class MembersEventsServiceWrapper {
             labsService
         });
 
+        const db = require('../../data/db');
+
         this.lastSeenAtUpdater = new LastSeenAtUpdater({
             services: {
                 settingsCache
             },
             getMembersApi() {
                 return members.api;
-            }
+            },
+            db
         });
 
         this.eventStorage.subscribe(DomainEvents);

package/core/server/services/stripe/service.js

@@ -22,7 +22,9 @@ async function configureApi() {
 }
 
 const debouncedConfigureApi = _.debounce(() => {
-    configureApi();
+    configureApi().catch((err) => {
+        logging.error(err);
+    });
 }, 600);
 
 module.exports = new StripeService({

package/core/shared/config/defaults.json

@@ -58,11 +58,7 @@
         },
         "transports": [
             "stdout"
-        ],
-        "slowHelper": {
-            "level": "warn",
-            "threshold": 200
-        }
+        ]
     },
     "spam": {
         "user_login": {
@@ -145,6 +141,18 @@
             "maxAge": 0
         }
     },
+    "optimization": {
+        "getHelper": {
+            "timeout": {
+                "threshold": 5000,
+                "level": "error"
+            },
+            "notify": {
+                "threshold": 200,
+                "level": "warn"
+            }
+        }
+    },
     "imageOptimization": {
         "resize": true,
         "srcsets": true
@@ -161,7 +169,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.21"
+        "version": "2.22"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",