npm - ghost - Versions diffs - 5.3.1 → 5.5.0 - Mend

ghost 5.3.1 → 5.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (107) hide show

package/core/server/services/comments/email-templates/report.hbs ADDED Viewed

@@ -0,0 +1,199 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>🚩 A comment has been reported on {{postTitle}}</title>
+    <style>
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+      table[class=body] h1 {
+        font-size: 28px !important;
+        margin-bottom: 10px !important;
+      }
+      table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+        font-size: 16px !important;
+      }
+      table[class=body] .wrapper,
+            table[class=body] .article {
+        padding: 10px !important;
+      }
+      table[class=body] .content {
+        padding: 0 !important;
+      }
+      table[class=body] .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+      table[class=body] .main {
+        border-left-width: 0 !important;
+        border-radius: 0 !important;
+        border-right-width: 0 !important;
+      }
+      table[class=body] .btn table {
+        width: 100% !important;
+      }
+      table[class=body] .btn a {
+        width: 100% !important;
+      }
+      table[class=body] .img-responsive {
+        height: auto !important;
+        max-width: 100% !important;
+        width: auto !important;
+      }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 11px !important;
+      }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+        line-height: 100%;
+      }
+      .recipient-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+    }
+    hr {
+      border-width: 0;
+      height: 0;
+      margin-top: 34px;
+      margin-bottom: 34px;
+      border-bottom-width: 1px;
+      border-bottom-color: #EEF5F8;
+    }
+    a {
+      color: #3A464C;
+    }
+    </style>
+  </head>
+  <body style="background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+      <tr>
+        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>
+        <td class="container" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; display: block; Margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;">
+          <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;">
+            <!-- START CENTERED CONTAINER -->
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">{{reporterName}} ({{reporterEmail}}) reported a comment on your post</span>
+            <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; box-sizing: border-box;">
+                  <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    <tr>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 20px; color: #15212A; font-weight: bold; line-height: 25px; margin: 0; margin-bottom: 15px;">Hey there,</p>
+                          <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 32px;">{{reporter}} has reported the comment below on <a href="{{postUrl}}" target="_blank">{{postTitle}}</a>. This comment will remain visible until you choose to remove it, which can be done directly on the post.</p>
+                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box; background: #F9F9FA; border-radius: 7px;">
+                        <tbody>
+                            <tr>
+                                <td align="left" style="padding: 16px;">
+                                  <table border="0" cellpadding="0" cellspacing="0">
+                                        <tr>
+                                            <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; padding-right: 8px;">
+                                              <table border="0" cellpadding="0" cellspacing="0" width="44" height="44" style="width: 44px; height: 44px; background-color: #15171A; border-radius: 999px;">
+                                                    <tr>
+                                                        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; color: #FFFFFF; text-align: center; font-weight: 500; height: 44px; width: 44px;">{{memberInitials}}</td>
+                                                    </tr>
+                                                </table>
+                                            </td>
+                                            <td style="padding-right: 8px;">
+                                                <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; padding-right: 8px; padding: 0; margin: 0; color: #15171A; font-weight: 600;">{{memberName}}</p>
+                                                <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 13px; padding-right: 8px; padding: 0; margin: 0; color: #95A1AD;">{{#if memberBio}}{{memberBio}} &#8226; {{/if}}{{commentDate}}</p>
+                                            </td>
+                                        </tr>
+                                    </table>
+                                </td>
+                            </tr>
+                            <tr>
+                                <td align="left" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; padding-top: 0; padding-right: 16px; padding-bottom: 16px; padding-left: 16px; color: #15171A;">
+                                    {{{commentHtml}}}
+                                </td>
+                            </tr>
+                        </tbody>
+                        </table>
+                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                          <tbody>
+                            <tr>
+                              <td align="left" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; padding-top: 32px; padding-bottom: 12px;">
+                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
+                                  <tbody>
+                                    <tr>
+                                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top; background-color: {{accentColor}}; border-radius: 5px; text-align: center;"> <a href="{{postUrl}}#ghost-comments-root" target="_blank" style="display: inline-block; color: #ffffff; background-color: {{accentColor}}; border: solid 1px {{accentColor}}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: {{accentColor}};">View comment</a> </td>
+                                    </tr>
+                                  </tbody>
+                                </table>
+                              </td>
+                            </tr>
+                          </tbody>
+                        </table>
+                        <hr/>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
+                        <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">{{postUrl}}#ghost-comments-root</p>
+                      </td>
+                    </tr>
+                    <!-- START FOOTER -->
+                    <tr>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 80px;">
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a></p>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-top: 2px">
+                          <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 18px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0; margin-bottom: 2px;"><a class="small" href="{{staffUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">Manage your email preferences</a></p>
+                      </td>
+                    </tr>
+                    <!-- END FOOTER -->
+                  </table>
+                </td>
+              </tr>
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+          <!-- END CENTERED CONTAINER -->
+          </div>
+        </td>
+        <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>

package/core/server/services/comments/email-templates/report.txt.js ADDED Viewed

@@ -0,0 +1,16 @@
+module.exports = function (data) {
+    // Be careful when you indent the email, because whitespaces are visible in emails!
+    return `Hey there,
+${data.reporter} has reported the comment below on ${data.postTitle}. This comment will remain visible until you choose to remove it, which can be done directly on the post.
+${data.memberName} (${data.memberEmail}):
+${data.commentText}
+${data.postUrl}#ghost-comments-root
+---
+Sent to ${data.toEmail} from ${data.siteDomain}.
+You can manage your notification preferences at ${data.staffUrl}.`;
+};

package/core/server/services/comments/emails.js CHANGED Viewed

@@ -1,6 +1,7 @@
 const {promises: fs} = require('fs');
 const path = require('path');
 const moment = require('moment');
+const htmlToPlaintext = require('../../../shared/html-to-plaintext');
 class CommentsServiceEmails {
     constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils}) {
@@ -48,7 +49,7 @@ class CommentsServiceEmails {
             const {html, text} = await this.renderEmailTemplate('new-comment', templateData);
-            this.sendMail({
+            await this.sendMail({
                 to,
                 subject,
                 html,
@@ -65,6 +66,11 @@ class CommentsServiceEmails {
             return;
         }
+        // Don't send a notification if you reply to your own comment
+        if (parentMember.id === reply.get('member_id')) {
+            return;
+        }
         const to = parentMember.get('email');
         const subject = '💬 You have a new reply on one of your comments';
@@ -100,6 +106,56 @@ class CommentsServiceEmails {
         });
     }
+    /**
+     * Send an email to notify the owner of the site that a comment has been reported by a member
+     * @param {*} comment The comment model that has been reported
+     * @param {*} reporter The member object who reported this comment
+     */
+    async notifiyReport(comment, reporter) {
+        const post = await this.models.Post.findOne({id: comment.get('post_id')}, {withRelated: ['authors']});
+        const member = await this.models.Member.findOne({id: comment.get('member_id')});
+        const owner = await this.models.User.getOwnerUser();
+        // For now we only send the report to the owner
+        const to = owner.get('email');
+        const subject = '🚩 A comment has been reported on your post';
+        const memberName = member.get('name') || 'Anonymous';
+        const templateData = {
+            siteTitle: this.settingsCache.get('title'),
+            siteUrl: this.urlUtils.getSiteUrl(),
+            siteDomain: this.siteDomain,
+            postTitle: post.get('title'),
+            postUrl: this.urlService.getUrlByResourceId(post.get('id'), {absolute: true}),
+            commentHtml: comment.get('html'),
+            commentText: htmlToPlaintext.email(comment.get('html')),
+            commentDate: moment(comment.get('created_at')).tz(this.settingsCache.get('timezone')).format('D MMM YYYY'),
+            reporterName: reporter.name,
+            reporterEmail: reporter.email,
+            reporter: reporter.name ? `${reporter.name} (${reporter.email})` : reporter.email,
+            memberName: memberName,
+            memberEmail: member.get('email'),
+            memberBio: member.get('bio'),
+            memberInitials: this.extractInitials(memberName),
+            accentColor: this.settingsCache.get('accent_color'),
+            fromEmail: this.notificationFromAddress,
+            toEmail: to,
+            staffUrl: `${this.urlUtils.getAdminUrl()}ghost/#/settings/staff/${owner.get('slug')}`
+        };
+        const {html, text} = await this.renderEmailTemplate('report', templateData);
+        await this.sendMail({
+            to,
+            subject,
+            html,
+            text
+        });
+    }
     // Utils
     get siteDomain() {

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

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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/SingleUseTokenProvider.js CHANGED Viewed

@@ -1,5 +1,5 @@
 // @ts-check
-const {UnauthorizedError} = require('@tryghost/errors');
+const {ValidationError} = require('@tryghost/errors');
 class SingleUseTokenProvider {
     /**
@@ -41,7 +41,7 @@ class SingleUseTokenProvider {
         const model = await this.model.findOne({token});
         if (!model) {
-            throw new UnauthorizedError({
+            throw new ValidationError({
                 message: 'Invalid token provided'
             });
         }
@@ -51,7 +51,7 @@ class SingleUseTokenProvider {
         const tokenLifetimeMilliseconds = Date.now() - createdAtEpoch;
         if (tokenLifetimeMilliseconds > this.validity) {
-            throw new UnauthorizedError({
+            throw new ValidationError({
                 message: 'Token expired'
             });
         }

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

@@ -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/config.js CHANGED Viewed

@@ -154,11 +154,14 @@ class MembersConfigProvider {
         };
     }
-    getSigninURL(token, type) {
+    getSigninURL(token, type, referrer) {
         const siteUrl = this._urlUtils.urlFor({relativeUrl: '/members/'}, true);
         const signinURL = new URL(siteUrl);
         signinURL.searchParams.set('token', token);
         signinURL.searchParams.set('action', type);
+        if (referrer) {
+            signinURL.searchParams.set('r', referrer);
+        }
         return signinURL.toString();
     }
 }

package/core/server/services/members/middleware.js CHANGED Viewed

@@ -143,8 +143,8 @@ const createSessionFromMagicLink = async function (req, res, next) {
     // req.query is a plain object, copy it to a URLSearchParams object so we can call toString()
     const searchParams = new URLSearchParams('');
     Object.keys(req.query).forEach((param) => {
-        // don't copy the token param
-        if (param !== 'token') {
+        // don't copy the "token" or "r" params
+        if (param !== 'token' && param !== 'r') {
             searchParams.set(param, req.query[param]);
         }
     });
@@ -182,6 +182,18 @@ const createSessionFromMagicLink = async function (req, res, next) {
             }
         }
+        if (action === 'signin') {
+            const referrer = req.query.r;
+            const siteUrl = urlUtils.getSiteUrl();
+            if (referrer && referrer.startsWith(siteUrl)) {
+                const redirectUrl = new URL(referrer);
+                redirectUrl.searchParams.set('success', true);
+                redirectUrl.searchParams.set('action', 'signin');
+                return res.redirect(redirectUrl.pathname + redirectUrl.search);
+            }
+        }
         // Do a standard 302 redirect to the homepage, with success=true
         searchParams.set('success', true);
         res.redirect(`${urlUtils.getSubdir()}/?${searchParams.toString()}`);