ghost 4.47.1 → 4.47.2

package/core/server/services/bulk-email/bulk-email-processor.js

@@ -194,7 +194,7 @@ module.exports = {
             // update all email recipients with a processed_at
             await models.EmailRecipient
                 .where({batch_id: emailBatchId})
-                .save({processed_at: moment()}, Object.assign({}, knexOptions, {patch: true}));
+                .save({processed_at: moment()}, Object.assign({}, knexOptions, {autoRefresh: false, patch: true}));
         }
     },
 

package/core/server/services/limits.js

@@ -1,6 +1,7 @@
 const errors = require('@tryghost/errors');
 const config = require('../../shared/config');
 const db = require('../data/db');
+const logging = require('@tryghost/logging');
 const LimitService = require('@tryghost/limit-service');
 let limitService = new LimitService();
 
@@ -24,13 +25,22 @@ const init = () => {
 
     const hostLimits = config.get('hostSettings:limits') || {};
 
-    limitService.loadLimits({
-        limits: hostLimits,
-        subscription,
-        db,
-        helpLink,
-        errors
-    });
+    try {
+        limitService.loadLimits({
+            limits: hostLimits,
+            subscription,
+            db,
+            helpLink,
+            errors
+        });
+    } catch (error) {
+        // Do not block the boot process for an incorrect usage error
+        if (error instanceof errors.IncorrectUsageError) {
+            logging.warn(error);
+        } else {
+            throw error;
+        }
+    }
 };
 
 module.exports = limitService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.47.1",
+  "version": "4.47.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -64,12 +64,12 @@
     "@tryghost/color-utils": "0.1.13",
     "@tryghost/config-url-helpers": "0.1.6",
     "@tryghost/constants": "1.0.3",
-    "@tryghost/custom-theme-settings-service": "0.3.2",
+    "@tryghost/custom-theme-settings-service": "0.3.3",
     "@tryghost/database-info": "0.3.3",
     "@tryghost/debug": "0.1.16",
     "@tryghost/domain-events": "0.1.12",
-    "@tryghost/email-analytics-provider-mailgun": "1.0.8",
-    "@tryghost/email-analytics-service": "1.0.6",
+    "@tryghost/email-analytics-provider-mailgun": "1.0.9",
+    "@tryghost/email-analytics-service": "1.0.7",
     "@tryghost/errors": "1.2.12",
     "@tryghost/express-dynamic-redirects": "0.2.11",
     "@tryghost/helpers": "1.1.64",

package/yarn.lock

@@ -1861,10 +1861,10 @@
   resolved "https://registry.yarnpkg.com/@tryghost/constants/-/constants-1.0.3.tgz#0009ca80a3d07a8a9ac30a74300ec570317d807e"
   integrity sha512-MVcXmEqg4KrR091aY1kUmEo7ymcSAY7n7vbSA8QhOf4mx+ZWJQ71zsXVqI5RgVsipd7DxnpUIzeuKB8YVYwrUg==
 
-"@tryghost/custom-theme-settings-service@0.3.2":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/custom-theme-settings-service/-/custom-theme-settings-service-0.3.2.tgz#79b63281435a168941e0bc121dc51ae48f0a7acf"
-  integrity sha512-xuGKnkEPHFerNff91Fraet1zYf4H4Rd+ax0hltRz3bGfBCxJcW9uOGfDQTqaHFlPAE9X+ZvrK68zIeSWKihufw==
+"@tryghost/custom-theme-settings-service@0.3.3":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/custom-theme-settings-service/-/custom-theme-settings-service-0.3.3.tgz#0e7c2408e1523cca03e7b52e880fc0a463a93f0f"
+  integrity sha512-kr7z5/NKXo6QgkV/nfPL8hMWMHNnA2D3kw86jH6stxyHZh/tGB9mEuEPzjOchh5g3C63rf/BDBS3SkoSij+e9w==
   dependencies:
     "@tryghost/debug" "^0.1.5"
     "@tryghost/errors" "^1.0.0"
@@ -1912,20 +1912,20 @@
     "@elastic/elasticsearch" "8.1.0"
     "@tryghost/debug" "^0.1.16"
 
-"@tryghost/email-analytics-provider-mailgun@1.0.8":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@tryghost/email-analytics-provider-mailgun/-/email-analytics-provider-mailgun-1.0.8.tgz#18c105cde98e8bdbe1e6dbf3b4cf0431205ece75"
-  integrity sha512-RTjLlMxYjxSESkM0n0NDmMGTfBYb9AOyLNUEFiumR8PPvwa2G+HscJQmWA61Qgmwt1E/4Fe7mh3BJ7lBXCNdvA==
+"@tryghost/email-analytics-provider-mailgun@1.0.9":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tryghost/email-analytics-provider-mailgun/-/email-analytics-provider-mailgun-1.0.9.tgz#4e850949d485bb4ccba22d2fd4e6defad6a98f7d"
+  integrity sha512-2RpDIg8K68pUSbnTfhSHkuPOMdRuaGrOCQKtzVVDy31LWwV70anlhoX34quMDkPkeUar47UoKrfQ99OQoKbVxQ==
   dependencies:
-    "@tryghost/email-analytics-service" "^1.0.6"
+    "@tryghost/email-analytics-service" "^1.0.7"
     "@tryghost/logging" "^2.0.0"
     mailgun-js "^0.22.0"
     moment "^2.29.1"
 
-"@tryghost/email-analytics-service@1.0.6", "@tryghost/email-analytics-service@^1.0.6":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@tryghost/email-analytics-service/-/email-analytics-service-1.0.6.tgz#13ea70cc9ad4cbdfb5e97b9f979b20b6a7c2825e"
-  integrity sha512-TjjchlATIb9Zd9Yhd0XX1EwgdgMyy85pe6HwWUwRSwiY8L2u9yRqcYWfAOOoNeKvSsyoCTtO4k9imdNUZaqjFQ==
+"@tryghost/email-analytics-service@1.0.7", "@tryghost/email-analytics-service@^1.0.7":
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/@tryghost/email-analytics-service/-/email-analytics-service-1.0.7.tgz#49bfe404aa74319353e04405821a4e301b4316cf"
+  integrity sha512-cHVHiiwtWkTBBV05QSYSbcoKI+BB+N4qDSRWuhXImdhXJZhgf51g+ufj/njDYMQ5ELLfX85hYcET2BbBKur6kw==
   dependencies:
     "@tryghost/debug" "^0.1.9"
     lodash "^4.17.20"