ghost 4.47.0 → 4.47.1

package/core/server/api/canary/utils/serializers/input/members.js

@@ -47,6 +47,12 @@ module.exports = {
         this.browse(...arguments);
     },
 
+    exportCSV() {
+        debug('exportCSV');
+
+        this.browse(...arguments);
+    },
+
     add(apiConfig, frame) {
         debug('add');
         if (frame.data.members[0].labels) {

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

@@ -6,6 +6,7 @@ const mobiledocLib = require('../../../../lib/mobiledoc');
 const validator = require('@tryghost/validator');
 const postsMetaSchema = require('../../../schema').tables.posts_meta;
 const metaAttrs = _.keys(_.omit(postsMetaSchema, ['id']));
+const ignoredColumns = ['newsletter_id'];
 
 class PostsImporter extends BaseImporter {
     constructor(allDataFromFile) {
@@ -42,6 +43,10 @@ class PostsImporter extends BaseImporter {
                 }
                 delete obj.send_email_when_published;
             }
+
+            ignoredColumns.forEach((column) => {
+                delete obj[column];
+            });
         });
     }
 

package/core/server/data/migrations/versions/4.47/2022-05-03-15-30-update-newsletter-sending-options.js

@@ -22,7 +22,7 @@ module.exports = createTransactionalMigration(
         await knex('newsletters')
             .update({
                 // CASE: members_from_address is 'noreply' - we leave it as null to maintain fallback behaviour
-                sender_email: !fromAddress || fromAddress.value === 'noreply' ? undefined : fromAddress.value,
+                sender_email: !fromAddress || fromAddress.value === 'noreply' ? null : fromAddress.value,
                 sender_reply_to: replyTo ? replyTo.value : undefined
             })
             .whereNull('sender_email')

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

@@ -214,12 +214,10 @@ const addEmail = async (postModel, options) => {
     }
 
     const knexOptions = _.pick(options, ['transacting', 'forUpdate']);
-    const filterOptions = Object.assign({}, knexOptions, {limit: 1});
+    const filterOptions = {...knexOptions, limit: 1};
+
+    const newsletter = await postModel.related('newsletter').fetch({require: true, ..._.pick(options, ['transacting'])});
 
-    let newsletter;
-    if (labsService.isSet('multipleNewsletters')) {
-        newsletter = await postModel.related('newsletter').fetch(Object.assign({}, {require: false}, _.pick(options, ['transacting'])));
-    }
     const emailRecipientFilter = postModel.get('email_recipient_filter');
     filterOptions.filter = transformEmailRecipientFilter(emailRecipientFilter, {errorProperty: 'email_recipient_filter'}, newsletter);
 
@@ -257,7 +255,7 @@ const addEmail = async (postModel, options) => {
             submitted_at: moment().toDate(),
             track_opens: !!settingsCache.get('email_track_opens'),
             recipient_filter: emailRecipientFilter,
-            newsletter_id: options.newsletter_id
+            newsletter_id: newsletter.id
         }, knexOptions);
     } else {
         return existing;

package/core/server/services/posts/posts-service.js

@@ -30,6 +30,8 @@ class PostsService {
             }
         } else {
             // Set the newsletter_id if it isn't passed to the API
+            // NOTE: this option is ignored if the newsletter_id is already set on the post.
+            // Never use frame.options.newsletter_id to do actual logic. Use model.newsletter_id after the edit.
             const newsletters = await this.models.Newsletter.findPage({filter: 'status:active', limit: 1, columns: ['id']}, {transacting: frame.options.transacting});
             if (newsletters.data.length > 0) {
                 frame.options.newsletter_id = newsletters.data[0].id;
@@ -85,7 +87,7 @@ class PostsService {
                 let postEmail = model.relations.email;
 
                 if (!postEmail) {
-                    const email = await this.mega.addEmail(model, Object.assign({}, frame.options, {apiVersion: this.apiVersion}));
+                    const email = await this.mega.addEmail(model, {...frame.options, apiVersion: this.apiVersion});
                     model.set('email', email);
                 } else if (postEmail && postEmail.get('status') === 'failed') {
                     const email = await this.mega.retryFailedEmail(postEmail);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.47.0",
+  "version": "4.47.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -80,7 +80,7 @@
     "@tryghost/kg-default-cards": "5.16.2",
     "@tryghost/kg-markdown-html-renderer": "5.1.5",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
-    "@tryghost/limit-service": "1.1.0",
+    "@tryghost/limit-service": "1.1.2",
     "@tryghost/logging": "2.1.8",
     "@tryghost/magic-link": "1.0.24",
     "@tryghost/member-events": "0.4.4",

package/yarn.lock

@@ -2082,10 +2082,10 @@
   dependencies:
     semver "^7.3.5"
 
-"@tryghost/limit-service@1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/limit-service/-/limit-service-1.1.0.tgz#12af2d0b8242212871be8cf893e2563466c25ec2"
-  integrity sha512-CC0/Ly1KIVIiYMKwqWfgKPkFoGssyyPjwcdS4XzJ3KyqdwEckzPX1e2jZMzptZlMqDuAa4uZ0xSf5VH4YZ71+Q==
+"@tryghost/limit-service@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/limit-service/-/limit-service-1.1.2.tgz#248f5b1c5383d302a6e29e8bcd2948ff9eb9ab4f"
+  integrity sha512-aOUVnNvhYDANqtx+2pS0c0RADG39QDQ5tB7CLPjpcz2B6Nsc1fg4dEJeXU8fI1JT0YpMDRSliiNRh0/MMkozbA==
   dependencies:
     "@tryghost/errors" "^1.2.1"
     lodash "^4.17.21"