ghost 5.38.0 → 5.40.0

package/core/server/services/posts/posts-service.js

@@ -1,123 +1,8 @@
-const nql = require('@tryghost/nql');
-const {BadRequestError} = require('@tryghost/errors');
-const tpl = require('@tryghost/tpl');
-
-const messages = {
-    invalidVisibilityFilter: 'Invalid visibility filter.',
-    invalidEmailSegment: 'The email segment parameter doesn\'t contain a valid filter'
-};
-
-class PostsService {
-    constructor({urlUtils, models, isSet, stats, emailService}) {
-        this.urlUtils = urlUtils;
-        this.models = models;
-        this.isSet = isSet;
-        this.stats = stats;
-        this.emailService = emailService;
-    }
-
-    async editPost(frame) {
-        // Make sure the newsletter is matching an active newsletter
-        // Note that this option is simply ignored if the post isn't published or scheduled
-        if (frame.options.newsletter && frame.options.email_segment) {
-            if (frame.options.email_segment !== 'all') {
-                // check filter is valid
-                try {
-                    await this.models.Member.findPage({filter: frame.options.email_segment, limit: 1});
-                } catch (err) {
-                    return Promise.reject(new BadRequestError({
-                        message: tpl(messages.invalidEmailSegment),
-                        context: err.message
-                    }));
-                }
-            }
-        }
-
-        const model = await this.models.Post.edit(frame.data.posts[0], frame.options);
-
-        /**Handle newsletter email */
-        if (model.get('newsletter_id')) {
-            const sendEmail = model.wasChanged() && this.shouldSendEmail(model.get('status'), model.previous('status'));
-
-            if (sendEmail) {
-                let postEmail = model.relations.email;
-                let email;
-
-                if (!postEmail) {
-                    email = await this.emailService.createEmail(model);
-                } else if (postEmail && postEmail.get('status') === 'failed') {
-                    email = await this.emailService.retryEmail(postEmail);
-                }
-                if (email) {
-                    model.set('email', email);
-                }
-            }
-        }
-
-        return model;
-    }
-
-    async getProductsFromVisibilityFilter(visibilityFilter) {
-        try {
-            const allProducts = await this.models.Product.findAll();
-            const visibilityFilterJson = nql(visibilityFilter).toJSON();
-            const productsData = (visibilityFilterJson.product ? [visibilityFilterJson] : visibilityFilterJson.$or) || [];
-            const tiers = productsData
-                .map((data) => {
-                    return allProducts.find((p) => {
-                        return p.get('slug') === data.product;
-                    });
-                }).filter(p => !!p).map((d) => {
-                    return d.toJSON();
-                });
-            return tiers;
-        } catch (err) {
-            return Promise.reject(new BadRequestError({
-                message: tpl(messages.invalidVisibilityFilter),
-                context: err.message
-            }));
-        }
-    }
-
-    /**
-     * Calculates if the email should be tried to be sent out
-     * @private
-     * @param {String} currentStatus current status from the post model
-     * @param {String} previousStatus previous status from the post model
-     * @returns {Boolean}
-     */
-    shouldSendEmail(currentStatus, previousStatus) {
-        return (['published', 'sent'].includes(currentStatus))
-            && (!['published', 'sent'].includes(previousStatus));
-    }
-
-    handleCacheInvalidation(model) {
-        let cacheInvalidate;
-
-        if (
-            model.get('status') === 'published' && model.wasChanged() ||
-            model.get('status') === 'draft' && model.previous('status') === 'published'
-        ) {
-            cacheInvalidate = true;
-        } else if (
-            model.get('status') === 'draft' && model.previous('status') !== 'published' ||
-            model.get('status') === 'scheduled' && model.wasChanged()
-        ) {
-            cacheInvalidate = {
-                value: this.urlUtils.urlFor({
-                    relativeUrl: this.urlUtils.urlJoin('/p', model.get('uuid'), '/')
-                })
-            };
-        } else {
-            cacheInvalidate = false;
-        }
-
-        return cacheInvalidate;
-    }
-}
+const {PostsService, PostsExporter} = require('@tryghost/posts-service');
+const url = require('../../../server/api/endpoints/utils/serializers/output/utils/url');
 
 /**
- * @returns {PostsService} instance of the PostsService
+ * @returns {InstanceType<PostsService>} instance of the PostsService
  */
 const getPostServiceInstance = () => {
     const urlUtils = require('../../../shared/url-utils');
@@ -125,15 +10,33 @@ const getPostServiceInstance = () => {
     const models = require('../../models');
     const PostStats = require('./stats/post-stats');
     const emailService = require('../email-service');
+    const settingsCache = require('../../../shared/settings-cache');
+    const settingsHelpers = require('../settings-helpers');
 
     const postStats = new PostStats();
 
+    const postsExporter = new PostsExporter({
+        models: {
+            Post: models.Post,
+            Newsletter: models.Newsletter,
+            Label: models.Label
+        },
+        getPostUrl(post) {
+            const jsonModel = post.toJSON();
+            url.forPost(post.id, jsonModel, {options: {}});
+            return jsonModel.url;
+        },
+        settingsCache,
+        settingsHelpers
+    });
+
     return new PostsService({
         urlUtils: urlUtils,
         models: models,
         isSet: flag => labs.isSet(flag), // don't use bind, that breaks test subbing of labs
         stats: postStats,
-        emailService: emailService.service
+        emailService: emailService.service,
+        postsExporter
     });
 };
 

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

@@ -6,7 +6,7 @@ const ghostVersion = require('@tryghost/version');
 
 module.exports = function getConfigProperties() {
     const configProperties = {
-        version: ghostVersion.full,
+        version: ghostVersion.original,
         environment: config.get('env'),
         database: databaseInfo.getEngine(),
         mail: isPlainObject(config.get('mail')) ? config.get('mail').transport : '',

package/core/server/services/slack-notifications/service.js

@@ -1,6 +1,5 @@
 const DomainEvents = require('@tryghost/domain-events');
 const config = require('../../../shared/config');
-const labs = require('../../../shared/labs');
 const logging = require('@tryghost/logging');
 
 class SlackNotificationsServiceWrapper {
@@ -48,7 +47,7 @@ class SlackNotificationsServiceWrapper {
         const hostSettings = config.get('hostSettings');
         const urlUtils = require('../../../shared/url-utils');
         const siteUrl = urlUtils.getSiteUrl();
-        const isEnabled = labs.isSet('milestoneEmails') && hostSettings?.milestones?.enabled && hostSettings?.milestones?.url;
+        const isEnabled = !!(hostSettings?.milestones?.enabled && hostSettings?.milestones?.url);
         const webhookUrl = hostSettings?.milestones?.url;
 
         this.#api = SlackNotificationsServiceWrapper.create({siteUrl, isEnabled, webhookUrl});

package/core/server/services/webhooks/trigger.js

@@ -31,7 +31,7 @@ class WebhookTrigger {
                 last_triggered_at: Date.now(),
                 last_triggered_status: data.statusCode,
                 last_triggered_error: data.error || null
-            }, {id: webhook.id})
+            }, {id: webhook.id, autoRefresh: false})
             .catch(() => {
                 logging.warn(`Unable to update "last_triggered" for webhook: ${webhook.id}`);
             });
@@ -102,7 +102,7 @@ class WebhookTrigger {
                 body: reqPayload,
                 headers,
                 timeout: 2 * 1000,
-                retry: 5
+                retry: process.env.NODE_ENV?.startsWith('test') ? 0 : 5
             };
 
             logging.info(`Triggering webhook for "${webhook.get('event')}" with url "${url}"`);

package/core/server/web/api/endpoints/admin/routes.js

@@ -26,6 +26,8 @@ module.exports = function apiRoutes() {
 
     // ## Posts
     router.get('/posts', mw.authAdminApi, http(api.posts.browse));
+    router.get('/posts/export', mw.authAdminApi, http(api.posts.exportCSV));
+
     router.post('/posts', mw.authAdminApi, http(api.posts.add));
     router.get('/posts/:id', mw.authAdminApi, http(api.posts.read));
     router.get('/posts/slug/:slug', mw.authAdminApi, http(api.posts.read));
@@ -207,7 +209,6 @@ module.exports = function apiRoutes() {
 
     router.post('/db/media/inline',
         mw.authAdminApi,
-        labs.enabledMiddleware('mediaInliner'),
         http(api.db.inlineMedia)
     );
 

package/core/shared/config/defaults.json

@@ -210,12 +210,11 @@
             "arr": [
                 {
                     "currency": "usd",
-                    "values": [100, 1000, 10000, 50000, 100000, 250000, 500000, 1000000]
+                    "values": [0, 100, 1000, 10000, 50000, 100000, 250000, 500000, 1000000]
                 }
             ],
-            "members": [100, 1000, 10000, 25000, 50000, 100000, 250000, 500000, 1000000],
+            "members": [0, 100, 1000, 10000, 25000, 50000, 100000, 250000, 500000, 1000000],
             "minDaysSinceImported": 7,
-            "minDaysSinceLastEmail": 14,
-            "maxPercentageFromMilestone": 0.1
+            "minDaysSinceLastEmail": 14
         }
 }

package/core/shared/config/overrides.json

@@ -121,7 +121,9 @@
         },
         "internalImageSizes": {
             "icon": {"width": 256, "height": 256},
-            "email-header-image": {"width": 1200}
+            "email-header-image": {"width": 1200},
+            "email-latest-posts-image": {"width": 200, "height": 200},
+            "email-latest-posts-image-mobile": {"width": 1200, "height": 960}
         }
     }
 }

package/core/shared/labs.js

@@ -28,17 +28,16 @@ const GA_FEATURES = [
 //       input for the "labs" setting value
 const BETA_FEATURES = [
     'activitypub',
-    'webmentions',
-    'milestoneEmails'
+    'webmentions'
 ];
 
 const ALPHA_FEATURES = [
     'urlCache',
-    'mediaInliner',
     'lexicalEditor',
     'websockets',
     'webmentionEmails',
-    'stripeAutomaticTax'
+    'stripeAutomaticTax',
+    'makingItRain'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];