From 01bcf8012185578bf1effea07f4db79bca8b76c1 Mon Sep 17 00:00:00 2001 From: Andreas Creten Date: Tue, 4 Feb 2025 13:19:58 +0100 Subject: [PATCH] Revert "add MilAdapterBase" This reverts commit ab1372666e25117d3b68c6acf25694375f5fbde7. --- .../server/adapters/mail/MailAdapterBase.js | 23 ------------------- .../server/services/adapter-manager/index.js | 1 - ghost/mailgun-client/lib/MailgunClient.js | 4 +--- ghost/postmark-client/lib/PostmarkClient.js | 4 +--- 4 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 ghost/core/core/server/adapters/mail/MailAdapterBase.js diff --git a/ghost/core/core/server/adapters/mail/MailAdapterBase.js b/ghost/core/core/server/adapters/mail/MailAdapterBase.js deleted file mode 100644 index 1de4ab0481f..00000000000 --- a/ghost/core/core/server/adapters/mail/MailAdapterBase.js +++ /dev/null @@ -1,23 +0,0 @@ -class MailAdapterBase { - constructor() { - Object.defineProperty(this, - 'requiredFns', - { - value: [ - 'send', - 'getEvents', - 'fetchEvents', - 'removeSuppression', - 'removeBounce', - 'removeComplaint', - 'removeUnsubscribe', - 'normalizeEvent', - 'getBatchSize', - 'isConfigured' - ], - writable: false - }); - } -} - -module.exports = MailAdapterBase; diff --git a/ghost/core/core/server/services/adapter-manager/index.js b/ghost/core/core/server/services/adapter-manager/index.js index d8f06f775f9..ac535381f46 100644 --- a/ghost/core/core/server/services/adapter-manager/index.js +++ b/ghost/core/core/server/services/adapter-manager/index.js @@ -16,7 +16,6 @@ adapterManager.registerAdapter('storage', require('ghost-storage-base')); adapterManager.registerAdapter('scheduling', require('../../adapters/scheduling/scheduling-base')); adapterManager.registerAdapter('sso', require('../../adapters/sso/SSOBase')); adapterManager.registerAdapter('cache', require('@tryghost/adapter-base-cache')); -adapterManager.registerAdapter('mail', require('../../../../../mailgun-client/index')); module.exports = { /** diff --git a/ghost/mailgun-client/lib/MailgunClient.js b/ghost/mailgun-client/lib/MailgunClient.js index 60551a4dc2a..591d1494422 100644 --- a/ghost/mailgun-client/lib/MailgunClient.js +++ b/ghost/mailgun-client/lib/MailgunClient.js @@ -3,16 +3,14 @@ const debug = require('@tryghost/debug'); const logging = require('@tryghost/logging'); const metrics = require('@tryghost/metrics'); const errors = require('@tryghost/errors'); -const MailAdapterBase = require('../../core/core/server/adapters/mail/MailAdapterBase'); -module.exports = class MailgunClient extends MailAdapterBase { +module.exports = class MailgunClient { #config; #settings; static DEFAULT_BATCH_SIZE = 1000; constructor({config, settings}) { - super(); this.#config = config; this.#settings = settings; } diff --git a/ghost/postmark-client/lib/PostmarkClient.js b/ghost/postmark-client/lib/PostmarkClient.js index f7b2c8114a0..30de8b9be18 100644 --- a/ghost/postmark-client/lib/PostmarkClient.js +++ b/ghost/postmark-client/lib/PostmarkClient.js @@ -3,16 +3,14 @@ const logging = require('@tryghost/logging'); const metrics = require('@tryghost/metrics'); const errors = require('@tryghost/errors'); const {ServerClient} = require('postmark'); -const MailAdapterBase = require('../../core/core/server/adapters/mail/MailAdapterBase'); -module.exports = class PostmarkClient extends MailAdapterBase { +module.exports = class PostmarkClient { #config; #settings; static DEFAULT_BATCH_SIZE = 500; constructor({config, settings}) { - super(); this.#config = config; this.#settings = settings; }