mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
Removed usages of new Error & i18n in legacy code
- cleaning up a handful of usages of i18n and new Error in some really old codepaths - pushing our new patterns forward wherever we can
This commit is contained in:
parent
b94c8bcfd4
commit
6f1a3e1774
4 changed files with 28 additions and 21 deletions
|
@ -2,10 +2,16 @@ const _ = require('lodash');
|
||||||
const Promise = require('bluebird');
|
const Promise = require('bluebird');
|
||||||
const models = require('../../models');
|
const models = require('../../models');
|
||||||
const errors = require('@tryghost/errors');
|
const errors = require('@tryghost/errors');
|
||||||
const i18n = require('../../../shared/i18n');
|
const tpl = require('@tryghost/tpl');
|
||||||
const providers = require('./providers');
|
const providers = require('./providers');
|
||||||
const parseContext = require('./parse-context');
|
const parseContext = require('./parse-context');
|
||||||
const actionsMap = require('./actions-map-cache');
|
const actionsMap = require('./actions-map-cache');
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
noPermissionToAction: 'You do not have permission to perform this action',
|
||||||
|
noActionsMapFoundError: 'No actions map found, ensure you have loaded permissions into database and then call permissions.init() before use.'
|
||||||
|
};
|
||||||
|
|
||||||
let canThis;
|
let canThis;
|
||||||
let CanThisResult;
|
let CanThisResult;
|
||||||
|
|
||||||
|
@ -104,7 +110,7 @@ CanThisResult.prototype.buildObjectTypeHandlers = function (objTypes, actType, c
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Promise.reject(new errors.NoPermissionError({message: i18n.t('errors.permissions.noPermissionToAction')}));
|
return Promise.reject(new errors.NoPermissionError({message: tpl(messages.noPermissionToAction)}));
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -122,7 +128,7 @@ CanThisResult.prototype.beginCheck = function (context) {
|
||||||
context = parseContext(context);
|
context = parseContext(context);
|
||||||
|
|
||||||
if (actionsMap.empty()) {
|
if (actionsMap.empty()) {
|
||||||
throw new Error(i18n.t('errors.permissions.noActionsMapFound.error'));
|
throw new errors.GhostError({message: tpl(messages.noActionsMapFoundError)});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Kick off loading of user permissions if necessary
|
// Kick off loading of user permissions if necessary
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
const errors = require('@tryghost/errors');
|
const errors = require('@tryghost/errors');
|
||||||
const events = require('../lib/common/events');
|
const events = require('../lib/common/events');
|
||||||
const i18n = require('../../shared/i18n');
|
const tpl = require('@tryghost/tpl');
|
||||||
const logging = require('@tryghost/logging');
|
const logging = require('@tryghost/logging');
|
||||||
const request = require('@tryghost/request');
|
const request = require('@tryghost/request');
|
||||||
const {blogIcon} = require('../lib/image');
|
const {blogIcon} = require('../lib/image');
|
||||||
|
@ -10,6 +10,11 @@ const settingsCache = require('../../shared/settings-cache');
|
||||||
const schema = require('../data/schema').checks;
|
const schema = require('../data/schema').checks;
|
||||||
const moment = require('moment');
|
const moment = require('moment');
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
requestFailedError: 'The {service} service was unable to send a ping request, your site will continue to function.',
|
||||||
|
requestFailedHelp: 'If you get this error repeatedly, please seek help on {url}.'
|
||||||
|
};
|
||||||
|
|
||||||
const defaultPostSlugs = [
|
const defaultPostSlugs = [
|
||||||
'welcome',
|
'welcome',
|
||||||
'the-editor',
|
'the-editor',
|
||||||
|
@ -131,8 +136,8 @@ function ping(post) {
|
||||||
}).catch(function (err) {
|
}).catch(function (err) {
|
||||||
logging.error(new errors.GhostError({
|
logging.error(new errors.GhostError({
|
||||||
err: err,
|
err: err,
|
||||||
context: i18n.t('errors.services.ping.requestFailed.error', {service: 'slack'}),
|
context: tpl(messages.requestFailedError, {service: 'slack'}),
|
||||||
help: i18n.t('errors.services.ping.requestFailed.help', {url: 'https://ghost.org/docs/'})
|
help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})
|
||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,12 +4,17 @@ const config = require('../../shared/config');
|
||||||
const urlService = require('../../frontend/services/url');
|
const urlService = require('../../frontend/services/url');
|
||||||
const errors = require('@tryghost/errors');
|
const errors = require('@tryghost/errors');
|
||||||
const events = require('../lib/common/events');
|
const events = require('../lib/common/events');
|
||||||
const i18n = require('../../shared/i18n');
|
const tpl = require('@tryghost/tpl');
|
||||||
const logging = require('@tryghost/logging');
|
const logging = require('@tryghost/logging');
|
||||||
const request = require('@tryghost/request');
|
const request = require('@tryghost/request');
|
||||||
const settingsCache = require('../../shared/settings-cache');
|
const settingsCache = require('../../shared/settings-cache');
|
||||||
const sentry = require('../../shared/sentry');
|
const sentry = require('../../shared/sentry');
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
requestFailedError: 'The {service} service was unable to send a ping request, your site will continue to function.',
|
||||||
|
requestFailedHelp: 'If you get this error repeatedly, please seek help on {url}.'
|
||||||
|
};
|
||||||
|
|
||||||
const defaultPostSlugs = [
|
const defaultPostSlugs = [
|
||||||
'welcome',
|
'welcome',
|
||||||
'the-editor',
|
'the-editor',
|
||||||
|
@ -80,7 +85,7 @@ function ping(post) {
|
||||||
if (!goodResponse.test(res.body)) {
|
if (!goodResponse.test(res.body)) {
|
||||||
const matches = res.body.match(errorMessage);
|
const matches = res.body.match(errorMessage);
|
||||||
const message = matches ? matches[1] : res.body;
|
const message = matches ? matches[1] : res.body;
|
||||||
throw new Error(message);
|
throw new errors.GhostError({message});
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
.catch(function (err) {
|
.catch(function (err) {
|
||||||
|
@ -89,15 +94,15 @@ function ping(post) {
|
||||||
error = new errors.TooManyRequestsError({
|
error = new errors.TooManyRequestsError({
|
||||||
err,
|
err,
|
||||||
message: err.message,
|
message: err.message,
|
||||||
context: i18n.t('errors.services.ping.requestFailed.error', {service: 'xmlrpc'}),
|
context: tpl(messages.requestFailedError, {service: 'xmlrpc'}),
|
||||||
help: i18n.t('errors.services.ping.requestFailed.help', {url: 'https://ghost.org/docs/'})
|
help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
error = new errors.GhostError({
|
error = new errors.GhostError({
|
||||||
err: err,
|
err: err,
|
||||||
message: err.message,
|
message: err.message,
|
||||||
context: i18n.t('errors.services.ping.requestFailed.error', {service: 'xmlrpc'}),
|
context: tpl(messages.requestFailedError, {service: 'xmlrpc'}),
|
||||||
help: i18n.t('errors.services.ping.requestFailed.help', {url: 'https://ghost.org/docs/'})
|
help: tpl(messages.requestFailedHelp, {url: 'https://ghost.org/docs/'})
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
logging.error(error);
|
logging.error(error);
|
||||||
|
|
|
@ -271,9 +271,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"permissions": {
|
"permissions": {
|
||||||
"noActionsMapFound": {
|
|
||||||
"error": "No actions map found, ensure you have loaded permissions into database and then call permissions.init() before use."
|
|
||||||
},
|
|
||||||
"applyStatusRules": {
|
"applyStatusRules": {
|
||||||
"error": "You do not have permission to retrieve {docName} with that status"
|
"error": "You do not have permission to retrieve {docName} with that status"
|
||||||
},
|
},
|
||||||
|
@ -561,12 +558,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"services": {
|
"services": {
|
||||||
"ping": {
|
|
||||||
"requestFailed": {
|
|
||||||
"error": "The {service} service was unable to send a ping request, your site will continue to function.",
|
|
||||||
"help": "If you get this error repeatedly, please seek help on {url}."
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"settings": {
|
"settings": {
|
||||||
"yaml": {
|
"yaml": {
|
||||||
"error": "Could not parse {file}: {context}.",
|
"error": "Could not parse {file}: {context}.",
|
||||||
|
|
Loading…
Add table
Reference in a new issue