ghost 5.18.0 → 5.19.1

package/core/server/data/schema/schema.js

@@ -13,6 +13,7 @@ module.exports = {
         uuid: {type: 'string', maxlength: 36, nullable: false, unique: true, validations: {isUUID: true}},
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         description: {type: 'string', maxlength: 2000, nullable: true},
+        feedback_enabled: {type: 'boolean', nullable: false, defaultTo: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
         sender_name: {type: 'string', maxlength: 191, nullable: true},
         sender_email: {type: 'string', maxlength: 191, nullable: true},
@@ -24,18 +25,18 @@ module.exports = {
             nullable: false,
             defaultTo: 'members'
         },
-        subscribe_on_signup: {type: 'bool', nullable: false, defaultTo: true},
+        subscribe_on_signup: {type: 'boolean', nullable: false, defaultTo: true},
         sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
         header_image: {type: 'string', maxlength: 2000, nullable: true},
-        show_header_icon: {type: 'bool', nullable: false, defaultTo: true},
-        show_header_title: {type: 'bool', nullable: false, defaultTo: true},
+        show_header_icon: {type: 'boolean', nullable: false, defaultTo: true},
+        show_header_title: {type: 'boolean', nullable: false, defaultTo: true},
         title_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         title_alignment: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'center', validations: {isIn: [['center', 'left']]}},
-        show_feature_image: {type: 'bool', nullable: false, defaultTo: true},
+        show_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
         body_font_category: {type: 'string', maxlength: 191, nullable: false, defaultTo: 'sans_serif', validations: {isIn: [['serif', 'sans_serif']]}},
         footer_content: {type: 'text', maxlength: 1000000000, nullable: true},
-        show_badge: {type: 'bool', nullable: false, defaultTo: true},
-        show_header_name: {type: 'bool', nullable: false, defaultTo: true},
+        show_badge: {type: 'boolean', nullable: false, defaultTo: true},
+        show_header_name: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}
     },
@@ -50,7 +51,7 @@ module.exports = {
         comment_id: {type: 'string', maxlength: 50, nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         feature_image: {type: 'string', maxlength: 2000, nullable: true},
-        featured: {type: 'bool', nullable: false, defaultTo: false},
+        featured: {type: 'boolean', nullable: false, defaultTo: false},
         type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'post', validations: {isIn: [['post', 'page']]}},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'draft', validations: {isIn: [['published', 'draft', 'scheduled', 'sent']]}},
         // NOTE: unused at the moment and reserved for future features
@@ -102,7 +103,7 @@ module.exports = {
         frontmatter: {type: 'text', maxlength: 65535, nullable: true},
         feature_image_alt: {type: 'string', maxlength: 191, nullable: true, validations: {isLength: {max: 125}}},
         feature_image_caption: {type: 'text', maxlength: 65535, nullable: true},
-        email_only: {type: 'bool', nullable: false, defaultTo: false}
+        email_only: {type: 'boolean', nullable: false, defaultTo: false}
     },
     // NOTE: this is the staff table
     users: {
@@ -423,7 +424,7 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         name: {type: 'string', maxlength: 191, nullable: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
-        // @deprecated: use a status enum with isIn validation, not aan ctive boolean
+        // @deprecated: use a status enum with isIn validation, not an `active` boolean
         active: {type: 'boolean', nullable: false, defaultTo: true},
         welcome_page_url: {type: 'string', maxlength: 2000, nullable: true},
         visibility: {
@@ -434,16 +435,28 @@ module.exports = {
             validations: {isIn: [['public', 'none']]}
         },
         trial_days: {type: 'integer', unsigned: true, nullable: false, defaultTo: 0},
-        monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
-        yearly_price_id: {type: 'string', maxlength: 24, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},
-        type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'paid', validations: {isIn: [['paid', 'free']]}},
+        type: {
+            type: 'string',
+            maxlength: 50,
+            nullable: false,
+            defaultTo: 'paid',
+            validations: {
+                isIn: [['paid', 'free']]
+            }
+        },
+        currency: {type: 'string', maxlength: 50, nullable: true},
+        monthly_price: {type: 'integer', unsigned: true, nullable: true},
+        yearly_price: {type: 'integer', unsigned: true, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        updated_at: {type: 'dateTime', nullable: true}
+        updated_at: {type: 'dateTime', nullable: true},
+        // To be removed in future
+        monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
+        yearly_price_id: {type: 'string', maxlength: 24, nullable: true}
     },
     offers: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        // @deprecated: use a status enum with isIn validation, not aan ctive boolean
+        // @deprecated: use a status enum with isIn validation, not an `active` boolean
         active: {type: 'boolean', nullable: false, defaultTo: true},
         name: {type: 'string', maxlength: 191, nullable: false, unique: true},
         code: {type: 'string', maxlength: 191, nullable: false, unique: true},
@@ -516,7 +529,9 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         amount: {type: 'integer', nullable: false},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         source: {type: 'string', maxlength: 50, nullable: false},
         created_at: {type: 'dateTime', nullable: false}
     },
@@ -565,7 +580,9 @@ module.exports = {
         subscription_id: {type: 'string', maxlength: 24, nullable: true},
         from_plan: {type: 'string', maxlength: 255, nullable: true},
         to_plan: {type: 'string', maxlength: 255, nullable: true},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         source: {
             type: 'string', maxlength: 50, nullable: false, validations: {
                 isIn: [['stripe']]
@@ -600,13 +617,50 @@ module.exports = {
         updated_at: {type: 'dateTime', nullable: true},
         updated_by: {type: 'string', maxlength: 24, nullable: true}
     },
+    subscriptions: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        type: {
+            type: 'string', maxlength: 50, nullable: false, validations: {
+                isIn: [['free', 'comped', 'paid']]
+            }
+        },
+        status: {
+            type: 'string', maxlength: 50, nullable: false, validations: {
+                isIn: [['active', 'expired', 'canceled']]
+            }
+        },
+        member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
+        tier_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'products.id'},
+
+        // These are null if type !== 'paid'
+        cadence: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['month', 'year']]
+            }
+        },
+        currency: {type: 'string', maxlength: 50, nullable: true},
+        amount: {type: 'integer', nullable: true},
+
+        // e.g. 'stripe'
+        payment_provider: {type: 'string', maxlength: 50, nullable: true},
+        // e.g. Stripe Subscription Link
+        payment_subscription_url: {type: 'string', maxlength: 2000, nullable: true},
+        // e.g. Stripe Customer Link
+        payment_user_url: {type: 'string', maxlength: 2000, nullable: true},
+
+        offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
+
+        expires_at: {type: 'dateTime', nullable: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
+    },
     members_stripe_customers_subscriptions: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         customer_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'members_stripe_customers.customer_id', cascadeDelete: true},
         subscription_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: false, index: true, defaultTo: ''},
         status: {type: 'string', maxlength: 50, nullable: false},
-        cancel_at_period_end: {type: 'bool', nullable: false, defaultTo: false},
+        cancel_at_period_end: {type: 'boolean', nullable: false, defaultTo: false},
         cancellation_reason: {type: 'string', maxlength: 500, nullable: true},
         current_period_end: {type: 'dateTime', nullable: false},
         start_date: {type: 'dateTime', nullable: false},
@@ -619,12 +673,14 @@ module.exports = {
         offer_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'offers.id'},
         trial_start_at: {type: 'dateTime', nullable: true},
         trial_end_at: {type: 'dateTime', nullable: true},
-        /* Below fields are now redundant as we link prie_id to stripe_prices table */
+        /* Below fields are now redundant as we link stripe_price_id to stripe_prices table */
         plan_id: {type: 'string', maxlength: 255, nullable: false, unique: false},
         plan_nickname: {type: 'string', maxlength: 50, nullable: false},
         plan_interval: {type: 'string', maxlength: 50, nullable: false},
         plan_amount: {type: 'integer', nullable: false},
-        plan_currency: {type: 'string', maxLength: 3, nullable: false}
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        plan_currency: {type: 'string', maxlength: 191, nullable: false}
     },
     members_subscription_created_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -652,7 +708,7 @@ module.exports = {
     members_subscribe_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         member_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'members.id', cascadeDelete: true},
-        subscribed: {type: 'bool', nullable: false, defaultTo: true},
+        subscribed: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
         source: {
             type: 'string', maxlength: 50, nullable: true, validations: {
@@ -672,9 +728,11 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         stripe_price_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: false, references: 'stripe_products.stripe_product_id'},
-        active: {type: 'bool', nullable: false},
+        active: {type: 'boolean', nullable: false},
         nickname: {type: 'string', maxlength: 50, nullable: true},
-        currency: {type: 'string', maxLength: 3, nullable: false},
+        // @note: this is longer than originally intended due to a bug - https://github.com/TryGhost/Ghost/pull/15606
+        // so we should decide whether we should reduce it down in the future
+        currency: {type: 'string', maxlength: 191, nullable: false},
         amount: {type: 'integer', nullable: false},
         type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time']]}},
         interval: {type: 'string', maxlength: 50, nullable: true},
@@ -722,8 +780,8 @@ module.exports = {
         reply_to: {type: 'string', maxlength: 2000, nullable: true},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
-        track_opens: {type: 'bool', nullable: false, defaultTo: false},
-        track_clicks: {type: 'bool', nullable: false, defaultTo: false},
+        track_opens: {type: 'boolean', nullable: false, defaultTo: false},
+        track_clicks: {type: 'boolean', nullable: false, defaultTo: false},
         submitted_at: {type: 'dateTime', nullable: false},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         created_at: {type: 'dateTime', nullable: false},
@@ -850,5 +908,13 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         redirect_id: {type: 'string', maxlength: 24, nullable: false, references: 'redirects.id', cascadeDelete: true},
         created_at: {type: 'dateTime', nullable: false}
+    },
+    members_feedback: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        score: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
+        member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+        post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
     }
 };

package/core/server/data/schema/validator.js

@@ -63,7 +63,7 @@ function validateSchema(tableName, model, options) {
 
         // validate boolean columns
         if (Object.prototype.hasOwnProperty.call(schema[tableName][columnKey], 'type')
-            && schema[tableName][columnKey].type === 'bool') {
+            && schema[tableName][columnKey].type === 'boolean') {
             if (!(validator.isBoolean(strVal) || validator.isEmpty(strVal))) {
                 message = tpl(messages.valueMustBeBoolean, {
                     tableName: tableName,

package/core/server/models/base/bookshelf.js

@@ -1,8 +1,7 @@
 const _ = require('lodash');
 const bookshelf = require('bookshelf');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const plugins = require('@tryghost/bookshelf-plugins');
-const Promise = require('bluebird');
 
 const db = require('../../data/db');
 
@@ -84,13 +83,13 @@ ghostBookshelf.plugin('bookshelf-relations', {
                     return Promise.resolve();
                 }
 
-                return Promise.each(targets.models, function (target, index) {
+                return Promise.all(targets.models.map((target, index) => {
                     queryOptions.query.where[existing.relatedData.otherKey] = target.id;
 
                     return existing.updatePivot({
                         sort_order: index
                     }, _.extend({}, options, queryOptions));
-                });
+                }));
             },
             beforeRelationCreation: function onCreatingRelation(model, data) {
                 data.id = ObjectId().toHexString();

package/core/server/models/base/plugins/data-manipulation.js

@@ -78,7 +78,7 @@ module.exports = function (Bookshelf) {
             _.each(attrs, function each(value, key) {
                 const tableDef = schema.tables[self.tableName];
                 const columnDef = tableDef ? tableDef[key] : null;
-                if (columnDef && (columnDef.type === 'bool' || columnDef.type === 'boolean')) {
+                if (columnDef?.type === 'boolean') {
                     attrs[key] = value ? true : false;
                 }
             });

package/core/server/models/base/plugins/events.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('models:base:model-events');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 
 const schema = require('../../../data/schema');
 

package/core/server/models/base/utils.js

@@ -5,7 +5,7 @@
 const _ = require('lodash');
 
 const Promise = require('bluebird');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 
 /**

package/core/server/models/member-feedback.js

@@ -0,0 +1,22 @@
+const errors = require('@tryghost/errors');
+const ghostBookshelf = require('./base');
+
+const MemberFeedback = ghostBookshelf.Model.extend({
+    tableName: 'members_feedback',
+    
+    post() {
+        return this.belongsTo('Post', 'post_id', 'id');
+    },
+
+    member() {
+        return this.belongsTo('Member', 'member_id', 'id');
+    }
+}, {
+    async destroy() {
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberFeedback'});
+    }
+});
+
+module.exports = {
+    MemberFeedback: ghostBookshelf.model('MemberFeedback', MemberFeedback)
+};

package/core/server/models/newsletter.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const uuid = require('uuid');
 const urlUtils = require('../../shared/url-utils');
 
@@ -21,7 +21,8 @@ const Newsletter = ghostBookshelf.Model.extend({
             show_badge: true,
             show_header_icon: true,
             show_header_title: true,
-            show_header_name: true
+            show_header_name: true,
+            feedback_enabled: false
         };
     },
 

package/core/server/models/post.js

@@ -1354,6 +1354,30 @@ Post = ghostBookshelf.Model.extend({
                         .whereRaw('posts.id = redirects.post_id')
                         .as('count__clicks');
                 });
+            },
+            sentiment(modelOrCollection) {
+                modelOrCollection.query('columns', 'posts.*', (qb) => {
+                    qb.select(qb.client.raw('ROUND(AVG(score) * 100)'))
+                        .from('members_feedback')
+                        .whereRaw('posts.id = members_feedback.post_id')
+                        .as('count__sentiment');
+                });
+            },
+            negative_feedback(modelOrCollection) {
+                modelOrCollection.query('columns', 'posts.*', (qb) => {
+                    qb.count('*')
+                        .from('members_feedback')
+                        .whereRaw('posts.id = members_feedback.post_id AND members_feedback.score = 0')
+                        .as('count__positive_feedback');
+                });
+            },
+            positive_feedback(modelOrCollection) {
+                modelOrCollection.query('columns', 'posts.*', (qb) => {
+                    qb.sum('score')
+                        .from('members_feedback')
+                        .whereRaw('posts.id = members_feedback.post_id')
+                        .as('count__positive_feedback');
+                });
             }
         };
     }

package/core/server/models/settings.js

@@ -3,7 +3,7 @@ const _ = require('lodash');
 const uuid = require('uuid');
 const crypto = require('crypto');
 const keypair = require('keypair');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const ghostBookshelf = require('./base');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');

package/core/server/models/user.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
-const ObjectId = require('bson-objectid');
+const ObjectId = require('bson-objectid').default;
 const ghostBookshelf = require('./base');
 const baseUtils = require('./base/utils');
 const limitService = require('../services/limits');

package/core/server/services/audience-feedback/FeedbackRepository.js

@@ -0,0 +1,67 @@
+module.exports = class FeedbackRepository {
+    /** @type {object} */
+    #Member;
+
+    /** @type {object} */
+    #Post;
+
+    /** @type {object} */
+    #MemberFeedback;
+
+    /** @type {typeof Object} */
+    #Feedback;
+
+    /**
+     * @param {object} deps
+     * @param {object} deps.Member Bookshelf Model
+     * @param {object} deps.Post Bookshelf Model
+     * @param {object} deps.MemberFeedback Bookshelf Model
+     * @param {object} deps.Feedback Feedback object
+     */
+    constructor(deps) {
+        this.#Member = deps.Member;
+        this.#Post = deps.Post;
+        this.#MemberFeedback = deps.MemberFeedback;
+        this.#Feedback = deps.Feedback;
+    }
+
+    async add(feedback) {
+        await this.#MemberFeedback.add({
+            id: feedback.id.toHexString(),
+            member_id: feedback.memberId.toHexString(),
+            post_id: feedback.postId.toHexString(),
+            score: feedback.score
+        });
+    }
+
+    async edit(feedback) {
+        await this.#MemberFeedback.edit({
+            score: feedback.score
+        }, {
+            id: feedback.id.toHexString()
+        });
+    }
+
+    async get(postId, memberId) {
+        const model = await this.#MemberFeedback.findOne({member_id: memberId, post_id: postId}, {require: false});
+
+        if (!model) {
+            return;
+        }
+
+        return new this.#Feedback({
+            id: model.id,
+            memberId: model.get('member_id'),
+            postId: model.get('post_id'),
+            score: model.get('score')
+        });
+    }
+
+    async getMemberByUuid(uuid) {
+        return await this.#Member.findOne({uuid});
+    }
+
+    async getPostById(id) {
+        return await this.#Post.findOne({id});
+    }
+};

package/core/server/services/audience-feedback/index.js

@@ -0,0 +1,33 @@
+const urlUtils = require('../../../shared/url-utils');
+const FeedbackRepository = require('./FeedbackRepository');
+
+class AudienceFeedbackServiceWrapper {
+    async init() {
+        if (this.service) {
+            // Already done
+            return;
+        }
+
+        // Wire up all the dependencies
+        const models = require('../../models');
+
+        const {AudienceFeedbackService, AudienceFeedbackController, Feedback} = require('@tryghost/audience-feedback');
+
+        this.repository = new FeedbackRepository({
+            Member: models.Member,
+            MemberFeedback: models.MemberFeedback,
+            Feedback,
+            Post: models.Post
+        });
+
+        // Expose the service
+        this.service = new AudienceFeedbackService({
+            config: {
+                baseURL: new URL(urlUtils.urlFor('home', true))
+            }
+        });
+        this.controller = new AudienceFeedbackController({repository: this.repository});
+    }
+}
+
+module.exports = new AudienceFeedbackServiceWrapper();

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

@@ -11,6 +11,7 @@ const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
 const configService = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
+const labs = require('../../../shared/labs');
 
 const messages = {
     error: 'The email service received an error from mailgun and was unable to send.'
@@ -208,7 +209,7 @@ module.exports = {
 
     /**
      * @param {Email-like} emailData - The email to send, must be a POJO so emailModel.toJSON() before calling if needed
-     * @param {[EmailRecipient]} recipients - The recipients to send the email to with their associated data
+     * @param {EmailRecipient[]} recipients - The recipients to send the email to with their associated data
      * @param {string?} memberSegment - The member segment of the recipients
      * @returns {Promise<Object>} - {providerId: 'xxx'}
      */
@@ -234,6 +235,11 @@ module.exports = {
                 unsubscribe_url: postEmailSerializer.createUnsubscribeUrl(recipient.member_uuid, {newsletterUuid})
             };
 
+            if (labs.isSet('audienceFeedback')) {
+                // create unique urls for every recipient (for example, for feedback buttons)
+                emailData = postEmailSerializer.createUserLinks(emailData, recipient.member_uuid);
+            }
+
             // computed properties on recipients - TODO: better way of handling these
             recipient.member_first_name = (recipient.member_name || '').split(' ')[0];
 

package/core/server/services/mail/GhostMailer.js

@@ -7,6 +7,7 @@ const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
+const metrics = require('@tryghost/metrics');
 const messages = {
     title: 'Ghost at {domain}',
     checkEmailConfigInstructions: 'Please see {url} for instructions on configuring email.',
@@ -83,7 +84,8 @@ module.exports = class GhostMailer {
         const options = config.get('mail') && _.clone(config.get('mail').options) || {};
 
         this.state = {
-            usingDirect: transport === 'direct'
+            usingDirect: transport === 'direct',
+            usingMailgun: transport === 'mailgun'
         };
         this.transport = nodemailer(transport, options);
     }
@@ -121,10 +123,24 @@ module.exports = class GhostMailer {
     }
 
     async sendMail(message) {
+        const startTime = Date.now();
         try {
             const response = await this.transport.sendMail(message);
+            if (this.state.usingMailgun) {
+                metrics.metric('mailgun-send-transactional-mail', {
+                    value: Date.now() - startTime,
+                    statusCode: 200
+                });
+            }
+
             return response;
         } catch (err) {
+            if (this.state.usingMailgun) {
+                metrics.metric('mailgun-send-transactional-mail', {
+                    value: Date.now() - startTime,
+                    statusCode: err.status
+                });
+            }
             throw createMailError({
                 message: tpl(messages.reason, {reason: err.message || err}),
                 err

package/core/server/services/mega/feedback-buttons.js

@@ -0,0 +1,69 @@
+const {Color} = require('@tryghost/color-utils');
+const audienceFeedback = require('../audience-feedback');
+
+const templateStrings = {
+    like: '%{feedback_button_like}%',
+    dislike: '%{feedback_button_dislike}%'
+};
+
+const generateLinks = (postId, uuid, html) => {
+    const positiveLink = audienceFeedback.service.buildLink(
+        uuid,
+        postId,
+        1
+    );
+    const negativeLink = audienceFeedback.service.buildLink(
+        uuid,
+        postId,
+        0
+    );
+
+    html = html.replace(templateStrings.like, positiveLink.href);
+    html = html.replace(templateStrings.dislike, negativeLink.href);
+
+    return html;
+};
+
+const getTemplate = (accentColor) => {
+    const likeButtonHtml = getButtonHtml(templateStrings.like, 'More like this', accentColor);
+    const dislikeButtonHtml = getButtonHtml(templateStrings.dislike, 'Less like this', accentColor);
+
+    return (`
+        <tr>
+            <td dir="ltr" width="100%" style="background-color: #ffffff; text-align: center; padding: 40px 4px; border-bottom: 1px solid #e5eff5" align="center">
+                <h3 style="text-align: center; margin-bottom: 22px; font-size: 17px; letter-spacing: -0.2px; margin-top: 0 !important;">What did you think of this post?</h3>
+                <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="margin: auto; width: auto !important;">
+                    <tr>
+                        ${likeButtonHtml}
+                        ${dislikeButtonHtml}
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    `);
+};
+
+function getButtonHtml(href, buttonText, accentColor) {
+    const color = new Color(accentColor);
+    const bgColor = `${accentColor}10`;
+    const textColor = color.darken(0.6).hex();
+
+    return (`
+        <td dir="ltr" valign="top" align="center" style="font-family: inherit; font-size: 14px; text-align: center;" nowrap>
+            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" style="width: auto !important;">
+                <tr>
+                    <td style="padding: 0 6px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
+                        <a href=${href} style="background-color: ${bgColor}; color: ${textColor}; border-radius: 22px; font-family: inherit; padding: 12px 20px; border: none; font-size: 14px; font-weight: bold; line-height: 100%; text-decoration: none; display: block;">
+                            ${buttonText}
+                        </a>
+                    </td>
+                </tr>
+            </table>
+        </td>
+    `);
+}
+
+module.exports = {
+    generateLinks,
+    getTemplate
+};

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

@@ -3,7 +3,7 @@ const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('mega');
 const tpl = require('@tryghost/tpl');
 const moment = require('moment');
-const ObjectID = require('bson-objectid');
+const ObjectID = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
 const settingsCache = require('../../../shared/settings-cache');