ghost 4.18.0 → 4.20.1

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

@@ -70,7 +70,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         All the best!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -88,7 +87,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         See you soon!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -122,7 +120,6 @@ function createApiInstance(config) {
                         For your security, the link will expire in 24 hours time.
 
                         See you soon!
-                        The team at ${siteTitle}
 
                         ---
 
@@ -180,6 +177,8 @@ function createApiInstance(config) {
             MemberStatusEvent: models.MemberStatusEvent,
             MemberProductEvent: models.MemberProductEvent,
             MemberAnalyticEvent: models.MemberAnalyticEvent,
+            OfferRedemption: models.OfferRedemption,
+            Offer: models.Offer,
             StripeProduct: models.StripeProduct,
             StripePrice: models.StripePrice,
             Product: models.Product,
@@ -187,7 +186,7 @@ function createApiInstance(config) {
         },
         stripeAPIService: stripeService.api,
         logger: logging,
-        offerRepository: offersService.repository,
+        offersAPI: offersService.api,
         labsService: labsService
     });
 

package/core/server/services/members/emails/signin.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top:0; color: #3A464C;">${url}</p>

package/core/server/services/members/emails/signup.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 30px;">See you soon!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; line-height: 25px; margin: 0; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top: 0; color: #3A464C;">${url}</p>

package/core/server/services/members/emails/subscribe.js

@@ -134,7 +134,7 @@ module.exports = ({siteTitle, email, url, accentColor = '#15212A', siteDomain, s
                           </tbody>
                         </table>
                         <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 25px;">For your security, the link will expire in 24 hours time.</p>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 30px;">All the best!<br/>The team at ${siteTitle}</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 30px;">All the best!</p>
                         <hr/>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 5px;">You can also copy & paste this URL into your browser:</p>
                         <p style="word-break: break-all; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 25px; margin-top: 0; color: #3A464C;">${url}</p>

package/core/server/services/members/middleware.js

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const membersService = require('./service');
+const offersService = require('../offers/service');
 const urlUtils = require('../../../shared/url-utils');
 const ghostVersion = require('@tryghost/version');
 const settingsCache = require('../../../shared/settings-cache');
@@ -58,6 +59,14 @@ const getMemberData = async function (req, res) {
     }
 };
 
+const getOfferData = async function (req, res) {
+    const offerId = req.params.id;
+    const offer = await offersService.api.getOffer({id: offerId});
+    return res.json({
+        offers: [offer]
+    });
+};
+
 const updateMemberData = async function (req, res) {
     try {
         const data = _.pick(req.body, 'name', 'subscribed');
@@ -222,6 +231,7 @@ module.exports = {
     createSessionFromMagicLink,
     getIdentityToken,
     getMemberData,
+    getOfferData,
     updateMemberData,
     getMemberSiteData,
     deleteSession,

package/core/server/services/members/service.js

@@ -61,7 +61,8 @@ function reconfigureMembersAPI() {
  */
 const fetchImportThreshold = async () => {
     const membersTotal = await membersService.stats.getTotalMembers();
-    const volumeThreshold = _.get(config.get('hostSettings'), 'emailVerification.importThreshold') || Infinity;
+    const configThreshold = _.get(config.get('hostSettings'), 'emailVerification.importThreshold');
+    const volumeThreshold = (configThreshold === undefined) ? Infinity : configThreshold;
     const threshold = Math.max(membersTotal, volumeThreshold);
 
     return threshold;

package/core/server/services/notifications/index.js

@@ -5,6 +5,6 @@ const models = require('../../models');
 
 module.exports.notifications = new Notifications({
     settingsCache,
-    ghostVersion,
+    ghostVersion: ghostVersion.full,
     SettingsModel: models.Settings
 });

package/core/server/services/notifications/notifications.js

@@ -16,8 +16,7 @@ class Notifications {
      *
      * @param {Object} options
      * @param {Object} options.settingsCache - settings cache instance
-     * @param {Object} options.ghostVersion
-     * @param {String} options.ghostVersion.full - Ghost instance version in "full" format - major.minor.patch
+     * @param {String} options.ghostVersion - Ghost instance version in "full" format - major.minor.patch
      * @param {Object} options.SettingsModel - Ghost's Setting model instance
      */
     constructor({settingsCache, ghostVersion, SettingsModel}) {
@@ -75,40 +74,45 @@ class Notifications {
     browse({user}) {
         let allNotifications = this.fetchAllNotifications();
         allNotifications = _.orderBy(allNotifications, 'addedAt', 'desc');
+        const blogVersion = this.ghostVersion.match(/^(\d+\.)(\d+\.)(\d+)/);
 
         allNotifications = allNotifications.filter((notification) => {
-            // NOTE: Filtering by version below is just a patch for bigger problem - notifications are not removed
-            //       after Ghost update. Logic below should be removed when Ghost upgrade detection
-            //       is done (https://github.com/TryGhost/Ghost/issues/10236) and notifications are
-            //       be removed permanently on upgrade event.
-            const ghostMajorRegEx = /Ghost (?<major>\d).0 is now available/gi;
-            const ghostSec43 = /GHSA-9fgx-q25h-jxrg/gi;
-
-            // CASE: do not return old release notification
-            if (notification.message
-                && (!notification.custom || notification.message.match(ghostMajorRegEx) || notification.message.match(ghostSec43))) {
-                let notificationVersion = notification.message.match(/(\d+\.)(\d+\.)(\d+)/);
-
-                if (!notificationVersion && notification.message.match(ghostSec43)) {
-                    // Treating "GHSA-9fgx-q25h-jxrg" notification as 4.3.3 because there's no way to detect version
-                    // from it's message. In the future we should consider having a separate field with version
-                    // coming with each notification
-                    notificationVersion = ['4.3.3'];
-                }
-
-                const ghostMajorMatch = ghostMajorRegEx.exec(notification.message);
-                if (ghostMajorMatch && ghostMajorMatch.groups && ghostMajorMatch.groups.major) {
-                    notificationVersion = `${ghostMajorMatch.groups.major}.0.0`;
-                } else if (notificationVersion){
-                    notificationVersion = notificationVersion[0];
-                }
-
-                const blogVersion = this.ghostVersion.full.match(/^(\d+\.)(\d+\.)(\d+)/);
-
-                if (notificationVersion && blogVersion && semver.gt(notificationVersion, blogVersion[0])) {
-                    return true;
-                } else {
-                    return false;
+            if (notification.createdAtVersion && !this.wasSeen(notification, user)) {
+                return semver.gte(notification.createdAtVersion, blogVersion[0]);
+            } else {
+                // NOTE: Filtering by version below is just a patch for bigger problem - notifications are not removed
+                //       after Ghost update. Logic below should be removed when Ghost upgrade detection
+                //       is done (https://github.com/TryGhost/Ghost/issues/10236) and notifications are
+                //       be removed permanently on upgrade event.
+                // NOTE: this whole else block can be removed with the first version after Ghost v5.0
+                //       as the "createdAtVersion" mechanism will be enough to detect major version updates.
+                const ghostMajorRegEx = /Ghost (?<major>\d).0 is now available/gi;
+                const ghostSec43 = /GHSA-9fgx-q25h-jxrg/gi;
+
+                // CASE: do not return old release notification
+                if (notification.message
+                    && (!notification.custom || notification.message.match(ghostMajorRegEx) || notification.message.match(ghostSec43))) {
+                    let notificationVersion = notification.message.match(/(\d+\.)(\d+\.)(\d+)/);
+
+                    if (!notificationVersion && notification.message.match(ghostSec43)) {
+                        // Treating "GHSA-9fgx-q25h-jxrg" notification as 4.3.3 because there's no way to detect version
+                        // from it's message. In the future we should consider having a separate field with version
+                        // coming with each notification
+                        notificationVersion = ['4.3.3'];
+                    }
+
+                    const ghostMajorMatch = ghostMajorRegEx.exec(notification.message);
+                    if (ghostMajorMatch && ghostMajorMatch.groups && ghostMajorMatch.groups.major) {
+                        notificationVersion = `${ghostMajorMatch.groups.major}.0.0`;
+                    } else if (notificationVersion){
+                        notificationVersion = notificationVersion[0];
+                    }
+
+                    if (notificationVersion && blogVersion && semver.gt(notificationVersion, blogVersion[0])) {
+                        return true;
+                    } else {
+                        return false;
+                    }
                 }
             }
 
@@ -123,7 +127,8 @@ class Notifications {
             dismissible: true,
             location: 'bottom',
             status: 'alert',
-            id: ObjectId().toHexString()
+            id: ObjectId().toHexString(),
+            createdAtVersion: this.ghostVersion
         };
 
         const overrides = {

package/core/server/services/oembed.js

@@ -1,5 +1,6 @@
 const Promise = require('bluebird');
 const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
 const {extract, hasProvider} = require('oembed-parser');
 const cheerio = require('cheerio');
 const _ = require('lodash');
@@ -34,10 +35,6 @@ const findUrlWithProvider = (url) => {
     return {url, provider};
 };
 
-/**
- * @typedef {(string: string) => string} ITpl
- */
-
 /**
  * @typedef {Object} IConfig
  * @prop {(key: string) => string} get
@@ -51,19 +48,17 @@ class OEmbed {
     /**
      *
      * @param {Object} dependencies
-     * @param {ITpl} dependencies.tpl
      * @param {IConfig} dependencies.config
      * @param {IExternalRequest} dependencies.externalRequest
      */
-    constructor({config, externalRequest, tpl}) {
+    constructor({config, externalRequest}) {
         this.config = config;
         this.externalRequest = externalRequest;
-        this.tpl = tpl;
     }
 
     unknownProvider(url) {
         return Promise.reject(new errors.ValidationError({
-            message: this.tpl(messages.unknownProvider),
+            message: tpl(messages.unknownProvider),
             context: url
         }));
     }
@@ -133,7 +128,7 @@ class OEmbed {
         }
 
         return Promise.reject(new errors.ValidationError({
-            message: this.tpl(messages.insufficientMetadata),
+            message: tpl(messages.insufficientMetadata),
             context: url
         }));
     }

package/core/server/services/offers/service.js

@@ -11,33 +11,43 @@ const urlUtils = require('../../../shared/url-utils');
 const models = require('../../models');
 
 const redirectManager = new DynamicRedirectManager({
-    permanentMaxAge: config.get('caching:customRedirects:maxAge')
-}, urlUtils);
+    permanentMaxAge: config.get('caching:customRedirects:maxAge'),
+    getSubdirectoryURL: (pathname) => {
+        return urlUtils.urlJoin(urlUtils.getSubdir(), pathname);
+    }
+});
 
 module.exports = {
     async init() {
         const offersModule = OffersModule.create({
             OfferModel: models.Offer,
+            OfferRedemptionModel: models.OfferRedemption,
             redirectManager: redirectManager,
             stripeAPIService: stripeService.api
         });
 
         this.api = offersModule.api;
-        this.repository = offersModule.repository;
 
+        let initCalled = false;
         if (labs.isSet('offers')) {
             // handles setting up redirects
-            await offersModule.init();
+            const promise = offersModule.init();
+            initCalled = true;
+            await promise;
         }
 
         // TODO: Delete after GA
         let offersEnabled = labs.isSet('offers');
         events.on('settings.labs.edited', async () => {
-            if (labs.isSet('offers') !== offersEnabled) {
+            if (labs.isSet('offers') && !initCalled) {
+                const promise = offersModule.init();
+                initCalled = true;
+                await promise;
+            } else if (labs.isSet('offers') !== offersEnabled) {
                 offersEnabled = labs.isSet('offers');
 
                 if (offersEnabled) {
-                    const offers = await this.api.listOffers();
+                    const offers = await this.api.listOffers({});
                     for (const offer of offers) {
                         redirectManager.addRedirect(`/${offer.code}`, `/#/portal/offers/${offer.id}`, {permanent: false});
                     }

package/core/server/services/permissions/public.js

@@ -1,10 +1,14 @@
 const _ = require('lodash');
 const Promise = require('bluebird');
 const errors = require('@tryghost/errors');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const parseContext = require('./parse-context');
 const _private = {};
 
+const messages = {
+    error: 'You do not have permission to retrieve {docName} with that status'
+};
+
 /**
  * @TODO:
  *
@@ -17,7 +21,7 @@ const _private = {};
  * - public context cannot fetch draft/scheduled posts
  */
 _private.applyStatusRules = function applyStatusRules(docName, method, opts) {
-    const err = new errors.NoPermissionError({message: i18n.t('errors.permissions.applyStatusRules.error', {docName: docName})});
+    const err = new errors.NoPermissionError({message: tpl(messages.error, {docName: docName})});
 
     // Enforce status 'active' for users
     if (docName === 'users') {

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

@@ -3,7 +3,7 @@ const moment = require('moment-timezone');
 const fs = require('fs-extra');
 const path = require('path');
 const crypto = require('crypto');
-const urlService = require('../../../frontend/services/url');
+const urlService = require('../url');
 
 const debug = require('@tryghost/debug')('services:route-settings');
 const errors = require('@tryghost/errors');

package/core/server/services/settings/index.js

@@ -4,6 +4,7 @@
  */
 const events = require('../../lib/common/events');
 const models = require('../../models');
+const labs = require('../../../shared/labs');
 const SettingsCache = require('../../../shared/settings-cache');
 const SettingsBREADService = require('./settings-bread-service');
 const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./settings-utils');
@@ -14,7 +15,8 @@ const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./setti
 const getSettingsBREADServiceInstance = () => {
     return new SettingsBREADService({
         SettingsModel: models.Settings,
-        settingsCache: SettingsCache
+        settingsCache: SettingsCache,
+        labsService: labs
     });
 };
 

package/core/server/services/settings/settings-bread-service.js

@@ -14,10 +14,12 @@ class SettingsBREADService {
      * @param {Object} options
      * @param {Object} options.SettingsModel
      * @param {Object} options.settingsCache - SettingsCache instance
+     * @param {Object} options.labsService - labs service instance
      */
-    constructor({SettingsModel, settingsCache}) {
+    constructor({SettingsModel, settingsCache, labsService}) {
         this.SettingsModel = SettingsModel;
         this.settingsCache = settingsCache;
+        this.labs = labsService;
     }
 
     /**
@@ -28,24 +30,7 @@ class SettingsBREADService {
     browse(context) {
         let settings = this.settingsCache.getAll();
 
-        // CASE: no context passed (functional call)
-        if (!context) {
-            return Promise.resolve(settings.filter((setting) => {
-                return setting.group === 'site';
-            }));
-        }
-
-        if (!context.internal) {
-            // CASE: omit core settings unless internal request
-            settings = _.filter(settings, (setting) => {
-                const isCore = setting.group === 'core';
-                return !isCore;
-            });
-            // CASE: omit secret settings unless internal request
-            settings = settings.map(hideValueIfSecret);
-        }
-
-        return settings;
+        return this._formatBrowse(settings, context);
     }
 
     /**
@@ -86,6 +71,12 @@ class SettingsBREADService {
             }));
         }
 
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        if (setting.key === 'labs') {
+            setting.value = JSON.stringify(this.labs.getAll());
+        }
+
         setting = hideValueIfSecret(setting);
 
         return {
@@ -161,7 +152,9 @@ class SettingsBREADService {
             });
         }
 
-        return this.SettingsModel.edit(filteredSettings, options);
+        return this.SettingsModel.edit(filteredSettings, options).then((result) => {
+            return this._formatBrowse(_.keyBy(_.invokeMap(result, 'toJSON'), 'key'), options.context);
+        });
     }
 
     /**
@@ -183,6 +176,35 @@ class SettingsBREADService {
             }
         }
     }
+
+    _formatBrowse(inputSettings, context) {
+        let settings = _.values(inputSettings);
+        // CASE: no context passed (functional call)
+        if (!context) {
+            return Promise.resolve(settings.filter((setting) => {
+                return setting.group === 'site';
+            }));
+        }
+
+        if (!context.internal) {
+            // CASE: omit core settings unless internal request
+            settings = _.filter(settings, (setting) => {
+                const isCore = setting.group === 'core';
+                return !isCore;
+            });
+            // CASE: omit secret settings unless internal request
+            settings = settings.map(hideValueIfSecret);
+        }
+
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        const labsSetting = settings.find(setting => setting.key === 'labs');
+        if (labsSetting) {
+            labsSetting.value = JSON.stringify(this.labs.getAll());
+        }
+
+        return settings;
+    }
 }
 
 module.exports = SettingsBREADService;

package/core/server/services/slack.js

@@ -4,7 +4,7 @@ const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');
 const {blogIcon} = require('../lib/image');
 const urlUtils = require('../../shared/url-utils');
-const urlService = require('../../frontend/services/url');
+const urlService = require('./url');
 const settingsCache = require('../../shared/settings-cache');
 const schema = require('../data/schema').checks;
 const moment = require('moment');

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

@@ -30,7 +30,7 @@ module.exports.loadAndActivate = async (themeName) => {
             logging.warn(validate.getThemeValidationError('activeThemeHasErrors', themeName, checkedTheme));
         }
 
-        activator.activateFromBoot(themeName, loadedTheme, checkedTheme);
+        await activator.activateFromBoot(themeName, loadedTheme, checkedTheme);
     } catch (err) {
         if (err instanceof errors.NotFoundError) {
             // CASE: active theme is missing, we don't want to exit because the admin panel will still work
@@ -56,7 +56,7 @@ module.exports.activate = async (themeName) => {
     // Validate
     const checkedTheme = await validate.checkSafe(themeName, loadedTheme);
     // Activate
-    activator.activateFromAPI(themeName, loadedTheme, checkedTheme);
+    await activator.activateFromAPI(themeName, loadedTheme, checkedTheme);
     // Return the checked theme
     return checkedTheme;
 };

package/core/server/services/themes/activation-bridge.js

@@ -8,27 +8,27 @@ const customThemeSettings = require('../custom-theme-settings');
  * And also adds a little debug statement, which is very handy when debugging theme logic
  */
 module.exports = {
-    activateFromBoot: (themeName, theme, checkedTheme) => {
+    activateFromBoot: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method A on boot)', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     },
-    activateFromAPI: (themeName, theme, checkedTheme) => {
+    activateFromAPI: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method B on API "activate")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     },
-    activateFromAPIOverride: (themeName, theme, checkedTheme) => {
+    activateFromAPIOverride: async (themeName, theme, checkedTheme) => {
         debug('Activating theme (method C on API "override")', themeName);
         // TODO: probably a better place for this to happen - after successful activation / when reloading site?
         if (labs.isSet('customThemeSettings')) {
-            customThemeSettings.activateTheme(checkedTheme);
+            await customThemeSettings.api.activateTheme(themeName, checkedTheme);
         }
         bridge.activateTheme(theme, checkedTheme);
     }

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

@@ -83,7 +83,7 @@ module.exports = {
             // CASE: if this is the active theme, we are overriding
             if (overrideTheme) {
                 debug('setFromZip Theme is active already');
-                activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme);
+                await activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme);
             }
 
             // @TODO: unify the name across gscan and Ghost!

package/core/{frontend → server}/services/url/Resources.js

@@ -3,10 +3,10 @@ const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('services:url:resources');
 const Resource = require('./Resource');
 const config = require('../../../shared/config');
-const models = require('../../../server/models');
+const models = require('../../models');
 
 // This listens to all manner of model events to find new content that needs a URL...
-const events = require('../../../server/lib/common/events');
+const events = require('../../lib/common/events');
 
 /**
  * @description At the moment the resources class is directly responsible for data population

package/core/{frontend → server}/services/url/UrlGenerator.js

@@ -68,24 +68,24 @@ class UrlGenerator {
     }
 
     /**
-     * @description Helper function to register listeners for each url generator instance.
-     * @private
+     * @NOTE: currently only used if the permalink setting changes and it's used for this url generator.
+     * @TODO: https://github.com/TryGhost/Ghost/issues/10699
      */
-    _listeners() {
-        /**
-         * @NOTE: currently only used if the permalink setting changes and it's used for this url generator.
-         * @TODO: https://github.com/TryGhost/Ghost/issues/10699
-         */
-        this.router.addListener('updated', () => {
-            const myResources = this.urls.getByGeneratorId(this.uid);
+    regenerateResources() {
+        const myResources = this.urls.getByGeneratorId(this.uid);
 
-            myResources.forEach((object) => {
-                this.urls.removeResourceId(object.resource.data.id);
-                object.resource.release();
-                this._try(object.resource);
-            });
+        myResources.forEach((object) => {
+            this.urls.removeResourceId(object.resource.data.id);
+            object.resource.release();
+            this._try(object.resource);
         });
+    }
 
+    /**
+     * @description Helper function to register listeners for each url generator instance.
+     * @private
+     */
+    _listeners() {
         /**
          * Listen on two events:
          *