ghost 5.4.1 → 5.7.0

package/core/server/services/jobs/job-service.js

@@ -5,6 +5,7 @@
 
 const JobManager = require('@tryghost/job-manager');
 const logging = require('@tryghost/logging');
+const models = require('../../models');
 const sentry = require('../../../shared/sentry');
 
 const errorHandler = (error, workerMeta) => {
@@ -17,6 +18,28 @@ const workerMessageHandler = ({name, message}) => {
     logging.info(`Worker for job ${name} sent a message: ${message}`);
 };
 
-const jobManager = new JobManager({errorHandler, workerMessageHandler});
+const initTestMode = () => {
+    // Output job queue length every 5 seconds
+    setInterval(() => {
+        logging.warn(`${jobManager.queue.length()} jobs in the queue. Idle: ${jobManager.queue.idle()}`);
+
+        const runningScheduledjobs = Object.keys(jobManager.bree.workers);
+        if (Object.keys(jobManager.bree.workers).length) {
+            logging.warn(`${Object.keys(jobManager.bree.workers).length} jobs running: ${runningScheduledjobs}`);
+        }
+
+        const scheduledJobs = Object.keys(jobManager.bree.intervals);
+        if (Object.keys(jobManager.bree.intervals).length) {
+            logging.warn(`${Object.keys(jobManager.bree.intervals).length} scheduled jobs: ${scheduledJobs}`);
+        }
+
+        if (runningScheduledjobs.length === 0 && scheduledJobs.length === 0) {
+            logging.warn('No scheduled or running jobs');
+        }
+    }, 5000);
+};
+
+const jobManager = new JobManager({errorHandler, workerMessageHandler, JobModel: models.Job});
 
 module.exports = jobManager;
+module.exports.initTestMode = initTestMode;

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

@@ -95,6 +95,7 @@ module.exports = class GhostMailer {
      * @param {string} message.html - email content
      * @param {string} message.to - email recipient address
      * @param {string} [message.from] - sender email address
+     * @param {string} [message.text] - text version of this message
      * @param {boolean} [message.forceTextContent] - maps to generateTextFromHTML nodemailer option
      * which is: "if set to true uses HTML to generate plain text body part from the HTML if the text is not defined"
      * (ref: https://github.com/nodemailer/nodemailer/tree/da2f1d278f91b4262e940c0b37638e7027184b1d#e-mail-message-fields)

package/core/server/services/mega/email-preview.js

@@ -36,7 +36,11 @@ class EmailPreview {
             );
         });
 
-        return emailContent;
+        return {
+            subject: emailContent.subject,
+            html: emailContent.html,
+            plaintext: emailContent.plaintext
+        };
     }
 }
 

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

@@ -69,6 +69,7 @@ const getEmailData = async (postModel, options) => {
     }
 
     return {
+        post: postModel.toJSON(), // for content paywalling
         subject,
         html,
         plaintext,
@@ -87,9 +88,6 @@ const sendTestEmail = async (postModel, toEmails, memberSegment) => {
     let emailData = await getEmailData(postModel);
     emailData.subject = `[Test] ${emailData.subject}`;
 
-    if (memberSegment) {
-        emailData = postEmailSerializer.renderEmailForSegment(emailData, memberSegment);
-    }
     // fetch any matching members so that replacements use expected values
     const recipients = await Promise.all(toEmails.map(async (email) => {
         const member = await membersService.api.members.get({email});
@@ -109,7 +107,7 @@ const sendTestEmail = async (postModel, toEmails, memberSegment) => {
     // enable tracking for previews to match real-world behaviour
     emailData.track_opens = !!settingsCache.get('email_track_opens');
 
-    const response = await bulkEmailService.send(emailData, recipients);
+    const response = await bulkEmailService.send(emailData, recipients, memberSegment);
 
     if (response instanceof bulkEmailService.FailedBatch) {
         return Promise.reject(response.error);

package/core/server/services/mega/post-email-serializer.js

@@ -2,15 +2,18 @@ const _ = require('lodash');
 const template = require('./template');
 const settingsCache = require('../../../shared/settings-cache');
 const urlUtils = require('../../../shared/url-utils');
+const labs = require('../../../shared/labs');
 const moment = require('moment-timezone');
 const api = require('../../api').endpoints;
 const apiShared = require('../../api').shared;
 const {URL} = require('url');
 const mobiledocLib = require('../../lib/mobiledoc');
 const htmlToPlaintext = require('../../../shared/html-to-plaintext');
+const membersService = require('../members');
 const {isUnsplashImage, isLocalContentImage} = require('@tryghost/kg-default-cards/lib/utils');
 const {textColorForBackgroundColor, darkenToContrastThreshold} = require('@tryghost/color-utils');
 const logging = require('@tryghost/logging');
+const urlService = require('../../services/url');
 
 const ALLOWED_REPLACEMENTS = ['first_name'];
 
@@ -74,6 +77,27 @@ const createUnsubscribeUrl = (uuid, newsletterUuid) => {
     return unsubscribeUrl.href;
 };
 
+/**
+ * createPostSignupUrl
+ *
+ * Takes a post object. Returns the url that should be used to signup from newsletter
+ *
+ * @param {Object} post post object
+ */
+const createPostSignupUrl = (post) => {
+    let url = urlService.getUrlByResourceId(post.id, {absolute: true});
+
+    // For email-only posts, use site url as base
+    if (post.status !== 'published' && url.match(/\/404\//)) {
+        url = urlUtils.getSiteUrl();
+    }
+
+    const signupUrl = new URL(url);
+    signupUrl.hash = `/portal/signup`;
+
+    return signupUrl.href;
+};
+
 // NOTE: serialization is needed to make sure we do post transformations such as image URL transformation from relative to absolute
 const serializePostModel = async (model) => {
     // fetch mobiledoc rather than html and plaintext so we can render email-specific contents
@@ -297,18 +321,87 @@ const serialize = async (postModel, newsletter, options = {isBrowserPreview: fal
         html: formatHtmlForEmail(htmlTemplate),
         plaintext: post.plaintext
     });
-
-    return {
+    const data = {
         subject: post.email_subject || post.title,
         html,
         plaintext
     };
+    if (labs.isSet('newsletterPaywall')) {
+        data.post = post;
+    }
+    return data;
 };
 
+/**
+ * renderPaywallCTA
+ *
+ * outputs html for rendering paywall CTA in newsletter
+ *
+ * @param {Object} post Post Object
+ */
+
+function renderPaywallCTA(post) {
+    const accentColor = settingsCache.get('accent_color');
+    const siteTitle = settingsCache.get('title') || 'Ghost';
+    const signupUrl = createPostSignupUrl(post);
+
+    return `<div class="align-center" style="text-align: center;">
+    <hr
+        style="position: relative; display: block; width: 100%; margin: 3em 0; padding: 0; height: 1px; border: 0; border-top: 1px solid #e5eff5;">
+    <h2
+        style="margin-top: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 1.11em; font-weight: 700; text-rendering: optimizeLegibility; margin: 1.5em 0 0.5em 0; font-size: 26px;">
+        Subscribe to <span style="white-space: nowrap; font-size: 26px !important;">continue reading.</span></h2>
+    <p style="margin: 0 auto 1.5em auto; line-height: 1.6em; max-width: 440px;">Become a paid member of ${siteTitle} to get access to all 
+    <span style="white-space: nowrap;">subscriber-only content.</span></p>
+    <div class="btn btn-accent" style="box-sizing: border-box; width: 100%; display: table;">
+        <table border="0" cellspacing="0" cellpadding="0" align="center"
+            style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+            <tbody>
+                <tr>
+                    <td align="center"
+                        style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; vertical-align: top; text-align: center; border-radius: 5px;"
+                        valign="top" bgcolor="${accentColor}">
+                        <a href="${signupUrl}"
+                            style="overflow-wrap: anywhere; border: solid 1px #3498db; border-radius: 5px; box-sizing: border-box; cursor: pointer; display: inline-block; font-size: 14px; font-weight: bold; margin: 0; padding: 12px 25px; text-decoration: none; background-color: ${accentColor}; border-color: ${accentColor}; color: #FFFFFF;"
+                            target="_blank">Subscribe
+                        </a>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+    <p style="margin: 0 0 1.5em 0; line-height: 1.6em;"></p>
+</div>`;
+}
+
 function renderEmailForSegment(email, memberSegment) {
     const cheerio = require('cheerio');
 
     const result = {...email};
+
+    /** Checks and hides content for newsletter behind paywall card
+     *  based on member's status and post access
+     *  Adds CTA in case content is hidden.
+    */
+    if (labs.isSet('newsletterPaywall')) {
+        const paywallIndex = (result.html || '').indexOf('<!--members-only-->');
+        if (paywallIndex !== -1 && memberSegment && result.post) {
+            let statusFilter = memberSegment === 'status:free' ? {status: 'free'} : {status: 'paid'};
+            const postVisiblity = result.post.visibility;
+
+            // For newsletter paywall, specific tiers visibility is considered on par to paid tiers
+            result.post.visibility = postVisiblity === 'tiers' ? 'paid' : postVisiblity;
+
+            const memberHasAccess = membersService.contentGating.checkPostAccess(result.post, statusFilter);
+
+            if (!memberHasAccess) {
+                const postContentEndIdx = result.html.search(/[\s\n\r]+?<!-- POST CONTENT END -->/);
+                result.html = result.html.slice(0, paywallIndex) + renderPaywallCTA(result.post) + result.html.slice(postContentEndIdx);
+                result.plaintext = htmlToPlaintext.excerpt(result.html);
+            }
+        }
+    }
+
     const $ = cheerio.load(result.html);
 
     $('[data-gh-segment]').get().forEach((node) => {
@@ -322,6 +415,7 @@ function renderEmailForSegment(email, memberSegment) {
 
     result.html = formatHtmlForEmail($.html());
     result.plaintext = htmlToPlaintext.email(result.html);
+    delete result.post;
 
     return result;
 }
@@ -329,6 +423,7 @@ function renderEmailForSegment(email, memberSegment) {
 module.exports = {
     serialize,
     createUnsubscribeUrl,
+    createPostSignupUrl,
     renderEmailForSegment,
     parseReplacements,
     // Export for tests

package/core/server/services/mega/segment-parser.js

@@ -1,11 +1,20 @@
+const labs = require('../../../shared/labs');
+
 const getSegmentsFromHtml = (html) => {
     const cheerio = require('cheerio');
     const $ = cheerio.load(html);
 
-    const allSegments = $('[data-gh-segment]')
+    let allSegments = $('[data-gh-segment]')
         .get()
         .map(el => el.attribs['data-gh-segment']);
 
+    /**
+     * Always add free and paid segments if email has paywall card
+     */
+    if (labs.isSet('newsletterPaywall') && html.indexOf('<!--members-only-->') !== -1) {
+        allSegments = allSegments.concat(['status:free', 'status:-free']);
+    }
+
     // only return unique elements
     return [...new Set(allSegments)];
 };

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

@@ -189,7 +189,8 @@ function createApiInstance(config) {
             StripeProduct: models.StripeProduct,
             StripePrice: models.StripePrice,
             Product: models.Product,
-            Settings: models.Settings
+            Settings: models.Settings,
+            Comment: models.Comment
         },
         stripeAPIService: stripeService.api,
         offersAPI: offersService.api,

package/core/server/services/members/service.js

@@ -148,10 +148,15 @@ module.exports = {
             }
         })();
 
-        try {
-            await stripeService.migrations.execute();
-        } catch (err) {
-            logging.error(err);
+        const membersMigrationJobName = 'members-migrations';
+        if (!(await jobsService.hasExecutedSuccessfully(membersMigrationJobName))) {
+            jobsService.addOneOffJob({
+                name: membersMigrationJobName,
+                offloaded: false,
+                job: stripeService.migrations.execute.bind(stripeService.migrations)
+            });
+
+            await jobsService.awaitCompletion(membersMigrationJobName);
         }
     },
     contentGating: require('./content-gating'),

package/core/server/services/public-config/config.js

@@ -18,7 +18,8 @@ module.exports = function getConfigProperties() {
         mailgunIsConfigured: !!(config.get('bulkEmail') && config.get('bulkEmail').mailgun),
         emailAnalytics: config.get('emailAnalytics'),
         hostSettings: config.get('hostSettings'),
-        tenor: config.get('tenor')
+        tenor: config.get('tenor'),
+        editor: config.get('editor')
     };
 
     const billingUrl = config.get('hostSettings:billing:enabled') ? config.get('hostSettings:billing:url') : '';

package/core/server/services/stripe/service.js

@@ -25,7 +25,15 @@ const debouncedConfigureApi = _.debounce(() => {
 
 module.exports = new StripeService({
     membersService,
-    models: _.pick(models, ['Product', 'StripePrice', 'StripeCustomerSubscription', 'StripeProduct', 'MemberStripeCustomer', 'Offer', 'Settings']),
+    models: _.pick(models, [
+        'Product',
+        'StripePrice',
+        'StripeCustomerSubscription',
+        'StripeProduct',
+        'MemberStripeCustomer',
+        'Offer',
+        'Settings'
+    ]),
     StripeWebhook: {
         async get() {
             return {

package/core/server/web/admin/views/default-prod.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%2F%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.4%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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%2F%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.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-4a6661c574707ceca220aa2e76558995.css">
-                <link rel="stylesheet" href="assets/ghost.min-5211776b9497f36fac8c9e5f2584cbcc.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-8f5c061e0892b93adecc2b9e37ad2f3a.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-be0129c9c6897c9f10425e2402881d77.js"></script>
-                <script src="assets/ghost.min-36b64813b14c45075770658269d4b478.js"></script>
+                <script src="assets/vendor.min-3dd40d3052381526f38fd290d13baa47.js"></script>
+                <script src="assets/ghost.min-ff9ba089fd81cb40831f4b62e63a2ca9.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%2F%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.4%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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%2F%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.7%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-4a6661c574707ceca220aa2e76558995.css">
-                <link rel="stylesheet" href="assets/ghost.min-5211776b9497f36fac8c9e5f2584cbcc.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-8f5c061e0892b93adecc2b9e37ad2f3a.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-be0129c9c6897c9f10425e2402881d77.js"></script>
-                <script src="assets/ghost.min-36b64813b14c45075770658269d4b478.js"></script>
+                <script src="assets/vendor.min-3dd40d3052381526f38fd290d13baa47.js"></script>
+                <script src="assets/ghost.min-ff9ba089fd81cb40831f4b62e63a2ca9.js"></script>
             
 </body>
 </html>

package/core/server/web/api/testmode/jobs/graceful-job.js

@@ -37,7 +37,7 @@ const internalContext = {context: {internal: true}};
 
     if (shutdown) {
         postParentPortMessage(`Job shutting down gracefully`);
-        process.exit(0);
+        parentPort.postMessage('done');
     }
 
     postParentPortMessage(`Fetching posts`);
@@ -46,5 +46,5 @@ const internalContext = {context: {internal: true}};
     postParentPortMessage(`Found ${posts.data.length} posts. First one: ${posts.data[0].toJSON().slug}`);
     postParentPortMessage('Graceful job has completed!');
 
-    process.exit(0);
+    parentPort.postMessage('done');
 })();

package/core/server/web/api/testmode/routes.js

@@ -44,6 +44,20 @@ module.exports = function testRoutes() {
         res.sendStatus(202);
     });
 
+    router.get('/oneoff/:name', (req, res) => {
+        logging.info('Create Slow Job with timeout of', req.params.name);
+
+        const options = {};
+
+        options.solo = true;
+        options.name = req.params.name;
+        options.job = path.resolve(__dirname, 'jobs', `${options.name}.js`);
+
+        jobsService.addOneOffJob(options);
+
+        res.sendStatus(202);
+    });
+
     router.get('/schedule/:schedule/:name*?', (req, res) => {
         if (!req.params.schedule) {
             return res.sendStatus(400, 'schedule parameter cannot be mepty');

package/core/server/web/comments/routes.js

@@ -13,16 +13,18 @@ module.exports = function apiRoutes() {
     // Global handling for member session, ensures a member is logged in to the frontend
     router.use(membersService.middleware.loadMemberSession);
 
-    router.post('/counts', http(api.commentsComments.counts));
+    router.post('/counts', http(api.commentsMembers.counts));
 
-    router.get('/', http(api.commentsComments.browse));
-    router.get('/:id', http(api.commentsComments.read));
-    router.post('/', http(api.commentsComments.add));
-    router.put('/:id', http(api.commentsComments.edit));
-    router.delete('/:id', http(api.commentsComments.destroy));
+    router.get('/', http(api.commentsMembers.browse));
+    router.get('/:id', http(api.commentsMembers.read));
+    router.post('/', http(api.commentsMembers.add));
+    router.put('/:id', http(api.commentsMembers.edit));
+    router.delete('/:id', http(api.commentsMembers.destroy));
 
-    router.post('/:id/like', http(api.commentsComments.like));
-    router.delete('/:id/like', http(api.commentsComments.unlike));
+    router.post('/:id/like', http(api.commentsMembers.like));
+    router.delete('/:id/like', http(api.commentsMembers.unlike));
+
+    router.post('/:id/report', http(api.commentsMembers.report));
 
     return router;
 };

package/core/shared/config/defaults.json

@@ -133,12 +133,21 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~2.3.0/umd/portal.min.js",
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/portal@~{version}/umd/portal.min.js",
         "version": "2.3"
     },
     "sodoSearch": {
-        "url": "https://unpkg.com/@tryghost/sodo-search@~1.0.0/umd/sodo-search.min.js",
-        "version": "1.0.0"
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/sodo-search.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/main.css",
+        "version": "1.1"
+    },
+    "comments": {
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/comments-ui@~{version}/umd/comments-ui.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/comments-ui@~{version}/umd/main.css",
+        "version": "0.2"
+    },
+    "editor": {
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/koenig-react/dist/umd/koenig-react.min.js"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,
@@ -152,9 +161,5 @@
     },
     "gravatar": {
         "url": "https://www.gravatar.com/avatar/{hash}?s={size}&r={rating}&d={_default}"
-    },
-    "comments": {
-        "url": "https://unpkg.com/@tryghost/comments-ui@~0.1.0/umd/comments-ui.min.js",
-        "version": "0.1.0"
     }
 }

package/core/shared/config/env/config.testing.json

@@ -56,7 +56,8 @@
         "urlCache": "test/utils/fixtures/urls"
     },
     "sodoSearch": {
-        "url": "https://unpkg.com/@tryghost/sodo-search@~0.1.0/umd/sodo-search.min.js",
-        "version": "0.1.0"
+        "url": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/sodo-search.min.js",
+        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/main.css",
+        "version": "1.0"
     }
 }

package/core/shared/labs.js

@@ -14,7 +14,9 @@ const messages = {
 };
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
-const GA_FEATURES = [];
+const GA_FEATURES = [
+    'newsletterPaywall'
+];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
@@ -25,7 +27,8 @@ const BETA_FEATURES = [
 const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
-    'comments'
+    'comments',
+    'explore'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];