diff --git a/ghost/core/core/frontend/meta/og-image.js b/ghost/core/core/frontend/meta/og-image.js index 00f4d1d64a..3aa0f14be3 100644 --- a/ghost/core/core/frontend/meta/og-image.js +++ b/ghost/core/core/frontend/meta/og-image.js @@ -5,7 +5,7 @@ const settingsCache = require('../../shared/settings-cache'); function getOgImage(data) { const context = data.context ? data.context : null; - const contextObject = getContextObject(data, context, false); + const contextObject = getContextObject(data, context); if (_.includes(context, 'home')) { const imgUrl = settingsCache.get('og_image') || settingsCache.get('cover_image'); diff --git a/ghost/core/core/frontend/meta/twitter-image.js b/ghost/core/core/frontend/meta/twitter-image.js index edcc2ea2d0..60a86e1e04 100644 --- a/ghost/core/core/frontend/meta/twitter-image.js +++ b/ghost/core/core/frontend/meta/twitter-image.js @@ -5,7 +5,7 @@ const settingsCache = require('../../shared/settings-cache'); function getTwitterImage(data) { const context = data.context ? data.context : null; - const contextObject = getContextObject(data, context, false); + const contextObject = getContextObject(data, context); if (_.includes(context, 'home')) { const imgUrl = settingsCache.get('twitter_image') || settingsCache.get('cover_image'); diff --git a/ghost/core/core/server/api/endpoints/comments-members.js b/ghost/core/core/server/api/endpoints/comments-members.js index bcbd63013d..b6f888d86e 100644 --- a/ghost/core/core/server/api/endpoints/comments-members.js +++ b/ghost/core/core/server/api/endpoints/comments-members.js @@ -144,8 +144,8 @@ const controller = { } }, permissions: true, - query(frame) { - return commentsService.controller.destroy(frame); + query() { + return commentsService.controller.destroy(); } }, diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js b/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js index 51f931a074..6b2f4bff1d 100644 --- a/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js +++ b/ghost/core/core/server/api/endpoints/utils/serializers/input/utils/url.js @@ -25,11 +25,11 @@ const forPost = (attrs, options) => { } if (relation === 'author' && attrs.author) { - attrs.author = forUser(attrs.author, options); + attrs.author = forUser(attrs.author); } if (relation === 'authors' && attrs.authors) { - attrs.authors = attrs.authors.map(author => forUser(author, options)); + attrs.authors = attrs.authors.map(author => forUser(author)); } }); } diff --git a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js index 37fed7464f..3f5c01e1cd 100644 --- a/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js +++ b/ghost/core/core/server/api/endpoints/utils/serializers/output/mappers/activity-feed-events.js @@ -144,7 +144,7 @@ const activityFeedMapper = (event, frame) => { return clickEventMapper(event, frame); } if (event.type === 'aggregated_click_event') { - return aggregatedClickEventMapper(event, frame); + return aggregatedClickEventMapper(event); } if (event.type === 'feedback_event') { return feedbackEventMapper(event, frame); diff --git a/ghost/member-attribution/lib/AttributionBuilder.js b/ghost/member-attribution/lib/AttributionBuilder.js index 77404f3725..253921234f 100644 --- a/ghost/member-attribution/lib/AttributionBuilder.js +++ b/ghost/member-attribution/lib/AttributionBuilder.js @@ -94,7 +94,7 @@ class Attribution { } // Fetch model - const model = await this.#urlTranslator.getResourceById(this.id, this.type, {absolute: true}); + const model = await this.#urlTranslator.getResourceById(this.id, this.type); return this.getResource(model); } } diff --git a/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js b/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js index 93b002a98b..8c34de63fb 100644 --- a/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js +++ b/ghost/mw-api-version-mismatch/lib/mw-api-version-mismatch.js @@ -7,7 +7,7 @@ const versionMismatchHandler = (APIVersionCompatibilityService) => { * @param {import('express').Response} res * @param {import('express').NextFunction} next */ - return async function versionMismatchHandlerMiddlware(err, req, res, next) { + return async function versionMismatchHandlerMiddleware(err, req, res, next) { if (err && err.errorType === 'RequestNotAcceptableError') { if (err.code === 'UPDATE_CLIENT') { const {key, type} = extractApiKey(req); @@ -24,7 +24,7 @@ const versionMismatchHandler = (APIVersionCompatibilityService) => { } } - next(err, req, res); + next(err); }; };