ghost 5.4.1 → 5.5.0

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

@@ -1,3 +1,16 @@
+const tpl = require('@tryghost/tpl');
+const errors = require('@tryghost/errors');
+const {MemberCommentEvent} = require('@tryghost/member-events');
+const DomainEvents = require('@tryghost/domain-events');
+
+const messages = {
+    commentNotFound: 'Comment could not be found',
+    memberNotFound: 'Unable to find member',
+    likeNotFound: 'Unable to find like',
+    alreadyLiked: 'This comment was liked already',
+    replyToReply: 'Can not reply to a reply'
+};
+
 class CommentsService {
     constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils}) {
         this.config = config;
@@ -13,11 +26,190 @@ class CommentsService {
     }
 
     async sendNewCommentNotifications(comment) {
-        this.emails.notifyPostAuthors(comment);
+        await this.emails.notifyPostAuthors(comment);
 
         if (comment.get('parent_id')) {
-            this.emails.notifyParentCommentAuthor(comment);
+            await this.emails.notifyParentCommentAuthor(comment);
+        }
+    }
+
+    async reportComment(commentId, reporter) {
+        const comment = await this.models.Comment.findOne({id: commentId}, {require: true});
+
+        // Check if this reporter already reported this comment (then don't send an email)?
+        const existing = await this.models.CommentReport.findOne({
+            comment_id: comment.id,
+            member_id: reporter.id
+        });
+
+        if (existing) {
+            // Ignore silently for now
+            return;
+        }
+
+        // Save report model
+        await this.models.CommentReport.add({
+            comment_id: comment.id,
+            member_id: reporter.id
+        });
+
+        await this.emails.notifiyReport(comment, reporter);
+    }
+
+    /**
+     * @param {string} id - The ID of the Comment to get
+     * @param {any} options
+     */
+    async getCommentByID(id, options) {
+        const model = await this.models.Comment.findOne({id}, options);
+
+        if (!model) {
+            throw new errors.NotFoundError({
+                messages: tpl(messages.commentNotFound)
+            });
+        }
+
+        return model;
+    }
+
+    /**
+     * @param {string} post - The ID of the Post to comment on
+     * @param {string} member - The ID of the Member to comment as
+     * @param {string} comment - The HTML content of the Comment
+     * @param {any} options
+     */
+    async commentOnPost(post, member, comment, options) {
+        await this.models.Member.findOne({
+            id: member
+        }, {
+            require: true,
+            ...options
+        });
+
+        const model = await this.models.Comment.add({
+            post_id: post,
+            member_id: member,
+            parent_id: null,
+            html: comment,
+            status: 'published'
+        }, options);
+
+        if (!options.context.internal) {
+            await this.sendNewCommentNotifications(model);
+        }
+
+        DomainEvents.dispatch(MemberCommentEvent.create({
+            memberId: member,
+            postId: post,
+            commentId: model.id
+        }));
+
+        return model;
+    }
+
+    /**
+     * @param {string} parent - The ID of the Comment to reply to
+     * @param {string} member - The ID of the Member to comment as
+     * @param {string} comment - The HTML content of the Comment
+     * @param {any} options
+     */
+    async replyToComment(parent, member, comment, options) {
+        await this.models.Member.findOne({
+            id: member
+        }, {
+            require: true,
+            ...options
+        });
+
+        const parentComment = await this.getCommentByID(parent, options);
+        if (!parentComment) {
+            throw new errors.BadRequestError({
+                message: tpl(messages.commentNotFound)
+            });
+        }
+
+        if (parentComment.get('parent_id') !== null) {
+            throw new errors.BadRequestError({
+                message: tpl(messages.replyToReply)
+            });
+        }
+
+        const model = await this.models.Comment.add({
+            post_id: parentComment.get('post_id'),
+            member_id: member,
+            parent_id: parentComment.id,
+            html: comment,
+            status: 'published'
+        }, options);
+
+        if (!options.context.internal) {
+            await this.sendNewCommentNotifications(model);
         }
+
+        DomainEvents.dispatch(MemberCommentEvent.create({
+            memberId: member,
+            postId: parentComment.get('post_id'),
+            commentId: model.id
+        }));
+
+        return model;
+    }
+
+    /**
+     * @param {string} id - The ID of the Comment to delete
+     * @param {string} member - The ID of the Member to delete as
+     * @param {any} options
+     */
+    async deleteComment(id, member, options) {
+        const existingComment = await this.getCommentByID(id, options);
+
+        if (existingComment.get('member_id') !== member) {
+            throw new errors.NoPermissionError({
+                // todo fix message
+                message: tpl(messages.memberNotFound)
+            });
+        }
+
+        const model = await this.models.Comment.edit({
+            status: 'deleted'
+        }, {
+            id,
+            require: true,
+            ...options
+        });
+
+        return model;
+    }
+
+    /**
+     * @param {string} id - The ID of the Comment to edit
+     * @param {string} member - The ID of the Member to edit as
+     * @param {string} comment - The new HTML content of the Comment
+     * @param {any} options
+     */
+    async editCommentContent(id, member, comment, options) {
+        const existingComment = await this.getCommentByID(id, options);
+
+        if (!comment) {
+            return existingComment;
+        }
+
+        if (existingComment.get('member_id') !== member) {
+            throw new errors.NoPermissionError({
+                // todo fix message
+                message: tpl(messages.memberNotFound)
+            });
+        }
+
+        const model = await this.models.Comment.edit({
+            html: comment
+        }, {
+            id,
+            require: true,
+            ...options
+        });
+
+        return model;
     }
 }
 

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/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/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.5%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-a89d10b3b58c1a5ebaca68cef93a404c.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-cf3af99dca0c71937669305afb3686a1.js"></script>
+                <script src="assets/ghost.min-c75f224decd20f9538179d7564cd2ab4.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.5%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-a89d10b3b58c1a5ebaca68cef93a404c.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-cf3af99dca0c71937669305afb3686a1.js"></script>
+                <script src="assets/ghost.min-c75f224decd20f9538179d7564cd2ab4.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

@@ -24,5 +24,7 @@ module.exports = function apiRoutes() {
     router.post('/:id/like', http(api.commentsComments.like));
     router.delete('/:id/like', http(api.commentsComments.unlike));
 
+    router.post('/:id/report', http(api.commentsComments.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": ""
     },
     "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"
     }
 }