ghost 6.11.0 → 6.12.0

package/core/frontend/web/middleware/serve-indexnow-key.js

@@ -0,0 +1,66 @@
+/**
+ * IndexNow API Key Verification File Middleware
+ *
+ * IndexNow requires websites to prove ownership by hosting a text file
+ * containing the API key at a predictable URL: https://example.com/{key}.txt
+ *
+ * This middleware dynamically serves that file based on the configured key,
+ * rather than requiring users to manually upload a file.
+ *
+ * Security considerations:
+ * - Only serves keys that exactly match the configured key
+ * - Only responds to 32-character hex patterns (valid IndexNow key format)
+ * - Returns 404 (via next()) if IndexNow is disabled or no key configured
+ *
+ * Route collision note:
+ * The pattern /[a-f0-9]{32}.txt is unlikely to collide with user content
+ * since pages/posts don't have .txt extensions. The middleware runs before
+ * theme static assets, so IndexNow key files take precedence over any
+ * theme .txt files with matching names (which is the intended behavior
+ * for system-generated verification files).
+ *
+ * @see ghost/core/core/server/services/indexnow.js - Main IndexNow service
+ */
+
+const settingsCache = require('../../../shared/settings-cache');
+const labs = require('../../../shared/labs');
+
+/**
+ * Middleware to serve the IndexNow API key verification file
+ */
+function serveIndexNowKey(req, res, next) {
+    // Only handle requests for .txt files at the root
+    if (!req.path.match(/^\/[a-f0-9]{32}\.txt$/)) {
+        return next();
+    }
+
+    // Check if IndexNow is enabled
+    if (!labs.isSet('indexnow')) {
+        return next();
+    }
+
+    const apiKey = settingsCache.get('indexnow_api_key');
+
+    // No key configured
+    if (!apiKey) {
+        return next();
+    }
+
+    // Extract the requested key from the path (remove leading / and trailing .txt)
+    const requestedKey = req.path.slice(1, -4);
+
+    // Only serve if the requested key matches the configured key
+    if (requestedKey !== apiKey) {
+        return next();
+    }
+
+    // Serve the key as plain text
+    res.set({
+        'Content-Type': 'text/plain',
+        'Cache-Control': 'public, max-age=86400' // Cache for 24 hours
+    });
+
+    return res.send(apiKey);
+}
+
+module.exports = serveIndexNowKey;

package/core/frontend/web/site.js

@@ -94,6 +94,9 @@ module.exports = function setupSiteApp(routerConfig) {
         }
     });
 
+    // Serve IndexNow API key verification file (/{key}.txt)
+    siteApp.use(mw.serveIndexNowKey);
+
     // Theme static assets/files
     siteApp.use(mw.staticTheme());
 

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

@@ -10,7 +10,7 @@ const invitations = require('../../services/invitations');
 const dbBackup = require('../../data/db/backup');
 const apiMail = require('./index').mail;
 const apiSettings = require('./index').settings;
-const UsersService = require('../../services/Users');
+const UsersService = require('../../services/users');
 const userService = new UsersService({dbBackup, models, auth, apiMail, apiSettings});
 const {deleteAllSessions} = require('../../services/auth/session');
 

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

@@ -1,7 +1,7 @@
 const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const getPostServiceInstance = require('../../services/posts/posts-service');
+const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions', 'post_revisions', 'post_revisions.author'];
 const UNSAFE_ATTRS = ['status', 'authors', 'visibility'];
 

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

@@ -3,7 +3,7 @@ const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {mapQuery} = require('@tryghost/mongo-utils');
 const postsPublicService = require('../../services/posts-public');
-const getPostServiceInstance = require('../../services/posts/posts-service');
+const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const postsService = getPostServiceInstance();
 
 const allowedIncludes = ['tags', 'authors', 'tiers', 'sentiment'];

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

@@ -1,6 +1,6 @@
 const urlUtils = require('../../../shared/url-utils');
 const models = require('../../models');
-const getPostServiceInstance = require('../../services/posts/posts-service');
+const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const allowedIncludes = [
     'tags',
     'authors',

package/core/server/api/endpoints/search-index-public.js

@@ -1,5 +1,5 @@
 const models = require('../../models');
-const getPostServiceInstance = require('../../services/posts/posts-service');
+const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const postsService = getPostServiceInstance();
 
 /** @type {import('@tryghost/api-framework').Controller} */

package/core/server/api/endpoints/search-index.js

@@ -1,5 +1,5 @@
 const models = require('../../models');
-const getPostServiceInstance = require('../../services/posts/posts-service');
+const getPostServiceInstance = require('../../services/posts/posts-service-instance');
 const postsService = getPostServiceInstance();
 
 /** @type {import('@tryghost/api-framework').Controller} */

package/core/server/api/endpoints/users.js

@@ -6,7 +6,7 @@ const dbBackup = require('../../data/db/backup');
 const auth = require('../../services/auth');
 const apiMail = require('./index').mail;
 const apiSettings = require('./index').settings;
-const UsersService = require('../../services/Users');
+const UsersService = require('../../services/users');
 const userService = new UsersService({dbBackup, models, auth, apiMail, apiSettings});
 const ALLOWED_INCLUDES = ['count.posts', 'permissions', 'roles', 'roles.permissions'];
 const UNSAFE_ATTRS = ['status', 'roles'];

package/core/server/api/endpoints/utils/serializers/input/settings.js

@@ -78,7 +78,8 @@ const EDITABLE_SETTINGS = [
     'require_email_mfa',
     'social_web',
     'explore_ping',
-    'explore_ping_growth'
+    'explore_ping_growth',
+    'indexnow_api_key'
 ];
 
 module.exports = {

package/core/server/api/endpoints/utils/serializers/output/mappers/posts.js

@@ -14,7 +14,7 @@ const utils = require('../../../index');
 
 const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta;
 
-const getPostServiceInstance = require('../../../../../../services/posts/posts-service');
+const getPostServiceInstance = require('../../../../../../services/posts/posts-service-instance');
 const postsService = getPostServiceInstance();
 
 const commentsService = require('../../../../../../services/comments');

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

@@ -2,7 +2,7 @@ const _ = require('lodash');
 const {ValidationError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 const tpl = require('@tryghost/tpl');
-const AnnouncementBarSettings = require('../../../../../services/announcement-bar-service/AnnouncementBarSettings');
+const AnnouncementBarSettings = require('../../../../../services/announcement-bar-service/announcement-bar-settings');
 
 const messages = {
     invalidEmailReceived: 'Please send a valid email',

package/core/server/data/exporter/table-lists.js

@@ -93,7 +93,8 @@ const SETTING_KEYS_BLOCKLIST = [
     'stripe_publishable_key',
     'members_stripe_webhook_id',
     'members_stripe_webhook_secret',
-    'email_verification_required'
+    'email_verification_required',
+    'indexnow_api_key'
 ];
 
 module.exports = {

package/core/server/data/migrations/versions/6.12/2026-01-08-11-48-16-add-indexnow-api-key-setting.js

@@ -0,0 +1,9 @@
+const crypto = require('crypto');
+const {addSetting} = require('../../utils');
+
+module.exports = addSetting({
+    key: 'indexnow_api_key',
+    value: crypto.randomBytes(16).toString('hex'),
+    type: 'string',
+    group: 'indexnow'
+});

package/core/server/data/schema/default-settings/default-settings.json

@@ -637,5 +637,11 @@
             },
             "type": "boolean"
         }
+    },
+    "indexnow": {
+        "indexnow_api_key": {
+            "defaultValue": null,
+            "type": "string"
+        }
     }
 }

package/core/server/lib/lexical.js

@@ -72,7 +72,7 @@ module.exports = {
 
     async render(lexical, userOptions = {}) {
         if (!postsService) {
-            const getPostServiceInstance = require('../services/posts/posts-service');
+            const getPostServiceInstance = require('../services/posts/posts-service-instance');
             postsService = getPostServiceInstance();
         }
         if (!serializePosts) {

package/core/server/models/settings.js

@@ -60,7 +60,8 @@ function parseDefaultSettings() {
         members_otc_secret: () => crypto.randomBytes(64).toString('hex'),
         ghost_public_key: () => getGhostKey('public'),
         ghost_private_key: () => getGhostKey('private'),
-        site_uuid: () => getOrGenerateSiteUuid()
+        site_uuid: () => getOrGenerateSiteUuid(),
+        indexnow_api_key: () => crypto.randomBytes(16).toString('hex')
     };
 
     _.each(defaultSettingsInCategories, function each(settings, categoryName) {

package/core/server/services/activitypub/{ActivityPubServiceWrapper.js → activity-pub-service-wrapper.js}

@@ -1,4 +1,4 @@
-const {ActivityPubService} = require('./ActivityPubService');
+const {ActivityPubService} = require('./activity-pub-service');
 
 module.exports = class ActivityPubServiceWrapper {
     /** @type ActivityPubService */

package/core/server/services/activitypub/{ActivityPubService.ts → activity-pub-service.ts}

@@ -1,6 +1,6 @@
 import ObjectID from 'bson-objectid';
 import {Knex} from 'knex';
-import {IdentityTokenService} from '../identity-tokens/IdentityTokenService';
+import {IdentityTokenService} from '../identity-tokens/identity-token-service';
 import fetch from 'node-fetch';
 
 type ExpectedWebhook = {

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

@@ -1 +1 @@
-module.exports = require('./ActivityPubServiceWrapper');
+module.exports = require('./activity-pub-service-wrapper');

package/core/server/services/adapter-manager/index.js

@@ -1,4 +1,4 @@
-const AdapterManager = require('./AdapterManager');
+const AdapterManager = require('./adapter-manager');
 const getAdapterServiceConfig = require('./config');
 const resolveAdapterOptions = require('./options-resolver');
 const config = require('../../../shared/config');

package/core/server/services/announcement-bar-service/{AnnouncementBarSettings.js → announcement-bar-settings.js}

@@ -1,4 +1,4 @@
-const AnnouncementVisibilityValues = require('./AnnouncementVisibilityValues');
+const AnnouncementVisibilityValues = require('./announcement-visibility-values');
 
 class AnnouncementBarSettings {
     #getAnnouncementSettings;

package/core/server/services/announcement-bar-service/index.js

@@ -1,5 +1,5 @@
 const settingsCache = require('../../../shared/settings-cache');
-const AnnouncementBarSettings = require('./AnnouncementBarSettings');
+const AnnouncementBarSettings = require('./announcement-bar-settings');
 
 const announcementBarService = new AnnouncementBarSettings({
     getAnnouncementSettings: () => ({

package/core/server/services/audience-feedback/{AudienceFeedbackController.js → audience-feedback-controller.js}

@@ -1,4 +1,4 @@
-const Feedback = require('./Feedback');
+const Feedback = require('./feedback');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
@@ -74,8 +74,8 @@ class AudienceFeedbackController {
         }
 
         const feedback = new Feedback({
-            memberId: member.id, 
-            postId: post.id, 
+            memberId: member.id,
+            postId: post.id,
             score
         });
         await this.#repository.add(feedback);

package/core/server/services/audience-feedback/index.js

@@ -1,10 +1,10 @@
 const urlUtils = require('../../../shared/url-utils');
 const urlService = require('../../services/url');
 
-const AudienceFeedbackService = require('./AudienceFeedbackService');
-const AudienceFeedbackController = require('./AudienceFeedbackController');
-const Feedback = require('./Feedback');
-const FeedbackRepository = require('./FeedbackRepository');
+const AudienceFeedbackService = require('./audience-feedback-service');
+const AudienceFeedbackController = require('./audience-feedback-controller');
+const Feedback = require('./feedback');
+const FeedbackRepository = require('./feedback-repository');
 
 class AudienceFeedbackServiceWrapper {
     async init() {

package/core/server/services/auth/session/express-session.js

@@ -5,7 +5,7 @@ const settingsCache = require('../../../../shared/settings-cache');
 const models = require('../../../models');
 const urlUtils = require('../../../../shared/url-utils');
 
-const SessionStore = require('./SessionStore');
+const SessionStore = require('./session-store');
 const sessionStore = new SessionStore(models.Session);
 
 let unoExpressSessionMiddleware;

package/core/server/services/comments/{CommentsController.js → comments-controller.js}

@@ -17,8 +17,8 @@ const messages = {
 
 module.exports = class CommentsController {
     /**
-     * @param {import('./CommentsService')} service
-     * @param {import('./CommentsStatsService')} stats
+     * @param {import('./comments-service')} service
+     * @param {import('./comments-stats-service')} stats
      */
     constructor(service, stats) {
         this.service = service;

package/core/server/services/comments/{CommentsServiceEmails.js → comments-service-emails.js}

@@ -1,7 +1,7 @@
 const moment = require('moment');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const emailService = require('../email-service');
-const CommentsServiceEmailRenderer = require('./CommentsServiceEmailRenderer');
+const CommentsServiceEmailRenderer = require('./comments-service-email-renderer');
 const {t} = require('../i18n');
 
 class CommentsServiceEmails {

package/core/server/services/comments/{CommentsService.js → comments-service.js}

@@ -25,7 +25,7 @@ class CommentsService {
         /** @private */
         this.contentGating = contentGating;
 
-        const Emails = require('./CommentsServiceEmails');
+        const Emails = require('./comments-service-emails');
         /** @private */
         this.emails = new Emails({
             config,

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

@@ -1,8 +1,8 @@
 class CommentsServiceWrapper {
     init() {
-        const CommentsService = require('./CommentsService');
-        const CommentsController = require('./CommentsController');
-        const CommentsStats = require('./CommentsStatsService');
+        const CommentsService = require('./comments-service');
+        const CommentsController = require('./comments-controller');
+        const CommentsStats = require('./comments-stats-service');
 
         const config = require('../../../shared/config');
         const logging = require('@tryghost/logging');

package/core/server/services/custom-redirects/index.js

@@ -1,8 +1,8 @@
 const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 
-const DynamicRedirectManager = require('../lib/DynamicRedirectManager');
-const CustomRedirectsAPI = require('./CustomRedirectsAPI');
+const DynamicRedirectManager = require('../lib/dynamic-redirect-manager');
+const CustomRedirectsAPI = require('./custom-redirects-api');
 const validation = require('./validation');
 const {getBackupRedirectsFilePath} = require('./utils');
 

package/core/server/services/donations/{DonationBookshelfRepository.ts → donation-bookshelf-repository.ts}

@@ -1,4 +1,4 @@
-import {DonationPaymentEvent} from './DonationPaymentEvent';
+import {DonationPaymentEvent} from './donation-payment-event';
 
 type DonationRepository = {
     save(event: DonationPaymentEvent): Promise<void>;

package/core/server/services/donations/{DonationServiceWrapper.js → donation-service-wrapper.js}

@@ -8,7 +8,7 @@ class DonationServiceWrapper {
             return;
         }
 
-        const {DonationBookshelfRepository} = require('./DonationBookshelfRepository');
+        const {DonationBookshelfRepository} = require('./donation-bookshelf-repository');
 
         this.repository = new DonationBookshelfRepository({
             DonationPaymentEventModel

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

@@ -1,3 +1,3 @@
-const DonationServiceWrapper = require('./DonationServiceWrapper');
+const DonationServiceWrapper = require('./donation-service-wrapper');
 
 module.exports = new DonationServiceWrapper();

package/core/server/services/email-address/{EmailAddressServiceWrapper.js → email-address-service-wrapper.js}

@@ -1,6 +1,6 @@
 class EmailAddressServiceWrapper {
     /**
-     * @type {import('./EmailAddressService').EmailAddressService}
+     * @type {import('./email-address-service').EmailAddressService}
      */
     service;
 
@@ -14,7 +14,7 @@ class EmailAddressServiceWrapper {
         const settingsHelpers = require('../settings-helpers');
         const validator = require('@tryghost/validator');
 
-        const {EmailAddressService} = require('./EmailAddressService');
+        const {EmailAddressService} = require('./email-address-service');
 
         this.service = new EmailAddressService({
             labs,

package/core/server/services/email-address/{EmailAddressService.js → email-address-service.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailAddressService = void 0;
 /* eslint-disable ghost/filenames/match-exported-class */
 const logging_1 = __importDefault(require("@tryghost/logging"));
-const EmailAddressParser_js_1 = __importDefault(require("./EmailAddressParser.js"));
+const email_address_parser_js_1 = __importDefault(require("./email-address-parser.js"));
 class EmailAddressService {
     #getManagedEmailEnabled;
     #getSendingDomain;
@@ -25,7 +25,7 @@ class EmailAddressService {
             if (!fallbackAddress) {
                 return null;
             }
-            return EmailAddressParser_js_1.default.parse(fallbackAddress);
+            return email_address_parser_js_1.default.parse(fallbackAddress);
         };
         this.#isValidEmailAddress = dependencies.isValidEmailAddress;
         this.#labs = dependencies.labs;
@@ -46,8 +46,8 @@ class EmailAddressService {
         return this.#getFallbackEmail();
     }
     getAddressFromString(from, replyTo) {
-        const parsedFrom = EmailAddressParser_js_1.default.parse(from);
-        const parsedReplyTo = replyTo ? EmailAddressParser_js_1.default.parse(replyTo) : undefined;
+        const parsedFrom = email_address_parser_js_1.default.parse(from);
+        const parsedReplyTo = replyTo ? email_address_parser_js_1.default.parse(replyTo) : undefined;
         return this.getAddress({
             from: parsedFrom ?? this.defaultFromEmail,
             replyTo: parsedReplyTo ?? undefined

package/core/server/services/email-address/{EmailAddressService.ts → email-address-service.ts}

@@ -1,6 +1,6 @@
 /* eslint-disable ghost/filenames/match-exported-class */
 import logging from '@tryghost/logging';
-import EmailAddressParser, {EmailAddress} from './EmailAddressParser.js';
+import EmailAddressParser, {EmailAddress} from './email-address-parser.js';
 
 export type EmailAddresses = {
     from: EmailAddress,

package/core/server/services/email-address/index.js

@@ -1,3 +1,3 @@
-const EmailAddressServiceWrapper = require('./EmailAddressServiceWrapper');
+const EmailAddressServiceWrapper = require('./email-address-service-wrapper');
 
 module.exports = new EmailAddressServiceWrapper();

package/core/server/services/email-analytics/{EmailAnalyticsProviderMailgun.js → email-analytics-provider-mailgun.js}

@@ -1,4 +1,4 @@
-const MailgunClient = require('../lib/MailgunClient');
+const MailgunClient = require('../lib/mailgun-client');
 
 const DEFAULT_EVENT_FILTER = 'delivered OR opened OR failed OR unsubscribed OR complained';
 const PAGE_LIMIT = 300;

package/core/server/services/email-analytics/{EmailAnalyticsServiceWrapper.js → email-analytics-service-wrapper.js}

@@ -8,12 +8,12 @@ class EmailAnalyticsServiceWrapper {
             return;
         }
 
-        const EmailAnalyticsService = require('./EmailAnalyticsService');
-        const EmailEventStorage = require('../email-service/EmailEventStorage');
-        const EmailEventProcessor = require('../email-service/EmailEventProcessor');
-        const MailgunProvider = require('./EmailAnalyticsProviderMailgun');
+        const EmailAnalyticsService = require('./email-analytics-service');
+        const EmailEventStorage = require('../email-service/email-event-storage');
+        const EmailEventProcessor = require('../email-service/email-event-processor');
+        const MailgunProvider = require('./email-analytics-provider-mailgun');
         const {EmailRecipientFailure, EmailSpamComplaintEvent, Email} = require('../../models');
-        const StartEmailAnalyticsJobEvent = require('./events/StartEmailAnalyticsJobEvent');
+        const StartEmailAnalyticsJobEvent = require('./events/start-email-analytics-job-event');
         const domainEvents = require('@tryghost/domain-events');
         const settings = require('../../../shared/settings-cache');
         const labs = require('../../../shared/labs');

package/core/server/services/email-analytics/{EmailAnalyticsService.js → email-analytics-service.js}

@@ -1,9 +1,9 @@
-const EventProcessingResult = require('./EventProcessingResult');
+const EventProcessingResult = require('./event-processing-result');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 
 /**
- * @typedef {import('../email-service/EmailEventProcessor')} EmailEventProcessor
+ * @typedef {import('../email-service/email-event-processor')} EmailEventProcessor
  */
 
 /**

package/core/server/services/email-analytics/index.js

@@ -1,3 +1,3 @@
-const EmailAnalyticsServiceWrapper = require('./EmailAnalyticsServiceWrapper');
+const EmailAnalyticsServiceWrapper = require('./email-analytics-service-wrapper');
 
 module.exports = new EmailAnalyticsServiceWrapper();

package/core/server/services/email-analytics/jobs/fetch-latest/index.js

@@ -1,5 +1,5 @@
 const {parentPort} = require('worker_threads');
-const StartEmailAnalyticsJobEvent = require('../../events/StartEmailAnalyticsJobEvent');
+const StartEmailAnalyticsJobEvent = require('../../events/start-email-analytics-job-event');
 
 // recurring job to fetch analytics since the most recently seen event timestamp
 

package/core/server/services/email-service/{BatchSendingService.js → batch-sending-service.js}

@@ -2,7 +2,7 @@ const logging = require('@tryghost/logging');
 const ObjectID = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
-const EmailBodyCache = require('./EmailBodyCache');
+const EmailBodyCache = require('./email-body-cache');
 
 const messages = {
     emailErrorPartialFailure: 'An error occurred, and your newsletter was only partially sent. Please retry sending the remaining emails.',
@@ -12,11 +12,11 @@ const messages = {
 const MAX_SENDING_CONCURRENCY = 2;
 
 /**
- * @typedef {import('./SendingService')} SendingService
- * @typedef {import('./EmailSegmenter')} EmailSegmenter
- * @typedef {import('./EmailRenderer')} EmailRenderer
- * @typedef {import('./DomainWarmingService').DomainWarmingService} DomainWarmingService
- * @typedef {import('./EmailRenderer').MemberLike} MemberLike
+ * @typedef {import('./sending-service')} SendingService
+ * @typedef {import('./email-segmenter')} EmailSegmenter
+ * @typedef {import('./email-renderer')} EmailRenderer
+ * @typedef {import('./domain-warming-service').DomainWarmingService} DomainWarmingService
+ * @typedef {import('./email-renderer').MemberLike} MemberLike
  * @typedef {object} JobsService
  * @typedef {object} Email
  * @typedef {object} Newsletter
@@ -345,7 +345,7 @@ class BatchSendingService {
      * Creates a batch with retry logic and adds it to the batches array
      * @param {object} params
      * @param {Email} params.email
-     * @param {import('./EmailRenderer').Segment} params.segment
+     * @param {import('./email-renderer').Segment} params.segment
      * @param {object[]} params.members
      * @param {boolean} params.useFallbackDomain
      * @param {EmailBatch[]} params.batches
@@ -374,7 +374,7 @@ class BatchSendingService {
     /**
      * @private
      * @param {Email} email
-     * @param {import('./EmailRenderer').Segment} segment
+     * @param {import('./email-renderer').Segment} segment
      * @param {object[]} members
      * @param {object} options
      * @param {boolean} options.useFallbackDomain

package/core/server/services/email-service/{EmailEventProcessor.js → email-event-processor.js}

@@ -1,11 +1,11 @@
 const logging = require('@tryghost/logging');
 
-const EmailDeliveredEvent = require('./events/EmailDeliveredEvent');
-const EmailOpenedEvent = require('./events/EmailOpenedEvent');
-const EmailBouncedEvent = require('./events/EmailBouncedEvent');
-const EmailTemporaryBouncedEvent = require('./events/EmailTemporaryBouncedEvent');
-const EmailUnsubscribedEvent = require('./events/EmailUnsubscribedEvent');
-const SpamComplaintEvent = require('./events/SpamComplaintEvent');
+const EmailDeliveredEvent = require('./events/email-delivered-event');
+const EmailOpenedEvent = require('./events/email-opened-event');
+const EmailBouncedEvent = require('./events/email-bounced-event');
+const EmailTemporaryBouncedEvent = require('./events/email-temporary-bounced-event');
+const EmailUnsubscribedEvent = require('./events/email-unsubscribed-event');
+const SpamComplaintEvent = require('./events/spam-complaint-event');
 
 async function waitForEvent() {
     return new Promise((resolve) => {

package/core/server/services/email-service/{EmailEventStorage.js → email-event-storage.js}

@@ -118,7 +118,7 @@ class EmailEventStorage {
     /**
      * @private
      * @param {'temporary'|'permanent'} severity
-     * @param {import('./events/EmailTemporaryBouncedEvent')|import('./events/EmailBouncedEvent')} event
+     * @param {import('./events/email-temporary-bounced-event')|import('./events/email-bounced-event')} event
      * @param {{transacting?: any}} options
      * @returns
      */

package/core/server/services/email-service/{EmailRenderer.js → email-renderer.js}

@@ -9,7 +9,7 @@ const {isUnsplashImage} = require('@tryghost/kg-default-cards/lib/utils');
 const {textColorForBackgroundColor, darkenToContrastThreshold} = require('@tryghost/color-utils');
 const {DateTime} = require('luxon');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
-const EmailAddressParser = require('../email-address/EmailAddressParser');
+const EmailAddressParser = require('../email-address/email-address-parser');
 const {registerHelpers} = require('./helpers/register-helpers');
 const crypto = require('crypto');