ghost 5.19.3 → 5.21.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.19%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.21%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-982146a4ada3a5af1981d1919ae01d08.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-9873519a8ad69b5b23284f0a9e050bc6.css" title="light">
 
     
 </head>
@@ -45,7 +45,7 @@
 
     <div class="ember-load-indicator">
         <div class="gh-loading-content">
-            <video width="100" height="100" loop="" autoplay="" muted="" playsinline="" preload="metadata">
+            <video width="100" height="100" loop autoplay muted playsinline preload="metadata" style="width: 100px; height: 100px;">
                 <source src="assets/videos/logo-loader.mp4" type="video/mp4" />
                 <div class="gh-loading-spinner"></div>
             </video>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-5c7d7063620bec13668c4370145cd4b4.js"></script>
-<script src="assets/chunk.613.f1d519ad47e7f9024263.js"></script>
-<script src="assets/chunk.143.c035c61595ed02eee886.js"></script>
-    <script src="assets/ghost-5ce6f5a730c83c91fc258b12c537ea35.js"></script>
+    <script src="assets/vendor-26cca1d4d56660dc6e915a12ccc3b330.js"></script>
+<script src="assets/chunk.613.695f31829550fb00d43c.js"></script>
+<script src="assets/chunk.143.9cddfa7bd1a8b9cf3d4b.js"></script>
+    <script src="assets/ghost-192fee3b46a193df1e65c49a67a7d694.js"></script>
 </body>
 </html>

package/core/cli/generate-data.js

@@ -0,0 +1,51 @@
+const Command = require('./command');
+const DataGenerator = require('@tryghost/data-generator');
+
+module.exports = class REPL extends Command {
+    setup() {
+        this.help('Generates random data to populate the database for development & testing');
+        this.argument('--use-base-data', {type: 'boolean', defaultValue: false, desc: 'Only generate data outside of a defined base data set'});
+    }
+
+    initializeContext(context) {
+        const models = require('../server/models');
+        const knex = require('../server/data/db/connection');
+
+        models.init();
+
+        context.models = models;
+        context.m = models;
+        context.knex = knex;
+        context.k = knex;
+    }
+
+    permittedEnvironments() {
+        return ['development', 'local', 'staging', 'production'];
+    }
+
+    async handle(argv = {}) {
+        const knex = require('../server/data/db/connection');
+        const {tables: schema} = require('../server/data/schema/index');
+        const dataGenerator = new DataGenerator({
+            useBaseData: argv['use-base-data'],
+            knex,
+            schema,
+            logger: {
+                log: this.log,
+                ok: this.ok,
+                info: this.info,
+                warn: this.warn,
+                error: this.error,
+                fatal: this.fatal,
+                debug: this.debug
+            },
+            modelQuantities: {}
+        });
+        try {
+            await dataGenerator.importData();
+        } catch (error) {
+            this.fatal('Failed while generating data: ', error);
+        }
+        knex.destroy();
+    }
+};

package/core/frontend/helpers/ghost_head.js

@@ -234,7 +234,7 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                 head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
             }
 
-            if (settingsCache.get('members_enabled')) {
+            if (settingsCache.get('members_enabled') && settingsCache.get('members_track_sources')) {
                 head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
             }
 

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

@@ -1,4 +1,5 @@
 const linkTrackingService = require('../../services/link-tracking');
+const INVALIDATE_ALL_REDIRECTS = '/r/*';
 
 module.exports = {
     docName: 'links',
@@ -6,7 +7,7 @@ module.exports = {
         options: [
             'filter'
         ],
-        permissions: false,
+        permissions: true,
         async query(frame) {
             const links = await linkTrackingService.service.getLinks(frame.options);
 
@@ -21,5 +22,37 @@ module.exports = {
                 }
             };
         }
+    },
+    bulkEdit: {
+        statusCode: 200,
+        headers: {
+            cacheInvalidate: INVALIDATE_ALL_REDIRECTS
+        },
+        options: [
+            'filter'
+        ],
+        data: [
+            'action',
+            'meta'
+        ],
+        validation: {
+            data: {
+                action: {
+                    required: true,
+                    values: ['updateLink']
+                }
+            },
+            options: {
+                filter: {
+                    required: true
+                }
+            }
+        },
+        permissions: {
+            method: 'edit'
+        },
+        async query(frame) {
+            return await linkTrackingService.service.bulkEdit(frame.data.bulk, frame.options);
+        }
     }
 };

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

@@ -435,10 +435,7 @@ module.exports = {
             method: 'browse'
         },
         async query(frame) {
-            const events = await membersService.api.events.getEventTimeline(frame.options);
-            return {
-                events
-            };
+            return await membersService.api.events.getEventTimeline(frame.options);
         }
     }
 };

package/core/server/api/endpoints/posts-public.js

@@ -1,7 +1,7 @@
 const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const allowedIncludes = ['tags', 'authors', 'tiers'];
+const allowedIncludes = ['tags', 'authors', 'tiers', 'sentiment'];
 
 const messages = {
     postNotFound: 'Post not found.'

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

@@ -11,7 +11,8 @@ const allowedIncludes = [
     'newsletter',
     'count.signups',
     'count.paid_conversions',
-    'count.clicks'
+    'count.clicks',
+    'sentiment'
 ];
 const unsafeAttrs = ['status', 'authors', 'visibility'];
 

package/core/server/api/endpoints/tiers-public.js

@@ -1,8 +1,4 @@
-// NOTE: We must not cache references to membersService.api
-// as it is a getter and may change during runtime.
-const membersService = require('../../services/members');
-
-const allowedIncludes = ['monthly_price', 'yearly_price', 'benefits'];
+const tiersService = require('../../services/tiers');
 
 module.exports = {
     docName: 'tiers',
@@ -11,22 +7,14 @@ module.exports = {
         options: [
             'limit',
             'fields',
-            'include',
             'filter',
             'order',
             'debug',
             'page'
         ],
         permissions: true,
-        validation: {
-            options: {
-                include: {
-                    values: allowedIncludes
-                }
-            }
-        },
         async query(frame) {
-            const page = await membersService.api.productRepository.list(frame.options);
+            const page = await tiersService.api.browse(frame.options);
 
             return page;
         }

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

@@ -1,13 +1,4 @@
-const errors = require('@tryghost/errors');
-const membersService = require('../../services/members');
-
-const tpl = require('@tryghost/tpl');
-
-const allowedIncludes = ['monthly_price', 'yearly_price', 'benefits'];
-
-const messages = {
-    productNotFound: 'Tier not found.'
-};
+const tiersService = require('../../services/tiers');
 
 module.exports = {
     docName: 'tiers',
@@ -16,7 +7,6 @@ module.exports = {
         options: [
             'limit',
             'fields',
-            'include',
             'filter',
             'order',
             'debug',
@@ -25,48 +15,21 @@ module.exports = {
         permissions: {
             docName: 'products'
         },
-        validation: {
-            options: {
-                include: {
-                    values: allowedIncludes
-                }
-            }
-        },
         async query(frame) {
-            const page = await membersService.api.productRepository.list(frame.options);
-
+            const page = await tiersService.api.browse(frame.options);
             return page;
         }
     },
 
     read: {
-        options: [
-            'include'
-        ],
-        headers: {},
         data: [
             'id'
         ],
-        validation: {
-            options: {
-                include: {
-                    values: allowedIncludes
-                }
-            }
-        },
         permissions: {
             docName: 'products'
         },
         async query(frame) {
-            const model = await membersService.api.productRepository.get(frame.data, frame.options);
-
-            if (!model) {
-                throw new errors.NotFoundError({
-                    message: tpl(messages.productNotFound)
-                });
-            }
-
-            return model;
+            return await tiersService.api.read(frame.data.id);
         }
     },
 
@@ -84,11 +47,7 @@ module.exports = {
             docName: 'products'
         },
         async query(frame) {
-            const model = await membersService.api.productRepository.create(
-                frame.data,
-                frame.options
-            );
-            return model;
+            return await tiersService.api.add(frame.data);
         }
     },
 
@@ -111,12 +70,7 @@ module.exports = {
             docName: 'products'
         },
         async query(frame) {
-            const model = await membersService.api.productRepository.update(
-                frame.data,
-                frame.options
-            );
-
-            return model;
+            return await tiersService.api.edit(frame.options.id, frame.data);
         }
     }
 };

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -16,7 +16,26 @@ function removeSourceFormats(frame) {
     }
 }
 
+/**
+ * Map names of relations to the internal names
+ */
+function mapWithRelated(frame) {
+    if (frame.options.withRelated) {
+        // Map sentiment to count.sentiment
+        if (labs.isSet('audienceFeedback')) {
+            frame.options.withRelated = frame.options.withRelated.map((relation) => {
+                return relation === 'sentiment' ? 'count.sentiment' : relation;
+            });
+        }
+        return;
+    }
+}
+
 function defaultRelations(frame) {
+    // Apply same mapping as content API
+    mapWithRelated(frame);
+
+    // Addditional defaults for admin API
     if (frame.options.withRelated) {
         return;
     }
@@ -26,7 +45,7 @@ function defaultRelations(frame) {
     }
 
     if (labs.isSet('audienceFeedback')) {
-        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks', 'count.sentiment', 'count.positive_feedback'];
+        frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.conversions', 'count.clicks', 'count.sentiment', 'count.positive_feedback', 'count.negative_feedback'];
     } else {
         frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.signups', 'count.paid_conversions', 'count.clicks'];
     }
@@ -111,6 +130,7 @@ module.exports = {
 
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
+            mapWithRelated(frame);
         }
 
         if (!localUtils.isContentAPI(frame)) {

package/core/server/api/endpoints/utils/serializers/input/settings.js

@@ -48,6 +48,7 @@ const EDITABLE_SETTINGS = [
     'mailgun_base_url',
     'email_track_opens',
     'email_track_clicks',
+    'members_track_sources',
     'amp',
     'amp_gtag_id',
     'slack_url',

package/core/server/api/endpoints/utils/serializers/input/tiers.js

@@ -1,5 +1,4 @@
 const localUtils = require('../../index');
-const labs = require('../../../../../../shared/labs');
 
 const forceActiveFilter = (frame) => {
     if (frame.options.filter) {
@@ -10,39 +9,31 @@ const forceActiveFilter = (frame) => {
 };
 
 function convertTierInput(input) {
-    const converted = {
-        id: input.id,
-        name: input.name,
-        description: input.description,
-        slug: input.slug,
-        active: input.active,
-        type: input.type,
-        welcome_page_url: input.welcome_page_url,
-        created_at: input.created_at,
-        updated_at: input.updated_at,
-        visibility: input.visibility
-    };
+    const converted = Object.assign({}, input);
 
-    if (labs.isSet('freeTrial')) {
-        converted.trial_days = input.trial_days || 0;
+    if (Reflect.has(converted, 'active')) {
+        converted.status = converted.active ? 'active' : 'archived';
+        delete converted.active;
     }
 
-    if (input.monthly_price && input.currency) {
-        converted.monthly_price = {
-            amount: input.monthly_price,
-            currency: input.currency
-        };
+    if (Reflect.has(converted, 'welcome_page_url')) {
+        converted.welcomePageURL = converted.welcome_page_url;
+        delete converted.welcome_page_url;
     }
 
-    if (input.yearly_price && input.currency) {
-        converted.yearly_price = {
-            amount: input.yearly_price,
-            currency: input.currency
-        };
+    if (Reflect.has(converted, 'trial_days')) {
+        converted.trialDays = converted.trial_days;
+        delete converted.trial_days;
     }
 
-    if (input.benefits) {
-        converted.benefits = input.benefits.map(name => ({name}));
+    if (Reflect.has(converted, 'monthly_price')) {
+        converted.monthlyPrice = converted.monthly_price;
+        delete converted.monthly_price;
+    }
+
+    if (Reflect.has(converted, 'yearly_price')) {
+        converted.yearlyPrice = converted.yearly_price;
+        delete converted.yearly_price;
     }
 
     return converted;

package/core/server/api/endpoints/utils/serializers/output/index.js

@@ -127,5 +127,9 @@ module.exports = {
 
     get members_stripe_connect() {
         return require('./members-stripe-connect');
+    },
+
+    get links() {
+        return require('./links');
     }
 };

package/core/server/api/endpoints/utils/serializers/output/links.js

@@ -0,0 +1,5 @@
+module.exports = {
+    bulkEdit(data, apiConfig, frame) {
+        frame.response = data;
+    }
+};

package/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js

@@ -2,6 +2,21 @@ const mapComment = require('./comments');
 const url = require('../utils/url');
 const _ = require('lodash');
 
+const memberFields = [
+    'id',
+    'uuid',
+    'name',
+    'email',
+    'avatar_image'
+];
+
+const postFields = [
+    'id',
+    'uuid',
+    'title',
+    'url'
+];
+
 const commentEventMapper = (json, frame) => {
     return {
         ...json,
@@ -10,26 +25,11 @@ const commentEventMapper = (json, frame) => {
 };
 
 const clickEventMapper = (json, frame) => {
-    const memberFields = [
-        'id',
-        'uuid',
-        'name',
-        'email',
-        'avatar_image'
-    ];
-
     const linkFields = [
         'from',
         'to'
     ];
 
-    const postFields = [
-        'id',
-        'uuid',
-        'title',
-        'url'
-    ];
-
     const data = json.data;
     const response = {};
 
@@ -53,6 +53,67 @@ const clickEventMapper = (json, frame) => {
         response.created_at = data.created_at;
     }
 
+    if (data.id) {
+        response.id = data.id;
+    }
+
+    return {
+        ...json,
+        data: response
+    };
+};
+
+const aggregatedClickEventMapper = (json) => {
+    const data = json.data;
+    const response = {};
+
+    if (data.member) {
+        response.member = _.pick(data.member, memberFields);
+    } else {
+        response.member = null;
+    }
+
+    if (data.created_at) {
+        response.created_at = data.created_at;
+    }
+
+    if (data.id) {
+        response.id = data.id;
+    }
+
+    response.count = {
+        clicks: data.count?.clicks ?? 0
+    };
+
+    return {
+        ...json,
+        data: response
+    };
+};
+
+const feedbackEventMapper = (json, frame) => {
+    const feedbackFields = [
+        'id',
+        'score',
+        'created_at'
+    ];
+
+    const data = json.data;
+    const response = _.pick(data, feedbackFields);
+
+    if (data.post) {
+        url.forPost(data.post.id, data.post, frame);
+        response.post = _.pick(data.post, postFields);
+    } else {
+        response.post = null;
+    }
+    
+    if (data.member) {
+        response.member = _.pick(data.member, memberFields);
+    } else {
+        response.member = null;
+    }
+
     return {
         ...json,
         data: response
@@ -82,9 +143,22 @@ const activityFeedMapper = (event, frame) => {
     if (event.type === 'click_event') {
         return clickEventMapper(event, frame);
     }
+    if (event.type === 'aggregated_click_event') {
+        return aggregatedClickEventMapper(event, frame);
+    }
+    if (event.type === 'feedback_event') {
+        return feedbackEventMapper(event, frame);
+    }
     if (event.data?.attribution) {
         event.data.attribution = serializeAttribution(event.data.attribution);
     }
+    // TODO: add dedicated mappers for other event types
+    if (event.data?.batch_id) {
+        delete event.data.batch_id;
+    }
+    if (event.data?.subscriptionCreatedEvent) {
+        delete event.data.subscriptionCreatedEvent;
+    }
     return event;
 };
 

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

@@ -111,21 +111,35 @@ module.exports = async (model, frame, options = {}) => {
 
     if (jsonModel.email && jsonModel.count) {
         jsonModel.email.opened_count = Math.min(
-            Math.max(
-                jsonModel.email.opened_count || 0,
-                jsonModel.count.clicks || 0
-            ),
+            jsonModel.email.opened_count || 0,
             jsonModel.email.email_count
         );
     }
 
-    if (jsonModel.count && !jsonModel.count.sentiment) {
-        jsonModel.count.sentiment = 0;
+    // The sentiment has been loaded as a count relation in count.sentiment. But externally in the API we use just 'sentiment' instead of count.sentiment
+    // This part moves count.sentiment to just 'sentiment' when it has been loaded
+    if (frame.options.withRelated && frame.options.withRelated.includes('count.sentiment')) {
+        if (!jsonModel.count) {
+            jsonModel.sentiment = 0;
+        } else {
+            jsonModel.sentiment = jsonModel.count.sentiment ?? 0;
+
+            // Delete it from the original location
+            delete jsonModel.count.sentiment;
+
+            if (Object.keys(jsonModel.count).length === 0) {
+                delete jsonModel.count;
+            }
+        }
     }
 
     if (jsonModel.count && !jsonModel.count.positive_feedback) {
         jsonModel.count.positive_feedback = 0;
     }
 
+    if (jsonModel.count && !jsonModel.count.negative_feedback) {
+        jsonModel.count.negative_feedback = 0;
+    }
+
     return jsonModel;
 };

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

@@ -22,8 +22,8 @@ module.exports = (snippet, frame) => {
 /**
  * @typedef {Object} SerializedSnippet
  * @prop {string} id
- * @prop {string=} name
- * @prop {string=} mobiledoc
+ * @prop {string} [name]
+ * @prop {string} [mobiledoc]
  * @prop {string} created_at
  * @prop {string} updated_at
  * @prop {string} created_by