Add v2.4.0

Author: YannickRe

core/built/assets/ghost.min-cb9cedd474b87c1e57a494b014040dcb.js core/built/assets/ghost.min-e3bf097e9324c3108e4d726878a169e0.js

@@ -11,8 +11,14 @@ const cacheInvalidate = (result, options = {}) => {
 
 const disposition = {
     csv(result, options = {}) {
+        let value = options.value;
+
+        if (typeof options.value === 'function') {
+            value = options.value();
+        }
+
         return {
-            'Content-Disposition': options.value,
+            'Content-Disposition': value,
             'Content-Type': 'text/csv'
         };
     },
@@ -21,15 +27,15 @@ const disposition = {
         return {
             'Content-Disposition': options.value,
             'Content-Type': 'application/json',
-            'Content-Length': JSON.stringify(result).length
+            'Content-Length': Buffer.byteLength(JSON.stringify(result))
         };
     },
 
     yaml(result, options = {}) {
         return {
             'Content-Disposition': options.value,
             'Content-Type': 'application/yaml',
-            'Content-Length': JSON.stringify(result).length
+            'Content-Length': Buffer.byteLength(JSON.stringify(result))
         };
     }
 };

core/built/assets/icons/integration.svg

@@ -229,7 +229,7 @@ const addHeaders = (apiMethod, req, res, result) => {
                 res.set({
                     'Content-Disposition': header,
                     'Content-Type': 'application/json',
-                    'Content-Length': JSON.stringify(result).length
+                    'Content-Length': Buffer.byteLength(JSON.stringify(result))
                 });
             });
     }
@@ -241,7 +241,7 @@ const addHeaders = (apiMethod, req, res, result) => {
                 res.set({
                     'Content-Disposition': header,
                     'Content-Type': 'application/yaml',
-                    'Content-Length': JSON.stringify(result).length
+                    'Content-Length': Buffer.byteLength(JSON.stringify(result))
                 });
             });
     }

core/built/assets/vendor.min-b6c746e6d718a54841a93b04223a8094.js core/built/assets/vendor.min-77bca21f1e9cb03acfb0bd707f936352.js

@@ -1,7 +1,7 @@
 const Promise = require('bluebird');
 const common = require('../../lib/common');
 const mailService = require('../../services/mail');
-const notificationsAPI = require('./notifications');
+const api = require('./');
 let mailer;
 let _private = {};
 
@@ -12,7 +12,7 @@ _private.sendMail = (object) => {
 
     return mailer.send(object.mail[0].message).catch((err) => {
         if (mailer.state.usingDirect) {
-            notificationsAPI.add(
+            api.notifications.add(
                 {
                     notifications: [{
                         type: 'warn',

core/server/api/shared/headers.js

@@ -12,7 +12,8 @@ const subscribers = {
             'fields',
             'filter',
             'order',
-            'debug'
+            'debug',
+            'page'
         ],
         permissions: true,
         validation: {},
@@ -139,7 +140,11 @@ const subscribers = {
     exportCSV: {
         headers: {
             disposition: {
-                type: 'csv'
+                type: 'csv',
+                value() {
+                    const datetime = (new Date()).toJSON().substring(0, 10);
+                    return `Attachment; filename="subscribers.${datetime}.csv"`;
+                }
             }
         },
         response: {

core/server/api/v0.1/index.js

@@ -32,6 +32,8 @@ function _renderer(req, res) {
  */
 function errorHandler(error, req, res, next) {
     req.body.email = '';
+    req.body.subscribed_url = santizeUrl(req.body.subscribed_url);
+    req.body.subscribed_referrer = santizeUrl(req.body.subscribed_referrer);
 
     if (error.statusCode !== 404) {
         res.locals.error = error;

core/server/api/v2/mail.js

@@ -28,7 +28,8 @@ _private.loadNconf = function loadNconf(options) {
      * env arguments
      */
     nconf.env({
-        separator: '__'
+        separator: '__',
+        parseValues: true
     });
 
     nconf.file('custom-env', path.join(customConfigPath, 'config.' + env + '.json'));

core/server/api/v2/subscribers.js

@@ -164,6 +164,7 @@ class PostsImporter extends BaseImporter {
 
             // CASE 1: you are importing old editor posts
             // CASE 2: you are importing Koenig Beta posts
+            // CASE 3: you are importing Koenig 2.0 posts
             if (model.mobiledoc || (model.mobiledoc && model.html && model.html.match(/^<div class="kg-card-markdown">/))) {
                 let mobiledoc;
 
@@ -179,7 +180,8 @@ class PostsImporter extends BaseImporter {
                 }
 
                 mobiledoc.cards.forEach((card) => {
-                    if (card[0] === 'image') {
+                    // Koenig Beta = imageStyle, Ghost 2.0 Koenig = cardWidth
+                    if (card[0] === 'image' && card[1].imageStyle) {
                         card[1].cardWidth = card[1].imageStyle;
                         delete card[1].imageStyle;
                     }