ghost 5.40.1 → 5.41.0

package/core/built/admin/index.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%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.40%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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%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.41%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-68ea49029c6d45b4aa090f4e218917aa.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-4c8239333143ae4b8d6046cca482b7ce.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-d08b4de6f990b9cd7b5a92d61952a5bb.js"></script>
-<script src="assets/chunk.462.b66cfed1f66c8d2678b2.js"></script>
-<script src="assets/chunk.143.28e9fe97bf250c9d07db.js"></script>
-    <script src="assets/ghost-467b96c17c6bc0d06fa88e85074fbecf.js"></script>
+<script src="assets/chunk.324.2c415c5d0691230623df.js"></script>
+<script src="assets/chunk.143.78da682c0f256cf61289.js"></script>
+    <script src="assets/ghost-4b392979da29476ec2b63e8437f26a9a.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -2,7 +2,7 @@
 // Usage: `{{ghost_head}}`
 //
 // Outputs scripts and other assets at the top of a Ghost theme
-const {metaData, settingsCache, config, blogIcon, urlUtils, getFrontendKey} = require('../services/proxy');
+const {labs, metaData, settingsCache, config, blogIcon, urlUtils, getFrontendKey} = require('../services/proxy');
 const {escapeExpression, SafeString} = require('../services/handlebars');
 
 // BAD REQUIRE
@@ -52,6 +52,7 @@ function getMembersHelper(data, frontendKey) {
 
     const colorString = (_.has(data, 'site._preview') && data.site.accent_color) ? data.site.accent_color : '';
     const attributes = {
+        i18n: labs.isSet('i18n'),
         ghost: urlUtils.getSiteUrl(),
         key: frontendKey,
         api: urlUtils.urlFor('api', {type: 'content'}, true)

package/core/server/data/migrations/versions/5.40/2023-03-21-19-02-add-self-serve-integration-api-key.js

@@ -37,7 +37,7 @@ module.exports = createTransactionalMigration(
 
         await knex('api_keys').insert({
             id: (new ObjectID()).toHexString(),
-            type: 'core',
+            type: 'admin',
             secret: security.secret.create('admin'),
             role_id: role.id,
             integration_id: integration.id,

package/core/server/data/migrations/versions/5.41/2023-03-27-15-00-add-newsletter-colors.js

@@ -0,0 +1,22 @@
+const {createAddColumnMigration, combineNonTransactionalMigrations} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('newsletters', 'background_color', {
+        type: 'string',
+        maxlength: 50,
+        nullable: false,
+        defaultTo: 'light'
+    }),
+
+    createAddColumnMigration('newsletters', 'border_color', {
+        type: 'string',
+        maxlength: 50,
+        nullable: true
+    }),
+
+    createAddColumnMigration('newsletters', 'title_color', {
+        type: 'string',
+        maxlength: 50,
+        nullable: true
+    })
+);

package/core/server/data/migrations/versions/5.41/2023-03-27-17-51-fix-self-serve-integration-api-key-type.js

@@ -0,0 +1,36 @@
+const {InternalServerError} = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Updating Admin API key for "Self-Serve Migration Integration"');
+
+        const integration = await knex('integrations').where({
+            slug: 'self-serve-migration',
+            name: 'Self-Serve Migration Integration'
+        }).first();
+
+        if (!integration) {
+            throw new InternalServerError('Could not find "Self-Serve Migration Integration"');
+        }
+
+        const existingKey = await knex('api_keys').where({
+            integration_id: integration.id,
+            type: 'core'
+        }).first();
+
+        if (!existingKey) {
+            logging.warn('Admin API key for "Self-Serve Migration Integration" with type "core" does not exists');
+            return;
+        }
+
+        logging.info(`Updating API key type to "admin" for "Self-Serve Migration Integration" ${existingKey.id}`);
+        await knex('api_keys')
+            .update('type', 'admin')
+            .where('id', existingKey.id);
+    },
+    async function down() {
+        // noop as previous state was incorrect
+    }
+);

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

@@ -41,6 +41,9 @@ module.exports = {
         show_comment_cta: {type: 'boolean', nullable: false, defaultTo: true},
         show_subscription_details: {type: 'boolean', nullable: false, defaultTo: false},
         show_latest_posts: {type: 'boolean', nullable: false, defaultTo: false},
+        background_color: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'light'},
+        border_color: {type: 'string', maxlength: 50, nullable: true},
+        title_color: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}
     },

package/core/server/models/newsletter.js

@@ -26,6 +26,9 @@ const Newsletter = ghostBookshelf.Model.extend({
             show_comment_cta: true,
             show_subscription_details: false,
             show_latest_posts: false,
+            background_color: 'light',
+            border_color: null,
+            title_color: null,
             feedback_enabled: false
         };
     },

package/core/server/services/i18n.js

@@ -1,14 +1,36 @@
-//const debug = require('@tryghost/debug')('i18n');
-const i18n = require('@tryghost/i18n');
+const debug = require('@tryghost/debug')('i18n');
+
+/** @type {import('i18next').i18n} */
+let i18nInstance;
 
 module.exports.init = function () {
-    //const events = require('../lib/common/events');
-    //const settingsCache = require('../../shared/settings-cache');
+    const i18n = require('@tryghost/i18n');
+    const events = require('../lib/common/events');
+    const settingsCache = require('../../shared/settings-cache');
+    const labs = require('../../shared/labs');
+
+    let locale = 'en';
+
+    if (labs.isSet('i18n')) {
+        locale = settingsCache.get('locale');
+    }
+
+    module.exports = i18nInstance = i18n(locale, 'ghost');
 
-    module.exports = i18n(/* settingsCache.get('locale') */ 'en', 'ghost');
+    events.on('settings.labs.edited', () => {
+        if (labs.isSet('i18n')) {
+            debug('labs i18n enabled, updating i18n to', settingsCache.get('locale'));
+            i18nInstance.changeLanguage(settingsCache.get('locale'));
+        } else {
+            debug('labs i18n disabled, updating i18n to en');
+            i18nInstance.changeLanguage('en');
+        }
+    });
 
-    /*events.on('settings.locale.edited', (model) => {
-        debug('locale changed, updating i18n to', model.get('value'));
-        i18nInstance.changeLanguage(model.get('value'));
-    });*/
+    events.on('settings.locale.edited', (model) => {
+        if (labs.isSet('i18n')) {
+            debug('locale changed, updating i18n to', model.get('value'));
+            i18nInstance.changeLanguage(model.get('value'));
+        }
+    });
 };

package/core/server/services/mentions-email-report/service.js

@@ -81,8 +81,13 @@ module.exports = {
              * @returns {Promise<string>}
              */
             async renderText(report, recipient) {
+                // Filter out mentions with duplicate source url from the report
+                const uniqueMentions = report.mentions.filter((mention, index, self) => {
+                    return self.findIndex(m => m.sourceUrl.href === mention.sourceUrl.href) === index;
+                });
+
                 return staffService.api.emails.renderText('mention-report', {
-                    report: report,
+                    mentions: uniqueMentions,
                     recipient: recipient
                 });
             }
@@ -139,7 +144,7 @@ module.exports = {
 
         const labs = require('../../../shared/labs');
         DomainEvents.subscribe(StartMentionEmailReportJob, () => {
-            if (labs.isSet('webmentionEmails')) {
+            if (labs.isSet('webmentions')) {
                 job.sendLatestReport();
             }
         });

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

@@ -19,7 +19,8 @@ const getPostServiceInstance = () => {
         models: {
             Post: models.Post,
             Newsletter: models.Newsletter,
-            Label: models.Label
+            Label: models.Label,
+            Product: models.Product
         },
         getPostUrl(post) {
             const jsonModel = post.toJSON();

package/core/shared/config/defaults.json

@@ -176,7 +176,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.25"
+        "version": "2.26"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",

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

@@ -60,5 +60,6 @@
         "fixtures": "test/utils/fixtures/fixtures",
         "defaultSettings": "test/utils/fixtures/default-settings-browser.json",
         "urlCache": "test/utils/fixtures/urls"
-    }
+    },
+    "enableDeveloperExperiments": true
 }

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

@@ -13,7 +13,7 @@
         }
     },
     "logging": {
-        "level": "fatal"
+        "level": "error"
     },
     "spam": {
         "user_login": {

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

@@ -12,7 +12,7 @@
         "port": 2369
     },
     "logging": {
-        "level": "fatal"
+        "level": "error"
     },
     "spam": {
         "user_login": {

package/core/shared/labs.js

@@ -27,15 +27,16 @@ const GA_FEATURES = [
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
+    'i18n',
     'activitypub',
     'webmentions'
 ];
 
 const ALPHA_FEATURES = [
     'urlCache',
+    'migrateApp',
     'lexicalEditor',
     'websockets',
-    'webmentionEmails',
     'stripeAutomaticTax',
     'makingItRain'
 ];