ghost 4.18.0 → 4.20.1

package/core/server/api/v2/utils/validators/input/images.js

@@ -1,9 +1,14 @@
 const jsonSchema = require('../utils/json-schema');
 const config = require('../../../../../../shared/config');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {imageSize, blogIcon} = require('../../../../../lib/image');
 
+const messages = {
+    isNotSquare: 'Please select a valid image file with square dimensions.',
+    invalidFile: 'Please select a valid image.'
+};
+
 const profileImage = (frame) => {
     return imageSize.getImageSizeFromPath(frame.file.path).then((response) => {
         // save the image dimensions in new property for file
@@ -12,7 +17,7 @@ const profileImage = (frame) => {
         // CASE: file needs to be a square
         if (frame.file.dimensions.width !== frame.file.dimensions.height) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.images.isNotSquare')
+                message: tpl(messages.isNotSquare)
             }));
         }
     });
@@ -28,7 +33,7 @@ const icon = (frame) => {
     // CASE: file should not be larger than 100kb
     if (!validIconFileSize(frame.file.size)) {
         return Promise.reject(new errors.ValidationError({
-            message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+            message: tpl(messages.invalidFile, {extensions: iconExtensions})
         }));
     }
 
@@ -39,7 +44,7 @@ const icon = (frame) => {
         // CASE: file needs to be a square
         if (frame.file.dimensions.width !== frame.file.dimensions.height) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
 
@@ -47,14 +52,14 @@ const icon = (frame) => {
         // .ico files can contain multiple sizes, we need at least a minimum of 60px (16px is ok, as long as 60px are present as well)
         if (frame.file.dimensions.width < 60) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
 
         // CASE: icon needs to be smaller than or equal to 1000px
         if (frame.file.dimensions.width > 1000) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.api.icons.invalidFile', {extensions: iconExtensions})
+                message: tpl(messages.invalidFile, {extensions: iconExtensions})
             }));
         }
     });

package/core/server/api/v2/utils/validators/input/invitations.js

@@ -1,9 +1,17 @@
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:v2:utils:validators:input:invitation');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    noTokenProvided: 'No token provided.',
+    noEmailProvided: 'No email provided.',
+    noPasswordProvided: 'No password provided.',
+    noNameProvided: 'No name provided.',
+    invalidEmailReceived: 'The server did not receive a valid email'
+};
+
 module.exports = {
     acceptInvitation(apiConfig, frame) {
         debug('acceptInvitation');
@@ -11,19 +19,19 @@ module.exports = {
         const data = frame.data.invitation[0];
 
         if (!data.token) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noTokenProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noTokenProvided)}));
         }
 
         if (!data.email) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noEmailProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noEmailProvided)}));
         }
 
         if (!data.password) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noPasswordProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noPasswordProvided)}));
         }
 
         if (!data.name) {
-            return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noNameProvided')}));
+            return Promise.reject(new errors.ValidationError({message: tpl(messages.noNameProvided)}));
         }
     },
 
@@ -34,7 +42,7 @@ module.exports = {
 
         if (typeof email !== 'string' || !validator.isEmail(email)) {
             throw new errors.BadRequestError({
-                message: i18n.t('errors.api.authentication.invalidEmailReceived')
+                message: tpl(messages.invalidEmailReceived)
             });
         }
     }

package/core/server/api/v2/utils/validators/input/invites.js

@@ -1,15 +1,19 @@
 const Promise = require('bluebird');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../../../../models');
 
+const messages = {
+    userAlreadyRegistered: 'User is already registered.'
+};
+
 module.exports = {
     add(apiConfig, frame) {
         return models.User.findOne({email: frame.data.invites[0].email}, frame.options)
             .then((user) => {
                 if (user) {
                     return Promise.reject(new errors.ValidationError({
-                        message: i18n.t('errors.api.users.userAlreadyRegistered')
+                        message: tpl(messages.userAlreadyRegistered)
                     }));
                 }
             });

package/core/server/api/v2/utils/validators/input/oembed.js

@@ -1,12 +1,16 @@
 const Promise = require('bluebird');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    noUrlProvided: 'No url provided.'
+};
+
 module.exports = {
     read(apiConfig, frame) {
         if (!frame.data.url || !frame.data.url.trim()) {
             return Promise.reject(new errors.BadRequestError({
-                message: i18n.t('errors.api.oembed.noUrlProvided')
+                message: tpl(messages.noUrlProvided)
             }));
         }
     }

package/core/server/api/v2/utils/validators/input/passwordreset.js

@@ -1,9 +1,14 @@
 const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:v2:utils:validators:input:passwordreset');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    newPasswordsDoNotMatch: 'Your new passwords do not match',
+    invalidEmailReceived: 'The server did not receive a valid email'
+};
+
 module.exports = {
     resetPassword(apiConfig, frame) {
         debug('resetPassword');
@@ -12,7 +17,7 @@ module.exports = {
 
         if (data.newPassword !== data.ne2Password) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.models.user.newPasswordsDoNotMatch')
+                message: tpl(messages.newPasswordsDoNotMatch)
             }));
         }
     },
@@ -24,7 +29,7 @@ module.exports = {
 
         if (typeof email !== 'string' || !validator.isEmail(email)) {
             throw new errors.BadRequestError({
-                message: i18n.t('errors.api.authentication.invalidEmailReceived')
+                message: tpl(messages.invalidEmailReceived)
             });
         }
     }

package/core/server/api/v2/utils/validators/input/settings.js

@@ -1,8 +1,14 @@
 const Promise = require('bluebird');
 const _ = require('lodash');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const {BadRequestError, ValidationError} = require('@tryghost/errors');
 
+const messages = {
+    error: 'Attempted to change active_theme via settings API',
+    help: 'Please activate theme via the themes API endpoints instead',
+    schemaValidationFailed: 'Validation failed for \'{key}\'.'
+};
+
 module.exports = {
     edit(apiConfig, frame) {
         const errors = [];
@@ -12,8 +18,8 @@ module.exports = {
                 // @NOTE: active theme has to be changed via theme endpoints
                 errors.push(
                     new BadRequestError({
-                        message: i18n.t('errors.api.settings.activeThemeSetViaAPI.error'),
-                        help: i18n.t('errors.api.settings.activeThemeSetViaAPI.help')
+                        message: tpl(messages.error),
+                        help: tpl(messages.help)
                     })
                 );
             }
@@ -25,7 +31,7 @@ module.exports = {
                 } catch (e) {
                     errors.push(
                         new ValidationError({
-                            message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
+                            message: tpl(messages.schemaValidationFailed, {
                                 key: 'unsplash'
                             }),
                             property: 'unsplash'

package/core/server/api/v2/utils/validators/input/setup.js

@@ -1,13 +1,17 @@
 const debug = require('@tryghost/debug')('api:v2:utils:validators:input:updateSetup');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 
+const messages = {
+    notTheBlogOwner: 'You are not the site owner.'
+};
+
 module.exports = {
     updateSetup(apiConfig, frame) {
         debug('resetPassword');
 
         if (!frame.options.context || !frame.options.context.user) {
-            throw new errors.NoPermissionError({message: i18n.t('errors.api.authentication.notTheBlogOwner')});
+            throw new errors.NoPermissionError({message: tpl(messages.notTheBlogOwner)});
         }
     }
 };

package/core/server/api/v2/utils/validators/input/users.js

@@ -1,7 +1,10 @@
 const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('api:v2:utils:validators:input:users');
-const i18n = require('../../../../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const messages = {
+    newPasswordsDoNotMatch: 'Your new passwords do not match'
+};
 
 module.exports = {
     changePassword(apiConfig, frame) {
@@ -11,7 +14,7 @@ module.exports = {
 
         if (data.newPassword !== data.ne2Password) {
             return Promise.reject(new errors.ValidationError({
-                message: i18n.t('errors.models.user.newPasswordsDoNotMatch')
+                message: tpl(messages.newPasswordsDoNotMatch)
             }));
         }
     }

package/core/server/api/v3/authentication.js

@@ -1,11 +1,15 @@
 const api = require('./index');
 const config = require('../../../shared/config');
-const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const web = require('../../web');
 const models = require('../../models');
 const auth = require('../../services/auth');
 const invitations = require('../../services/invitations');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    notTheBlogOwner: 'You are not the site owner.'
+};
 
 module.exports = {
     docName: 'authentication',
@@ -50,7 +54,7 @@ module.exports = {
             return models.User.findOne({role: 'Owner', status: 'all'})
                 .then((owner) => {
                     if (owner.id !== frame.options.context.user) {
-                        throw new errors.NoPermissionError({message: i18n.t('errors.api.authentication.notTheBlogOwner')});
+                        throw new errors.NoPermissionError({message: tpl(messages.notTheBlogOwner)});
                     }
                 });
         },

package/core/server/api/v3/authors-public.js

@@ -1,8 +1,12 @@
 const Promise = require('bluebird');
-const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const ALLOWED_INCLUDES = ['count.posts'];
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    notFound: 'Author not found.'
+};
 
 module.exports = {
     docName: 'authors',
@@ -54,7 +58,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         return Promise.reject(new errors.NotFoundError({
-                            message: i18n.t('errors.api.authors.notFound')
+                            message: tpl(messages.notFound)
                         }));
                     }
 

package/core/server/api/v3/email.js

@@ -1,7 +1,12 @@
 const models = require('../../models');
-const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const megaService = require('../../services/mega');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    emailNotFound: 'Email not found.',
+    retryNotAllowed: 'Only failed emails can be retried'
+};
 
 module.exports = {
     docName: 'emails',
@@ -24,7 +29,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.models.email.emailNotFound')
+                            message: tpl(messages.emailNotFound)
                         });
                     }
 
@@ -43,13 +48,13 @@ module.exports = {
                 .then(async (model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.models.email.emailNotFound')
+                            message: tpl(messages.emailNotFound)
                         });
                     }
 
                     if (model.get('status') !== 'failed') {
                         throw new errors.IncorrectUsageError({
-                            message: i18n.t('errors.models.email.retryNotAllowed')
+                            message: tpl(messages.retryNotAllowed)
                         });
                     }
 

package/core/server/api/v3/images.js

@@ -7,7 +7,7 @@ module.exports = {
         statusCode: 201,
         permissions: false,
         query(frame) {
-            const store = storage.getStorage();
+            const store = storage.getStorage('images');
 
             if (frame.files) {
                 return Promise

package/core/server/api/v3/integrations.js

@@ -1,6 +1,6 @@
-const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
+const tpl = require('@tryghost/tpl');
 const getIntegrationsServiceInstance = require('../../services/integrations/integrations-service');
 
 const integrationsService = getIntegrationsServiceInstance({
@@ -8,6 +8,10 @@ const integrationsService = getIntegrationsServiceInstance({
     ApiKeyModel: models.ApiKey
 });
 
+const messages = {
+    resourceNotFound: '{resource} not found.'
+};
+
 module.exports = {
     docName: 'integrations',
     browse: {
@@ -51,7 +55,7 @@ module.exports = {
             return models.Integration.findOne(data, Object.assign(options, {require: true}))
                 .catch(models.Integration.NotFoundError, () => {
                     throw new errors.NotFoundError({
-                        message: i18n.t('errors.api.resource.resourceNotFound', {
+                        message: tpl(messages.resourceNotFound, {
                             resource: 'Integration'
                         })
                     });
@@ -136,7 +140,7 @@ module.exports = {
             return models.Integration.destroy(Object.assign(options, {require: true}))
                 .catch(models.Integration.NotFoundError, () => {
                     return Promise.reject(new errors.NotFoundError({
-                        message: i18n.t('errors.api.resource.resourceNotFound', {
+                        message: tpl(messages.resourceNotFound, {
                             resource: 'Integration'
                         })
                     }));

package/core/server/api/v3/invites.js

@@ -1,11 +1,14 @@
 const Promise = require('bluebird');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const invites = require('../../services/invites');
 const models = require('../../models');
 const api = require('./index');
 const ALLOWED_INCLUDES = [];
 const UNSAFE_ATTRS = ['role_id'];
+const messages = {
+    inviteNotFound: 'Invite not found.'
+};
 
 module.exports = {
     docName: 'invites',
@@ -50,7 +53,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         return Promise.reject(new errors.NotFoundError({
-                            message: i18n.t('errors.api.invites.inviteNotFound')
+                            message: tpl(messages.inviteNotFound)
                         }));
                     }
 
@@ -78,7 +81,7 @@ module.exports = {
                 .then(() => null)
                 .catch(models.Invite.NotFoundError, () => {
                     return Promise.reject(new errors.NotFoundError({
-                        message: i18n.t('errors.api.invites.inviteNotFound')
+                        message: tpl(messages.inviteNotFound)
                     }));
                 });
         }

package/core/server/api/v3/labels.js

@@ -1,7 +1,12 @@
 const Promise = require('bluebird');
-const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    labelNotFound: 'Label not found.',
+    labelAlreadyExists: 'Label already exists'
+};
 
 const ALLOWED_INCLUDES = ['count.members'];
 
@@ -53,7 +58,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         return Promise.reject(new errors.NotFoundError({
-                            message: i18n.t('errors.api.labels.labelNotFound')
+                            message: tpl(messages.labelNotFound)
                         }));
                     }
 
@@ -80,7 +85,7 @@ module.exports = {
             return models.Label.add(frame.data.labels[0], frame.options)
                 .catch((error) => {
                     if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
-                        throw new errors.ValidationError({message: i18n.t('errors.api.labels.labelAlreadyExists')});
+                        throw new errors.ValidationError({message: tpl(messages.labelAlreadyExists)});
                     }
 
                     throw error;
@@ -110,7 +115,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         return Promise.reject(new errors.NotFoundError({
-                            message: i18n.t('errors.api.labels.labelNotFound')
+                            message: tpl(messages.labelNotFound)
                         }));
                     }
 
@@ -149,7 +154,7 @@ module.exports = {
                 .then(() => null)
                 .catch(models.Label.NotFoundError, () => {
                     return Promise.reject(new errors.NotFoundError({
-                        message: i18n.t('errors.api.labels.labelNotFound')
+                        message: tpl(messages.labelNotFound)
                     }));
                 });
         }

package/core/server/api/v3/memberSigninUrls.js

@@ -1,6 +1,9 @@
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const membersService = require('../../services/members');
+const messages = {
+    memberNotFound: 'Member not found.'
+};
 
 module.exports = {
     docName: 'member_signin_urls',
@@ -15,7 +18,7 @@ module.exports = {
 
             if (!model) {
                 throw new errors.NotFoundError({
-                    message: i18n.t('errors.api.members.memberNotFound')
+                    message: tpl(messages.memberNotFound)
                 });
             }
 

package/core/server/api/v3/oembed.js

@@ -1,8 +1,8 @@
 const config = require('../../../shared/config');
 const externalRequest = require('../../lib/request-external');
-const tpl = require('@tryghost/tpl');
+
 const OEmbed = require('../../services/oembed');
-const oembed = new OEmbed({config, externalRequest, tpl});
+const oembed = new OEmbed({config, externalRequest});
 
 module.exports = {
     docName: 'oembed',

package/core/server/api/v3/pages-public.js

@@ -1,7 +1,10 @@
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const ALLOWED_INCLUDES = ['tags', 'authors'];
+const messages = {
+    pageNotFound: 'Page not found'
+};
 
 module.exports = {
     docName: 'pages',
@@ -63,7 +66,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.pages.pageNotFound')
+                            message: tpl(messages.pageNotFound)
                         });
                     }
 

package/core/server/api/v3/pages.js

@@ -1,9 +1,12 @@
 const models = require('../../models');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
 const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles'];
 const UNSAFE_ATTRS = ['status', 'authors', 'visibility'];
+const messages = {
+    pageNotFound: 'Page not found'
+};
 
 const postsService = getPostServiceInstance('v3');
 
@@ -75,7 +78,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.pages.pageNotFound')
+                            message: tpl(messages.pageNotFound)
                         });
                     }
 
@@ -188,7 +191,7 @@ module.exports = {
                 .then(() => null)
                 .catch(models.Post.NotFoundError, () => {
                     return Promise.reject(new errors.NotFoundError({
-                        message: i18n.t('errors.api.pages.pageNotFound')
+                        message: tpl(messages.pageNotFound)
                     }));
                 });
         }

package/core/server/api/v3/posts-public.js

@@ -1,8 +1,10 @@
 const models = require('../../models');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const allowedIncludes = ['tags', 'authors'];
-
+const messages = {
+    postNotFound: 'Post not found.'
+};
 module.exports = {
     docName: 'posts',
 
@@ -63,7 +65,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.posts.postNotFound')
+                            message: tpl(messages.postNotFound)
                         });
                     }
 

package/core/server/api/v3/posts.js

@@ -1,10 +1,14 @@
 const models = require('../../models');
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
 const allowedIncludes = ['tags', 'authors', 'authors.roles', 'email'];
 const unsafeAttrs = ['status', 'authors', 'visibility'];
 
+const messages = {
+    postNotFound: 'Post not found.'
+};
+
 const postsService = getPostServiceInstance('v3');
 
 module.exports = {
@@ -73,7 +77,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.posts.postNotFound')
+                            message: tpl(messages.postNotFound)
                         });
                     }
 
@@ -188,7 +192,7 @@ module.exports = {
                 .then(() => null)
                 .catch(models.Post.NotFoundError, () => {
                     return Promise.reject(new errors.NotFoundError({
-                        message: i18n.t('errors.api.posts.postNotFound')
+                        message: tpl(messages.postNotFound)
                     }));
                 });
         }

package/core/server/api/v3/preview.js

@@ -1,8 +1,10 @@
-const i18n = require('../../../shared/i18n');
+const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const ALLOWED_INCLUDES = ['authors', 'tags'];
-
+const messages = {
+    postNotFound: 'Post not found.'
+};
 module.exports = {
     docName: 'preview',
 
@@ -31,7 +33,7 @@ module.exports = {
                 .then((model) => {
                     if (!model) {
                         throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.posts.postNotFound')
+                            message: tpl(messages.postNotFound)
                         });
                     }