ghost 5.130.2 → 6.0.0-alpha.2

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</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.130%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%223291c981c1%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22b38d27bb5e%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%229a7e1b885b%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%225445ed6ca9%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%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%226.0%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22d033b6dcc1%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%2235ce5f3180%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22be6ec893bf%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%225ddc4bf3f4%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -49,7 +49,7 @@
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
 <script src="assets/chunk.728.985c45ad584b4b91ca60.js"></script>
-<script src="assets/chunk.524.1f2faf572078e5b86b09.js"></script>
-    <script src="assets/ghost-280b83af263b51bc4d6ce5bd8f536096.js"></script>
+<script src="assets/chunk.524.0953dd72ae1efbabe0de.js"></script>
+    <script src="assets/ghost-db0f84981913aec8a672c57aa22da07a.js"></script>
 </body>
 </html>

package/core/frontend/helpers/get.js

@@ -3,6 +3,7 @@
 // Fetches data from the API
 const {config, api, prepareContextResource} = require('../services/proxy');
 const {hbs, SafeString} = require('../services/handlebars');
+const {applyLimitCap} = require('../../shared/max-limit-cap');
 
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
@@ -114,8 +115,9 @@ function parseOptions(globals, data, options) {
         options.filter = resolvePaths(globals, data, options.filter);
     }
 
-    if (options.limit === 'all' && config.get('getHelperLimitAllMax')) {
-        options.limit = config.get('getHelperLimitAllMax');
+    // Adjust limit to Ghost's max allowed value (default: 100 and no limit=all)
+    if (options.limit) {
+        options.limit = applyLimitCap(options.limit);
     }
 
     return options;

package/core/frontend/helpers/ghost_head.js

@@ -271,11 +271,6 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                     head.push(writeMetaTag('referrer', referrerPolicy, 'name'));
                 }
             }
-            // show amp link in post when 1. we are not on the amp page and 2. amp is enabled
-            if (_.includes(context, 'post') && !_.includes(context, 'amp') && settingsCache.get('amp')) {
-                head.push('<link rel="amphtml" href="' +
-                    escapeExpression(meta.ampUrl) + '">');
-            }
 
             if (meta.previousUrl) {
                 head.push('<link rel="prev" href="' +
@@ -306,93 +301,92 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
         head.push('<link rel="alternate" type="application/rss+xml" title="' +
             escapeExpression(meta.site.title) + '" href="' +
             escapeExpression(meta.rssUrl) + '">');
-        // no code injection for amp context!!!
-        if (!_.includes(context, 'amp')) {
-            head.push(getMembersHelper(options.data, frontendKey, excludeList)); // controlling for excludes within the function
-            if (!excludeList.has('search')) {
-                head.push(getSearchHelper(frontendKey));
-            }
-            if (!excludeList.has('announcement')) {
-                head.push(getAnnouncementBarHelper(options.data));
-            }
-            try {
-                head.push(getWebmentionDiscoveryLink());
-            } catch (err) {
-                logging.warn(err);
-            }
 
-            // @TODO do this in a more "frameworky" way
+        head.push(getMembersHelper(options.data, frontendKey, excludeList)); // controlling for excludes within the function
+        if (!excludeList.has('search')) {
+            head.push(getSearchHelper(frontendKey));
+        }
+        if (!excludeList.has('announcement')) {
+            head.push(getAnnouncementBarHelper(options.data));
+        }
+        try {
+            head.push(getWebmentionDiscoveryLink());
+        } catch (err) {
+            logging.warn(err);
+        }
 
-            if (!excludeList.has('card_assets')) {
-                if (cardAssets.hasFile('js')) {
-                    head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
-                }
-                if (cardAssets.hasFile('css')) {
-                    head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
-                }
-            }
+        // @TODO do this in a more "frameworky" way
 
-            if (!excludeList.has('comment_counts') && settingsCache.get('comments_enabled') !== 'off') {
-                head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
+        if (!excludeList.has('card_assets')) {
+            if (cardAssets.hasFile('js')) {
+                head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
             }
-
-            if (settingsCache.get('members_enabled') && settingsCache.get('members_track_sources')) {
-                head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
+            if (cardAssets.hasFile('css')) {
+                head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
             }
+        }
 
-            if (options.data.site.accent_color) {
-                const accentColor = escapeExpression(options.data.site.accent_color);
-                const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
-                const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
+        if (!excludeList.has('comment_counts') && settingsCache.get('comments_enabled') !== 'off') {
+            head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
+        }
 
-                if (existingScriptIndex !== -1) {
-                    head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
-                } else {
-                    head.push(styleTag);
-                }
-            }
-            if (!_.isEmpty(globalCodeinjection)) {
-                head.push(globalCodeinjection);
-            }
+        if (settingsCache.get('members_enabled') && settingsCache.get('members_track_sources')) {
+            head.push(`<script defer src="${getAssetUrl('public/member-attribution.min.js')}"></script>`);
+        }
 
-            if (!_.isEmpty(postCodeInjection)) {
-                head.push(postCodeInjection);
-            }
+        if (options.data.site.accent_color) {
+            const accentColor = escapeExpression(options.data.site.accent_color);
+            const styleTag = `<style>:root {--ghost-accent-color: ${accentColor};}</style>`;
+            const existingScriptIndex = _.findLastIndex(head, str => str.match(/<\/(style|script)>/));
 
-            if (!_.isEmpty(tagCodeInjection)) {
-                head.push(tagCodeInjection);
+            if (existingScriptIndex !== -1) {
+                head[existingScriptIndex] = head[existingScriptIndex] + styleTag;
+            } else {
+                head.push(styleTag);
             }
-            // Use settingsHelpers to check if web analytics is enabled (includes all necessary checks)
-            if (settingsHelpers.isWebAnalyticsEnabled()) {
-                head.push(getTinybirdTrackerScript(dataRoot));
-                // Set a flag in response locals to indicate tracking script is being served
-                if (dataRoot._locals) {
-                    dataRoot._locals.ghostAnalytics = true;
-                }
+        }
+        if (!_.isEmpty(globalCodeinjection)) {
+            head.push(globalCodeinjection);
+        }
+
+        if (!_.isEmpty(postCodeInjection)) {
+            head.push(postCodeInjection);
+        }
+
+        if (!_.isEmpty(tagCodeInjection)) {
+            head.push(tagCodeInjection);
+        }
+
+        // Use settingsHelpers to check if web analytics is enabled (includes all necessary checks)
+        if (settingsHelpers.isWebAnalyticsEnabled()) {
+            head.push(getTinybirdTrackerScript(dataRoot));
+            // Set a flag in response locals to indicate tracking script is being served
+            if (dataRoot._locals) {
+                dataRoot._locals.ghostAnalytics = true;
             }
+        }
 
-            // Check if if the request is for a site preview, in which case we **always** use the custom font values
-            // from the passed in data, even when they're empty strings or settings cache has values.
-            const isSitePreview = options.data?.site?._preview ?? false;
-            // Taking the fonts straight from the passed in data, as they can't be used from the
-            // settings cache for the theme preview until the settings are saved. Once saved,
-            // we need to use the settings cache to provide the correct CSS injection.
-            const headingFont = isSitePreview ? options.data?.site?.heading_font : settingsCache.get('heading_font');
-            const bodyFont = isSitePreview ? options.data?.site?.body_font : settingsCache.get('body_font');
-            if ((typeof headingFont === 'string' && isValidCustomHeadingFont(headingFont)) ||
+        // Check if if the request is for a site preview, in which case we **always** use the custom font values
+        // from the passed in data, even when they're empty strings or settings cache has values.
+        const isSitePreview = options.data?.site?._preview ?? false;
+        // Taking the fonts straight from the passed in data, as they can't be used from the
+        // settings cache for the theme preview until the settings are saved. Once saved,
+        // we need to use the settings cache to provide the correct CSS injection.
+        const headingFont = isSitePreview ? options.data?.site?.heading_font : settingsCache.get('heading_font');
+        const bodyFont = isSitePreview ? options.data?.site?.body_font : settingsCache.get('body_font');
+        if ((typeof headingFont === 'string' && isValidCustomHeadingFont(headingFont)) ||
                 (typeof bodyFont === 'string' && isValidCustomFont(bodyFont))) {
-                /** @type FontSelection */
-                const fontSelection = {};
+            /** @type FontSelection */
+            const fontSelection = {};
 
-                if (headingFont) {
-                    fontSelection.heading = headingFont;
-                }
-                if (bodyFont) {
-                    fontSelection.body = bodyFont;
-                }
-                const customCSS = generateCustomFontCss(fontSelection);
-                head.push(new SafeString(customCSS));
+            if (headingFont) {
+                fontSelection.heading = headingFont;
+            }
+            if (bodyFont) {
+                fontSelection.body = bodyFont;
             }
+            const customCSS = generateCustomFontCss(fontSelection);
+            head.push(new SafeString(customCSS));
         }
 
         debug('end');

package/core/frontend/meta/canonical-url.js

@@ -12,13 +12,7 @@ function getCanonicalUrl(data) {
         return data.tag.canonical_url;
     }
 
-    let url = urlUtils.urlJoin(urlUtils.urlFor('home', true), getUrl(data, false));
-
-    if (url.indexOf('/amp/')) {
-        url = url.replace(/\/amp\/$/i, '/');
-    }
-
-    return url;
+    return urlUtils.urlJoin(urlUtils.urlFor('home', true), getUrl(data, false));
 }
 
 module.exports = getCanonicalUrl;

package/core/frontend/meta/context-object.js

@@ -7,7 +7,7 @@ function getContextObject(data, context) {
     // @TODO: meta layer is very broken, it's really hard to understand what it's doing
     // The problem is that handlebars root object is structured differently. Sometimes the object is flat on data
     // and sometimes the object is part of a key e.g. data.post. This needs to be prepared at the very first stage and not in each helper.
-    if ((_.includes(context, 'page') || _.includes(context, 'amp')) && data.post) {
+    if (_.includes(context, 'page') && data.post) {
         chosenContext = data.post;
     } else if (_.includes(context, 'post') && data.post) {
         chosenContext = data.post;

package/core/frontend/meta/get-meta.js

@@ -3,7 +3,6 @@ const urlUtils = require('../../shared/url-utils');
 const logging = require('@tryghost/logging');
 
 // These are in filename order
-const getAmpUrl = require('./amp-url');
 const getAuthorFacebook = require('./author-fb-url');
 const getAuthorImage = require('./author-image');
 const getAuthorUrl = require('./author-url');
@@ -31,7 +30,6 @@ function getMetaData(data, root) {
     const metaData = {
         url: getUrl(data, true),
         canonicalUrl: getCanonicalUrl(data),
-        ampUrl: getAmpUrl(data),
         previousUrl: getPaginatedUrl('prev', data, true),
         nextUrl: getPaginatedUrl('next', data, true),
         authorUrl: getAuthorUrl(data, true),
@@ -70,8 +68,7 @@ function getMetaData(data, root) {
             navigation: settingsCache.get('navigation'),
             icon: settingsCache.get('icon'),
             cover_image: settingsCache.get('cover_image'),
-            logo: getBlogLogo(),
-            amp: settingsCache.get('amp')
+            logo: getBlogLogo()
         }
     };
 

package/core/frontend/meta/og-image.js

@@ -12,7 +12,7 @@ function getOgImage(data) {
         return (imgUrl && urlUtils.relativeToAbsolute(imgUrl)) || null;
     }
 
-    if (_.includes(context, 'post') || _.includes(context, 'page') || _.includes(context, 'amp')) {
+    if (_.includes(context, 'post') || _.includes(context, 'page')) {
         if (contextObject.og_image) {
             return urlUtils.relativeToAbsolute(contextObject.og_image);
         } else if (contextObject.feature_image) {

package/core/frontend/meta/og-type.js

@@ -1,8 +1,6 @@
 function getOgType(data) {
     let context = data.context ? data.context[0] : null;
 
-    context = context === 'amp' ? 'post' : context;
-
     if (context === 'author') {
         return 'profile';
     }

package/core/frontend/meta/schema.js

@@ -187,7 +187,7 @@ function getAuthorSchema(metaData, data) {
 function getSchema(metaData, data) {
     if (!config.isPrivacyDisabled('useStructuredData')) {
         const context = data.context ? data.context : null;
-        if (_.includes(context, 'post') || _.includes(context, 'page') || _.includes(context, 'amp')) {
+        if (_.includes(context, 'post') || _.includes(context, 'page')) {
             return getPostSchema(metaData, data);
         } else if (_.includes(context, 'home')) {
             return getHomeSchema(metaData);

package/core/frontend/meta/twitter-image.js

@@ -12,7 +12,7 @@ function getTwitterImage(data) {
         return (imgUrl && urlUtils.relativeToAbsolute(imgUrl)) || null;
     }
 
-    if (_.includes(context, 'post') || _.includes(context, 'page') || _.includes(context, 'amp')) {
+    if (_.includes(context, 'post') || _.includes(context, 'page')) {
         if (contextObject.twitter_image) {
             return urlUtils.relativeToAbsolute(contextObject.twitter_image);
         } else if (contextObject.feature_image) {

package/core/frontend/meta/url.js

@@ -2,16 +2,6 @@ const urlUtils = require('../../shared/url-utils');
 const urlService = require('../../server/services/url');
 const {checks} = require('../services/data');
 
-// This cleans the url from any `/amp` postfixes, so we'll never
-// output a url with `/amp` in the end, except for the needed `amphtml`
-// canonical link, which is rendered by `getAmpUrl`.
-function sanitizeAmpUrl(url) {
-    if (url.indexOf('/amp/') !== -1) {
-        url = url.replace(/\/amp\/$/i, '/');
-    }
-    return url;
-}
-
 function getUrl(data, absolute) {
     if (checks.isPost(data)) {
         /**
@@ -41,8 +31,7 @@ function getUrl(data, absolute) {
         return urlUtils.urlFor('nav', {nav: data}, absolute);
     }
 
-    // sanitize any trailing `/amp` in the url
-    return sanitizeAmpUrl(urlUtils.urlFor(data, {}, absolute));
+    return urlUtils.urlFor(data, {}, absolute);
 }
 
 module.exports = getUrl;

package/core/frontend/services/rendering/context.js

@@ -14,9 +14,6 @@
 // routeKeywords.private: 'private'
 const privatePattern = new RegExp('^\\/private\\/');
 
-// routeKeywords.amp: 'amp'
-const ampPattern = new RegExp('\\/amp\\/$');
-
 const homePattern = new RegExp('^\\/$');
 
 function setResponseContext(req, res, data) {
@@ -41,11 +38,6 @@ function setResponseContext(req, res, data) {
         res.locals.context.push('home');
     }
 
-    // Add context 'amp' to either post or page, if we have an `*/amp` route
-    if (ampPattern.test(res.locals.relativeUrl) && (data.post || data.page)) {
-        res.locals.context.push('amp');
-    }
-
     // Each page can only have at most one of these
     if (res.routerOptions && res.routerOptions.context) {
         res.locals.context = res.locals.context.concat(res.routerOptions.context);

package/core/frontend/web/middleware/static-theme.js

@@ -59,16 +59,35 @@ function forwardToExpressStatic(req, res, next) {
         return next();
     }
 
+    // We allow robots.txt to fall through to the next middleware, so that we can return our default robots.txt
+    // We also allow sitemap.xml and sitemap-:resource.xml to fall through so that we can serve our defaults if they're not found in the theme
+    const fallthroughFiles = [
+        '/robots.txt',
+        '/sitemap.xml',
+        '/sitemap-posts.xml',
+        '/sitemap-pages.xml',
+        '/sitemap-tags.xml',
+        '/sitemap-authors.xml',
+        '/sitemap-users.xml',
+        '/sitemap.xsl'
+    ];
+    const fallthrough = fallthroughFiles.includes(req.path) ? true : false;
+
     express.static(themeEngine.getActive().path, {
         // @NOTE: the maxAge config passed below are in milliseconds and the config
         //        is specified in seconds. See https://github.com/expressjs/serve-static/issues/150 for more context
-        maxAge: config.get('caching:theme:maxAge') * 1000
+        maxAge: config.get('caching:theme:maxAge') * 1000,
+        fallthrough
     }
     )(req, res, next);
 }
 
 function staticTheme() {
     return function denyStatic(req, res, next) {
+        if (!path.extname(req.path)) {
+            return next();
+        }
+
         if (!isAllowedFile(req.path.toLowerCase()) && isDeniedFile(req.path.toLowerCase())) {
             return next();
         }

package/core/server/api/endpoints/index.js

@@ -205,10 +205,6 @@ module.exports = {
         return apiFramework.pipeline(require('./links'), localUtils);
     },
 
-    get mailEvents() {
-        return apiFramework.pipeline(require('./mail-events'), localUtils);
-    },
-
     get recommendations() {
         return apiFramework.pipeline(require('./recommendations'), localUtils);
     },

package/core/server/api/endpoints/session.js

@@ -10,15 +10,6 @@ const messages = {
 
 /** @type {import('@tryghost/api-framework').Controller} */
 const controller = {
-    read(frame) {
-        /*
-         * TODO
-         * Don't query db for user, when new api http wrapper is in we can
-         * have direct access to req.user, we can also get access to some session
-         * inofrmation too and send it back
-         */
-        return models.User.findOne({id: frame.options.context.user});
-    },
     add(frame) {
         const object = frame.data;
 

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

@@ -53,8 +53,6 @@ const EDITABLE_SETTINGS = [
     'email_track_clicks',
     'members_track_sources',
     'web_analytics',
-    'amp',
-    'amp_gtag_id',
     'slack_url',
     'slack_username',
     'unsplash',

package/core/server/api/endpoints/utils/serializers/input/utils/settings-filter-type-group-mapper.js

@@ -4,7 +4,6 @@ const typeGroupMapping = {
     ],
     blog: [
         'site',
-        'amp',
         'labs',
         'slack',
         'unsplash',

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-group-mapper.js

@@ -36,7 +36,6 @@ const keyGroupMapping = {
     is_private: 'private',
     password: 'private',
     public_hash: 'private',
-    amp: 'amp',
     labs: 'labs',
     slack: 'slack',
     unsplash: 'unsplash',

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-type-mapper.js

@@ -46,7 +46,6 @@ const keyTypeMapping = {
     portal_plans: 'array',
     stripe_plans: 'array',
     next_update_check: 'number',
-    amp: 'boolean',
     is_private: 'boolean',
     members_allow_free_signup: 'boolean',
     portal_name: 'boolean',

package/core/server/api/endpoints/utils/serializers/output/all.js

@@ -6,7 +6,7 @@ const removeXBY = (object) => {
         // CASE: go deeper
         if (_.isObject(value) || _.isArray(value)) {
             removeXBY(value);
-        } else if (['updated_by', 'created_by', 'published_by'].includes(key)) {
+        } else if (['published_by'].includes(key)) {
             delete object[key];
         }
     }

package/core/server/api/endpoints/utils/serializers/output/index.js

@@ -137,10 +137,6 @@ module.exports = {
         return require('./links');
     },
 
-    get mail_events() {
-        return require('./mail-events');
-    },
-
     get search_index() {
         return require('./search-index');
     },

package/core/server/api/endpoints/utils/serializers/output/mappers/snippets.js

@@ -14,9 +14,7 @@ module.exports = (snippet, frame) => {
         mobiledoc: json.mobiledoc,
         lexical: json.lexical,
         created_at: json.created_at,
-        updated_at: json.updated_at,
-        created_by: json.created_by,
-        updated_by: json.updated_by
+        updated_at: json.updated_at
     };
 };
 
@@ -28,8 +26,6 @@ module.exports = (snippet, frame) => {
  * @prop {string} [lexical]
  * @prop {string} created_at
  * @prop {string} updated_at
- * @prop {string} created_by
- * @prop {string} updated_by
  */
 
 /**

package/core/server/api/endpoints/utils/serializers/output/members.js

@@ -342,9 +342,7 @@ function createSerializer(debugString, serialize) {
  * @prop {string} plaintext
  * @prop {boolean} track_opens
  * @prop {string} created_at
- * @prop {string} created_by
  * @prop {string} updated_at
- * @prop {string} updated_by
  */
 
 /**

package/core/server/api/endpoints/utils/validators/input/index.js

@@ -75,9 +75,5 @@ module.exports = {
 
     get snippets() {
         return require('./snippets');
-    },
-
-    get mail_events() {
-        return require('./mail-events');
     }
 };

package/core/server/data/importer/importers/data/Base.js

@@ -287,9 +287,7 @@ class Base {
         _.each(this.dataToImport, (obj) => {
             _.each([
                 'author_id',
-                'published_by',
-                'created_by',
-                'updated_by'
+                'published_by'
             ], (key) => {
                 return handleObject(obj, key);
             });

package/core/server/data/importer/importers/data/SettingsImporter.js

@@ -10,7 +10,7 @@ const {WRITABLE_KEYS_ALLOWLIST} = require('../../../../../shared/labs');
 const {sequence} = require('@tryghost/promise');
 
 const labsDefaults = JSON.parse(defaultSettings.labs.labs.defaultValue);
-const ignoredSettings = ['slack_url', 'members_from_address', 'members_support_address', 'portal_products', 'email_verification_required', 'site_uuid'];
+const ignoredSettings = ['slack_url', 'members_from_address', 'members_support_address', 'portal_products', 'email_verification_required', 'site_uuid', 'amp'];
 
 // Importer maintains as much backwards compatibility as possible
 const renamedSettingsMap = {
@@ -140,9 +140,7 @@ class SettingsImporter extends BaseImporter {
                             group: to.group,
                             type: to.type,
                             flags: to.flags || null,
-                            created_by: deprecatedSetting.created_by || 1,
                             created_at: deprecatedSetting.created_at,
-                            updated_by: deprecatedSetting.updated_by || 1,
                             updated_at: deprecatedSetting.updated_at
                         });
                     });

package/core/server/data/migrations/utils/index.js

@@ -3,8 +3,5 @@ module.exports = {
     ...require('./permissions'),
     ...require('./schema'),
     ...require('./settings'),
-    ...require('./tables'),
-    meta: {
-        MIGRATION_USER: require('./constants').MIGRATION_USER
-    }
+    ...require('./tables')
 };

package/core/server/data/migrations/utils/permissions.js

@@ -4,7 +4,7 @@ const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const {createTransactionalMigration, combineTransactionalMigrations} = require('./migrations');
-const {MIGRATION_USER} = require('./constants');
+const MIGRATION_USER = 1;
 
 const messages = {
     permissionRoleActionError: 'Cannot {action} permission({permission}) with role({role}) - {resource} does not exist'
@@ -30,16 +30,24 @@ async function addPermissionHelper(connection, config) {
 
     const date = connection.raw('CURRENT_TIMESTAMP');
 
-    await connection('permissions').insert({
+    const data = {
         id: ObjectId().toHexString(),
         name: config.name,
         action_type: config.action,
         object_type: config.object,
         created_at: date,
-        created_by: MIGRATION_USER,
-        updated_at: date,
-        updated_by: MIGRATION_USER
-    });
+        updated_at: date
+    };
+
+    if (await connection.schema.hasColumn('permissions', 'created_by')) {
+        data.created_by = MIGRATION_USER;
+    }
+
+    if (await connection.schema.hasColumn('permissions', 'updated_by')) {
+        data.updated_by = MIGRATION_USER;
+    }
+
+    await connection('permissions').insert(data);
 }
 
 /**