ghost 4.24.0 → 4.25.0

package/core/server/services/permissions/can-this.js

@@ -128,7 +128,7 @@ CanThisResult.prototype.beginCheck = function (context) {
     context = parseContext(context);
 
     if (actionsMap.empty()) {
-        throw new errors.GhostError({message: tpl(messages.noActionsMapFoundError)});
+        throw new errors.InternalServerError({message: tpl(messages.noActionsMapFoundError)});
     }
 
     // Kick off loading of user permissions if necessary

package/core/server/services/redirects/api.js

@@ -34,7 +34,7 @@ const readRedirectsFile = async (redirectsPath) => {
             return '';
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             throw err;
         }
 
@@ -162,7 +162,7 @@ class CustomRedirectsAPI {
                 }
             }
         } catch (err) {
-            if (errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isGhostError(err)) {
                 logging.error(err);
             } else {
                 logging.error(new errors.IncorrectUsageError({

package/core/server/services/route-settings/default-settings-manager.js

@@ -48,7 +48,7 @@ class DefaultSettingsManager {
                 });
             }).catch((error) => {
                 // CASE: we might have a permission error, as we can't access the directory
-                throw new errors.GhostError({
+                throw new errors.InternalServerError({
                     message: tpl(messages.ensureSettings, {
                         path: this.destinationFolderPath
                     }),

package/core/server/services/route-settings/route-settings.js

@@ -9,7 +9,7 @@ const tpl = require('@tryghost/tpl');
 const bridge = require('../../../bridge');
 
 const messages = {
-    loadError: 'Could not load {filename} file.'
+    loadError: 'Could not load routes.yaml file.'
 };
 
 /**
@@ -38,14 +38,6 @@ class RouteSettings {
          * @private
          */
         this.defaultRoutesSettingHash = '3d180d52c663d173a6be791ef411ed01';
-        /**
-         * @private
-         */
-        this.filename = 'routes';
-        /**
-         * @private
-         */
-        this.ext = 'yaml';
 
         this.settingsLoader = settingsLoader;
         this.settingsPath = settingsPath;
@@ -90,7 +82,7 @@ class RouteSettings {
                     return Promise.resolve([]);
                 }
 
-                if (errors.utils.isIgnitionError(err)) {
+                if (errors.utils.isGhostError(err)) {
                     throw err;
                 }
 
@@ -115,7 +107,7 @@ class RouteSettings {
         };
 
         try {
-            bridge.reloadFrontend();
+            await bridge.reloadFrontend();
         } catch (err) {
             return bringBackValidRoutes()
                 .finally(() => {
@@ -134,7 +126,7 @@ class RouteSettings {
                     if (!urlService.hasFinished()) {
                         if (tries > 5) {
                             throw new errors.InternalServerError({
-                                message: tpl(messages.loadError, {filename: `${this.filename}.${this.ext}`})
+                                message: tpl(messages.loadError)
                             });
                         }
 

package/core/server/services/route-settings/settings-loader.js

@@ -36,11 +36,11 @@ class SettingsLoader {
 
             return validate(object);
         } catch (err) {
-            if (errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isGhostError(err)) {
                 throw err;
             }
 
-            throw new errors.GhostError({
+            throw new errors.InternalServerError({
                 message: tpl(messages.settingsLoaderError, {
                     setting: 'routes',
                     path: this.settingFilePath
@@ -66,11 +66,11 @@ class SettingsLoader {
 
             return validate(object);
         } catch (err) {
-            if (errors.utils.isIgnitionError(err)) {
+            if (errors.utils.isGhostError(err)) {
                 throw err;
             }
 
-            throw new errors.GhostError({
+            throw new errors.InternalServerError({
                 message: tpl(messages.settingsLoaderError, {
                     setting: 'routes',
                     path: this.settingFilePath

package/core/server/services/route-settings/yaml-parser.js

@@ -35,7 +35,7 @@ module.exports = function parseYaml(file) {
 
         return parsed;
     } catch (error) {
-        if (errors.utils.isIgnitionError(error)) {
+        if (errors.utils.isGhostError(error)) {
             throw error;
         }
 

package/core/server/services/slack.js

@@ -136,7 +136,7 @@ function ping(post) {
                 'Content-type': 'application/json'
             }
         }).catch(function (err) {
-            logging.error(new errors.GhostError({
+            logging.error(new errors.InternalServerError({
                 err: err,
                 context: tpl(messages.requestFailedError, {service: 'slack'}),
                 help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})

package/core/server/services/themes/storage.js

@@ -112,7 +112,7 @@ module.exports = {
             if (checkedTheme) {
                 fs.remove(checkedTheme.path)
                     .catch((err) => {
-                        logging.error(new errors.GhostError({err: err}));
+                        logging.error(new errors.InternalServerError({err: err}));
                     });
             }
 
@@ -120,7 +120,7 @@ module.exports = {
             getStorage()
                 .delete(backupName)
                 .catch((err) => {
-                    logging.error(new errors.GhostError({err: err}));
+                    logging.error(new errors.InternalServerError({err: err}));
                 });
         }
     },

package/core/server/services/twitter-embed.js

@@ -0,0 +1,80 @@
+const {extract} = require('oembed-parser');
+
+/**
+ * @typedef {import('./oembed').ICustomProvider} ICustomProvider
+ * @typedef {import('./oembed').IExternalRequest} IExternalRequest
+ */
+
+const TWITTER_PATH_REGEX = /\/status\/(\d+)/;
+
+/**
+ * @implements ICustomProvider
+ */
+class TwitterOEmbedProvider {
+    /**
+     * @param {object} dependencies
+     */
+    constructor(dependencies) {
+        this.dependencies = dependencies;
+    }
+
+    /**
+     * @param {URL} url
+     * @returns {Promise<boolean>}
+     */
+    async canSupportRequest(url) {
+        return url.host === 'twitter.com' && TWITTER_PATH_REGEX.test(url.pathname);
+    }
+
+    /**
+     * @param {URL} url
+     * @param {IExternalRequest} externalRequest
+     *
+     * @returns {Promise<object>}
+     */
+    async getOEmbedData(url, externalRequest) {
+        const [match, tweetId] = url.pathname.match(TWITTER_PATH_REGEX);
+        if (!match) {
+            return null;
+        }
+
+        /** @type {object} */
+        const oembedData = await extract(url.href);
+
+        if (this.dependencies.config.bearerToken) {
+            const query = {
+                expansions: ['attachments.poll_ids', 'attachments.media_keys', 'author_id', 'entities.mentions.username', 'geo.place_id', 'in_reply_to_user_id', 'referenced_tweets.id', 'referenced_tweets.id.author_id'],
+                'media.fields': ['duration_ms', 'height', 'media_key', 'preview_image_url', 'type', 'url', 'width', 'public_metrics', 'alt_text'],
+                'place.fields': ['contained_within', 'country', 'country_code', 'full_name', 'geo', 'id', 'name', 'place_type'],
+                'poll.fields': ['duration_minutes', 'end_datetime', 'id', 'options', 'voting_status'],
+                'tweet.fields': ['attachments', 'author_id', 'context_annotations', 'conversation_id', 'created_at', 'entities', 'geo', 'id', 'in_reply_to_user_id', 'lang', 'public_metrics', 'possibly_sensitive', 'referenced_tweets', 'reply_settings', 'source', 'text', 'withheld'],
+                'user.fields': ['created_at', 'description', 'entities', 'id', 'location', 'name', 'pinned_tweet_id', 'profile_image_url', 'protected', 'public_metrics', 'url', 'username', 'verified', 'withheld']
+            };
+
+            const queryString = Object.keys(query).map((key) => {
+                return `${key}=${query[key].join(',')}`;
+            }).join('&');
+
+            try {
+                const result = await externalRequest(`https://api.twitter.com/2/tweets/${tweetId}?${queryString}`, {
+                    responseType: 'json',
+                    headers: {
+                        Authorization: `Bearer ${this.dependencies.config.bearerToken}`
+                    }
+                });
+
+                const body = JSON.parse(result.body);
+
+                oembedData.tweet_data = body.data;
+            } catch (err) {
+                this.dependencies.logging.error(err);
+            }
+        }
+
+        oembedData.type = 'twitter';
+
+        return oembedData;
+    }
+}
+
+module.exports = TwitterOEmbedProvider;

package/core/server/services/xmlrpc.js

@@ -87,7 +87,7 @@ function ping(post) {
                 if (!goodResponse.test(res.body)) {
                     const matches = res.body.match(errorMessage);
                     const message = matches ? matches[1] : res.body;
-                    throw new errors.GhostError({message});
+                    throw new errors.InternalServerError({message});
                 }
             })
             .catch(function (err) {
@@ -100,7 +100,7 @@ function ping(post) {
                         help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})
                     });
                 } else {
-                    error = new errors.GhostError({
+                    error = new errors.InternalServerError({
                         err: err,
                         message: err.message,
                         context: tpl(messages.requestFailedError, {service: 'xmlrpc'}),

package/core/server/web/admin/views/default-prod.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%2F%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%224.24%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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%2F%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%224.25%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-7f3603dbeb5ebf0ec09e207ae82fb4e3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-043bb7480a0810109b130f13b2a4235e.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-1a84ac3ef74edf31c6e86810b45221cc.js"></script>
-                <script src="assets/ghost.min-d5595f9c71ebc534ccf9ac78483d357c.js"></script>
+                <script src="assets/vendor.min-d1234c632a54502777c34e50752fa3fc.js"></script>
+                <script src="assets/ghost.min-bc72f685c1c9adc9885925c1412435a5.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%2F%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%224.24%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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%2F%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%224.25%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22emberKeyboard%22%3A%7B%22disableInputsInitializer%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" />
@@ -41,7 +41,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-987af30228885bce50f05c4723fe6f53.css">
-                <link rel="stylesheet" href="assets/ghost.min-7f3603dbeb5ebf0ec09e207ae82fb4e3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-043bb7480a0810109b130f13b2a4235e.css" title="light">
             
 
     
@@ -59,8 +59,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-1a84ac3ef74edf31c6e86810b45221cc.js"></script>
-                <script src="assets/ghost.min-d5595f9c71ebc534ccf9ac78483d357c.js"></script>
+                <script src="assets/vendor.min-d1234c632a54502777c34e50752fa3fc.js"></script>
+                <script src="assets/ghost.min-bc72f685c1c9adc9885925c1412435a5.js"></script>
             
 </body>
 </html>

package/core/server/web/api/canary/admin/middleware.js

@@ -44,7 +44,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/api/v2/admin/middleware.js

@@ -40,7 +40,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/api/v3/admin/middleware.js

@@ -44,7 +44,7 @@ const notImplemented = function (req, res, next) {
         }
     }
 
-    next(new errors.GhostError({
+    next(new errors.InternalServerError({
         errorType: 'NotImplementedError',
         message: tpl(messages.notImplemented),
         statusCode: '501'

package/core/server/web/shared/middleware/error-handler.js

@@ -1,16 +1,10 @@
-const hbs = require('express-hbs');
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('error-handler');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
-const config = require('../../../../shared/config');
-const helpers = require('../../../../frontend/services/routing/helpers');
 const sentry = require('../../../../shared/sentry');
 
 const messages = {
-    oopsErrorTemplateHasError: 'Oops, seems there is an error in the error template.',
-    encounteredError: 'Encountered the error: ',
-    whilstTryingToRender: 'whilst trying to render an error page for the error: ',
     pageNotFound: 'Page not found',
     resourceNotFound: 'Resource not found',
     actions: {
@@ -45,22 +39,7 @@ const messages = {
     }
 };
 
-const escapeExpression = hbs.Utils.escapeExpression;
-const _private = {};
-const errorHandler = {};
-
-/**
- * This is a bare minimum setup, which allows us to render the error page
- * It uses the {{asset}} helper, and nothing more
- */
-_private.createHbsEngine = () => {
-    const engine = hbs.create();
-    engine.registerHelper('asset', require('../../../../frontend/helpers/asset'));
-
-    return engine.express4();
-};
-
-_private.updateStack = (err) => {
+const updateStack = (err) => {
     let stackbits = err.stack.split(/\n/g);
 
     // We build this up backwards, so we always insert at position 1
@@ -88,25 +67,30 @@ _private.updateStack = (err) => {
 
 /**
  * Get an error ready to be shown the the user
- *
- * @TODO: support multiple errors within one single error, see https://github.com/TryGhost/Ghost/issues/7116#issuecomment-252231809
  */
-_private.prepareError = (err, req, res, next) => {
+module.exports.prepareError = (err, req, res, next) => {
     debug(err);
 
     if (Array.isArray(err)) {
         err = err[0];
     }
 
-    if (!errors.utils.isIgnitionError(err)) {
+    if (!errors.utils.isGhostError(err)) {
         // We need a special case for 404 errors
-        // @TODO look at adding this to the GhostError class
         if (err.statusCode && err.statusCode === 404) {
             err = new errors.NotFoundError({
                 err: err
             });
+        } else if (err.stack.match(/node_modules\/handlebars\//)) {
+            // Temporary handling of theme errors from handlebars
+            // @TODO remove this when #10496 is solved properly
+            err = new errors.IncorrectUsageError({
+                err: err,
+                message: err.message,
+                statusCode: err.statusCode
+            });
         } else {
-            err = new errors.GhostError({
+            err = new errors.InternalServerError({
                 err: err,
                 message: err.message,
                 statusCode: err.statusCode
@@ -120,7 +104,7 @@ _private.prepareError = (err, req, res, next) => {
     // alternative for res.status();
     res.statusCode = err.statusCode;
 
-    err.stack = _private.updateStack(err);
+    err.stack = updateStack(err);
 
     // never cache errors
     res.set({
@@ -130,7 +114,7 @@ _private.prepareError = (err, req, res, next) => {
     next(err);
 };
 
-_private.JSONErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+const jsonErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
     res.json({
         errors: [{
             message: err.message,
@@ -143,8 +127,8 @@ _private.JSONErrorRenderer = (err, req, res, next) => { // eslint-disable-line n
     });
 };
 
-_private.JSONErrorRendererV2 = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    const userError = _private.prepareUserMessage(err, req);
+const jsonErrorRendererV2 = (err, req, res, next) => { // eslint-disable-line no-unused-vars
+    const userError = prepareUserMessage(err, req);
 
     res.json({
         errors: [{
@@ -160,7 +144,7 @@ _private.JSONErrorRendererV2 = (err, req, res, next) => { // eslint-disable-line
     });
 };
 
-_private.prepareUserMessage = (err, res) => {
+const prepareUserMessage = (err, res) => {
     const userError = {
         message: err.message,
         context: err.context
@@ -206,141 +190,35 @@ _private.prepareUserMessage = (err, res) => {
     return userError;
 };
 
-_private.ErrorFallbackMessage = err => `<h1>${tpl(messages.oopsErrorTemplateHasError)}</h1>
-     <p>${tpl(messages.encounteredError)}</p>
-     <pre>${escapeExpression(err.message || err)}</pre>
-     <br ><p>${tpl(messages.whilstTryingToRender)}</p>
-     ${err.statusCode} <pre>${escapeExpression(err.message || err)}</pre>`;
-
-_private.ThemeErrorRenderer = (err, req, res, next) => {
-    // If the error code is explicitly set to STATIC_FILE_NOT_FOUND,
-    // Skip trying to render an HTML error, and move on to the basic error renderer
-    // We do this because customised 404 templates could reference the image that's missing
-    // A better long term solution might be to do this based on extension
-    if (err.code === 'STATIC_FILE_NOT_FOUND') {
-        return next(err);
-    }
-
-    // Renderer begin
-    // Format Data
-    const data = {
-        message: err.message,
-        // @deprecated Remove in Ghost 5.0
-        code: err.statusCode,
-        statusCode: err.statusCode,
-        errorDetails: err.errorDetails || []
-    };
-
-    // Template
-    // @TODO: very dirty !!!!!!
-    helpers.templates.setTemplate(req, res);
-
-    // It can be that something went wrong with the theme or otherwise loading handlebars
-    // This ensures that no matter what res.render will work here
-    // @TODO: split the error handler for assets, admin & theme to refactor this away
-    if (_.isEmpty(req.app.engines)) {
-        res._template = 'error';
-        req.app.engine('hbs', _private.createHbsEngine());
-        req.app.set('view engine', 'hbs');
-        req.app.set('views', config.get('paths').defaultViews);
-    }
-
-    // @TODO use renderer here?!
-    // Render Call - featuring an error handler for what happens if rendering fails
-    res.render(res._template, data, (_err, html) => {
-        if (!_err) {
-            return res.send(html);
-        }
-
-        // re-attach new error e.g. error template has syntax error or misusage
-        req.err = _err;
-
-        // And then try to explain things to the user...
-        // Cheat and output the error using handlebars escapeExpression
-        return res.status(500).send(_private.ErrorFallbackMessage(_err));
-    });
-};
-
-/**
- *  Borrowed heavily from finalHandler
- */
-
-const DOUBLE_SPACE_REGEXP = /\x20{2}/g;
-const NEWLINE_REGEXP = /\n/g;
-
-function createHtmlDocument(status, message) {
-    let body = escapeExpression(message)
-        .replace(NEWLINE_REGEXP, '<br>')
-        .replace(DOUBLE_SPACE_REGEXP, ' &nbsp;');
-
-    return `<!DOCTYPE html>\n
-       <html lang="en">\n
-       <head>\n
-       <meta charset="utf-8">\n
-       <title>${status} Error</title>\n
-       </head>\n
-       <body>\n
-       <pre>${status} ${body}</pre>\n
-       </body>\n
-       </html>\n`;
-}
-
-_private.HTMLErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    return res.send(createHtmlDocument(res.statusCode, err.stack));
-};
-
-_private.BasicErrorRenderer = (err, req, res, next) => { // eslint-disable-line no-unused-vars
-    return res.send(res.statusCode + ' ' + err.stack);
-};
-
-errorHandler.resourceNotFound = (req, res, next) => {
-    // TODO, handle unknown resources & methods differently, so that we can also produce
-    // 405 Method Not Allowed
+module.exports.resourceNotFound = (req, res, next) => {
     next(new errors.NotFoundError({message: tpl(messages.resourceNotFound)}));
 };
 
-errorHandler.pageNotFound = (req, res, next) => {
+module.exports.pageNotFound = (req, res, next) => {
     next(new errors.NotFoundError({message: tpl(messages.pageNotFound)}));
 };
 
-errorHandler.handleJSONResponse = [
+module.exports.handleJSONResponse = [
     // Make sure the error can be served
-    _private.prepareError,
+    module.exports.prepareError,
     // Handle the error in Sentry
     sentry.errorHandler,
     // Render the error using JSON format
-    _private.JSONErrorRenderer
+    jsonErrorRenderer
 ];
 
-errorHandler.handleJSONResponseV2 = [
+module.exports.handleJSONResponseV2 = [
     // Make sure the error can be served
-    _private.prepareError,
+    module.exports.prepareError,
     // Handle the error in Sentry
     sentry.errorHandler,
     // Render the error using JSON format
-    _private.JSONErrorRendererV2
+    jsonErrorRendererV2
 ];
 
-errorHandler.handleHTMLResponse = [
+module.exports.handleHTMLResponse = [
     // Make sure the error can be served
-    _private.prepareError,
+    module.exports.prepareError,
     // Handle the error in Sentry
-    sentry.errorHandler,
-    // Render the error using HTML format
-    _private.HTMLErrorRenderer,
-    // Fall back to basic if HTML is not explicitly accepted
-    _private.BasicErrorRenderer
+    sentry.errorHandler
 ];
-
-errorHandler.handleThemeResponse = [
-    // Make sure the error can be served
-    _private.prepareError,
-    // Handle the error in Sentry
-    sentry.errorHandler,
-    // Render the error using theme template
-    _private.ThemeErrorRenderer,
-    // Fall back to basic if HTML is not explicitly accepted
-    _private.BasicErrorRenderer
-];
-
-module.exports = errorHandler;

package/core/shared/config/defaults.json

@@ -131,7 +131,13 @@
         "version": "1.12"
     },
     "tenor": {
-        "apiKey": null,
+        "publicReadOnlyApiKey": null,
         "contentFilter": "off"
+    },
+    "opensea": {
+        "privateReadOnlyApiKey": null
+    },
+    "twitter": {
+        "privateReadOnlyToken": null
     }
 }

package/core/shared/labs.js

@@ -15,7 +15,8 @@ const messages = {
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
-    'customThemeSettings'
+    'customThemeSettings',
+    'nftCard'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -33,11 +34,8 @@ const ALPHA_FEATURES = [
     'mediaAPI',
     'filesAPI',
     'membersAutoLogin',
-    'buttonCard',
     'calloutCard',
-    'nftCard',
     'accordionCard',
-    'gifsCard',
     'fileCard',
     'audioCard',
     'videoCard',
@@ -107,6 +105,7 @@ module.exports.enabledHelper = function enabledHelper(options, callback) {
     });
     errDetails.help = tpl(options.errorHelp || messages.errorHelp, {url: options.helpUrl});
 
+    // eslint-disable-next-line no-restricted-syntax
     logging.error(new errors.DisabledFeatureError(errDetails));
 
     const {SafeString} = require('express-hbs');