renamed service files to kebab-case

ghost/core/.eslintrc.js

@@ -102,7 +102,7 @@ module.exports = {
         },
         {
             // Frontend files use kebab-case filenames with PascalCase class exports
-            files: ['core/frontend/**/*.js'],
+            files: ['core/frontend/**/*.js', 'core/server/services/**/*.{js,ts}'],
             rules: {
                 'ghost/filenames/match-exported-class': 'off',
                 'ghost/filenames/match-regex': ['error', '^[a-z0-9.-]+$', false]

ghost/core/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');
 

ghost/core/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'];

ghost/core/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',

ghost/core/core/server/services/activitypub/ActivityPubServiceWrapper.js → ghost/core/core/server/services/activitypub/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 */

ghost/core/core/server/services/activitypub/ActivityPubService.ts → ghost/core/core/server/services/activitypub/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 = {

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

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

ghost/core/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');

ghost/core/core/server/services/announcement-bar-service/AnnouncementBarSettings.js → ghost/core/core/server/services/announcement-bar-service/announcement-bar-settings.js

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

ghost/core/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: () => ({

ghost/core/core/server/services/audience-feedback/AudienceFeedbackController.js → ghost/core/core/server/services/audience-feedback/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);

ghost/core/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() {

ghost/core/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;

ghost/core/core/server/services/comments/CommentsController.js → ghost/core/core/server/services/comments/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;

ghost/core/core/server/services/comments/CommentsServiceEmails.js → ghost/core/core/server/services/comments/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 {

ghost/core/core/server/services/comments/CommentsService.js → ghost/core/core/server/services/comments/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,

ghost/core/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');

ghost/core/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');
 

ghost/core/core/server/services/donations/DonationBookshelfRepository.ts → ghost/core/core/server/services/donations/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>;

ghost/core/core/server/services/donations/DonationServiceWrapper.js → ghost/core/core/server/services/donations/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

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

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

ghost/core/core/server/services/email-address/EmailAddressServiceWrapper.js → ghost/core/core/server/services/email-address/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,

ghost/core/core/server/services/email-address/EmailAddressService.ts → ghost/core/core/server/services/email-address/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,

ghost/core/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();

ghost/core/core/server/services/email-analytics/EmailAnalyticsProviderMailgun.js → ghost/core/core/server/services/email-analytics/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;

ghost/core/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js → ghost/core/core/server/services/email-analytics/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');

ghost/core/core/server/services/email-analytics/EmailAnalyticsService.js → ghost/core/core/server/services/email-analytics/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
  */
 
 /**

ghost/core/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();

ghost/core/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
 

ghost/core/core/server/services/email-service/BatchSendingService.js → ghost/core/core/server/services/email-service/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

ghost/core/core/server/services/email-service/EmailEventProcessor.js → ghost/core/core/server/services/email-service/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) => {

ghost/core/core/server/services/email-service/EmailEventStorage.js → ghost/core/core/server/services/email-service/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
      */

ghost/core/core/server/services/email-service/EmailRenderer.js → ghost/core/core/server/services/email-service/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');
 

ghost/core/core/server/services/email-service/EmailServiceWrapper.js → ghost/core/core/server/services/email-service/email-service-wrapper.js

@@ -15,17 +15,17 @@ class EmailServiceWrapper {
             return;
         }
 
-        const EmailService = require('./EmailService');
-        const EmailController = require('./EmailController');
-        const EmailRenderer = require('./EmailRenderer');
-        const SendingService = require('./SendingService');
-        const BatchSendingService = require('./BatchSendingService');
-        const EmailSegmenter = require('./EmailSegmenter');
-        const MailgunEmailProvider = require('./MailgunEmailProvider');
-        const {DomainWarmingService} = require('./DomainWarmingService');
+        const EmailService = require('./email-service');
+        const EmailController = require('./email-controller');
+        const EmailRenderer = require('./email-renderer');
+        const SendingService = require('./sending-service');
+        const BatchSendingService = require('./batch-sending-service');
+        const EmailSegmenter = require('./email-segmenter');
+        const MailgunEmailProvider = require('./mailgun-email-provider');
+        const {DomainWarmingService} = require('./domain-warming-service');
 
         const {Post, Newsletter, Email, EmailBatch, EmailRecipient, Member} = require('../../models');
-        const MailgunClient = require('../lib/MailgunClient');
+        const MailgunClient = require('../lib/mailgun-client');
         const configService = require('../../../shared/config');
         const settingsCache = require('../../../shared/settings-cache');
         const settingsHelpers = require('../settings-helpers');