ghost 5.70.1 → 5.71.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%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%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.70%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%226f7dd5f627%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22636d30a751%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%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.71%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22f960def3fe%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22b4a426895e%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-d4aa86641c6080ce3bc58e6d54252774.js"></script>
-<script src="assets/chunk.334.3498cc12ebd02c179e3a.js"></script>
-<script src="assets/chunk.143.faae1eef2142011c150d.js"></script>
-    <script src="assets/ghost-71766888f233d8996c2171e03257c940.js"></script>
+<script src="assets/chunk.338.a23271afc734a6de1d3b.js"></script>
+<script src="assets/chunk.143.dd35d008afe4417cb7b6.js"></script>
+    <script src="assets/ghost-a43c6dbe8d871a5929a0c4ccb54d391e.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -46,7 +46,7 @@ function finaliseStructuredData(meta) {
 
 function getMembersHelper(data, frontendKey) {
     // Do not load Portal if both Memberships and Tips & Donations are disabled
-    if (!settingsCache.get('members_enabled') && !settingsCache.get('donations_enabled')) {
+    if (!settingsCache.get('members_enabled') && !(settingsCache.get('donations_enabled') && labs.isSet('tipsAndDonations'))) {
         return '';
     }
 

package/core/frontend/helpers/tpl/recommendations.hbs

@@ -3,7 +3,11 @@
         {{#each recommendations as |rec|}}
         <li class="recommendation">
             <a href="{{rec.url}}" data-recommendation="{{rec.id}}" target="_blank" rel="noopener">
-                <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}" loading="lazy">
+                <div class="recommendation-favicon">
+                    {{#if rec.favicon}}
+                        <img src="{{rec.favicon}}" alt="{{rec.title}}" loading="lazy" onerror="this.style.display='none';">
+                    {{/if}}
+                </div>
                 <h5 class="recommendation-title">{{rec.title}}</h5>
                 <span class="recommendation-url">{{readable_url rec.url}}</span>
                 <p class="recommendation-description">{{rec.description}}</p>

package/core/frontend/services/routing/controllers/unsubscribe.js

@@ -1,7 +1,9 @@
 const debug = require('@tryghost/debug')('services:routing:controllers:unsubscribe');
 const url = require('url');
-
+const members = require('../../../../server/services/members');
 const urlUtils = require('../../../../shared/url-utils');
+const labs = require('../../../../shared/labs');
+const logging = require('@tryghost/logging');
 
 module.exports = async function unsubscribeController(req, res) {
     debug('unsubscribeController');
@@ -13,6 +15,44 @@ module.exports = async function unsubscribeController(req, res) {
         return res.end('Email address not found.');
     }
 
+    if (req.method === 'POST' && labs.isSet('listUnsubscribeHeader')) {
+        logging.info('[List-Unsubscribe] Received POST unsubscribe for ' + query.uuid + ', newsletter: ' + (query.newsletter ?? 'null') + ', comments: ' + (query.comments ?? 'false'));
+
+        // Do an actual unsubscribe
+        try {
+            const member = await members.api.members.get({uuid: query.uuid}, {withRelated: ['newsletters']});
+            if (member) {
+                if (query.comments) {
+                    // Unsubscribe from comments
+                    await members.api.members.update({
+                        enable_comment_notifications: false
+                    }, {
+                        id: member.id
+                    });
+                } else {
+                    const filteredNewsletters = query.newsletter ?
+                        member.related('newsletters').models
+                            .filter(n => n.get('uuid') !== query.newsletter)
+                            .map(n => ({id: n.id}))
+                        : [];
+                    await members.api.members.update({
+                        newsletters: filteredNewsletters
+                    }, {
+                        id: member.id
+                    });
+                }
+            }
+        } catch (e) {
+            logging.error({
+                err: e,
+                message: '[List-Unsubscribe] Failed POST unsubscribe for ' + query.uuid
+            });
+            return res.status(400).end();
+        }
+
+        return res.status(201).end();
+    }
+
     const redirectUrl = new URL(urlUtils.urlFor('home', true));
     redirectUrl.searchParams.append('uuid', query.uuid);
     if (query.newsletter) {

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -6,7 +6,6 @@ const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
 const clean = require('./utils/clean');
-const labs = require('../../../../../../shared/labs');
 const lexical = require('../../../../../lib/lexical');
 
 function removeSourceFormats(frame) {
@@ -57,7 +56,7 @@ function defaultFormat(frame) {
         return;
     }
 
-    frame.options.formats = 'mobiledoc';
+    frame.options.formats = 'mobiledoc,lexical';
 }
 
 function handlePostsMeta(frame) {
@@ -138,9 +137,7 @@ module.exports = {
 
                 // normally we don't allow both mobiledoc+lexical but the model layer will remove lexical
                 // if mobiledoc is already present to avoid migrating formats outside of an explicit conversion
-                if (labs.isSet('lexicalEditor')) {
-                    frame.data.pages[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
-                }
+                frame.data.pages[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
             }
         }
 

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -6,7 +6,6 @@ const localUtils = require('../../index');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
 const clean = require('./utils/clean');
-const labs = require('../../../../../../shared/labs');
 const lexical = require('../../../../../lib/lexical');
 
 function removeSourceFormats(frame) {
@@ -74,7 +73,7 @@ function defaultFormat(frame) {
         return;
     }
 
-    frame.options.formats = 'mobiledoc';
+    frame.options.formats = 'mobiledoc,lexical';
 }
 
 function handlePostsMeta(frame) {
@@ -172,9 +171,7 @@ module.exports = {
 
                 // normally we don't allow both mobiledoc+lexical but the model layer will remove lexical
                 // if mobiledoc is already present to avoid migrating formats outside of an explicit conversion
-                if (labs.isSet('lexicalEditor')) {
-                    frame.data.posts[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
-                }
+                frame.data.posts[0].lexical = JSON.stringify(lexical.htmlToLexicalConverter(html));
             }
         }
 

package/core/server/lib/lexical.js

@@ -16,6 +16,28 @@ function populateNodes() {
 }
 
 module.exports = {
+    get blankDocument() {
+        return {
+            root: {
+                children: [
+                    {
+                        children: [],
+                        direction: null,
+                        format: '',
+                        indent: 0,
+                        type: 'paragraph',
+                        version: 1
+                    }
+                ],
+                direction: null,
+                format: '',
+                indent: 0,
+                type: 'root',
+                version: 1
+            }
+        };
+    },
+
     get lexicalHtmlRenderer() {
         if (!lexicalHtmlRenderer) {
             if (!nodes) {

package/core/server/models/post.js

@@ -392,6 +392,11 @@ Post = ghostBookshelf.Model.extend({
             const html = await lexicalLib.render(model.get('lexical'));
             const plaintext = htmlToPlaintext.excerpt(html);
 
+            // avoid a DB query if we have no html - knex will set it to an empty string rather than NULL
+            if (!html && !model.get('plaintext')) {
+                return model;
+            }
+
             // set model attributes so they are available immediately in code that uses the returned model
             model.set('html', html);
             model.set('plaintext', plaintext);
@@ -716,7 +721,7 @@ Post = ghostBookshelf.Model.extend({
         }
 
         if (!this.get('mobiledoc') && !this.get('lexical')) {
-            this.set('mobiledoc', JSON.stringify(mobiledocLib.blankDocument));
+            this.set('lexical', JSON.stringify(lexicalLib.blankDocument));
         }
 
         // If we're force re-rendering we want to make sure that all image cards
@@ -984,7 +989,7 @@ Post = ghostBookshelf.Model.extend({
         }
 
         // CASE: Convert post to lexical on the fly
-        if (labs.isSet('lexicalEditor') && options.convert_to_lexical) {
+        if (options.convert_to_lexical) {
             ops.push(async function convertToLexical() {
                 const mobiledoc = model.get('mobiledoc');
                 if (mobiledoc !== null) { // only run conversion when there is a mobiledoc string

package/core/shared/labs.js

@@ -20,7 +20,7 @@ const GA_FEATURES = [
     'outboundLinkTagging',
     'announcementBar',
     'signupForm',
-    'lexicalEditor'
+    'recommendations'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -41,8 +41,9 @@ const ALPHA_FEATURES = [
     'collectionsCard',
     'tipsAndDonations',
     'importMemberTier',
-    'recommendations',
-    'lexicalIndicators'
+    'lexicalIndicators',
+    'listUnsubscribeHeader',
+    'editorEmojiPicker'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];