From a81a00e94dfdf85348ce8f2d843675c93ab9f2f2 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Mon, 24 Mar 2025 11:03:20 -0400 Subject: [PATCH] rename MastodonConverters.ts to matching naming scheme --- packages/backend/src/server/ServerModule.ts | 4 ++-- .../src/server/api/mastodon/MastodonApiServerService.ts | 4 ++-- .../api/mastodon/{converters.ts => MastodonConverters.ts} | 2 +- packages/backend/src/server/api/mastodon/endpoints/account.ts | 4 ++-- packages/backend/src/server/api/mastodon/endpoints/filter.ts | 2 +- .../backend/src/server/api/mastodon/endpoints/instance.ts | 4 ++-- .../src/server/api/mastodon/endpoints/notifications.ts | 4 ++-- packages/backend/src/server/api/mastodon/endpoints/search.ts | 4 ++-- packages/backend/src/server/api/mastodon/endpoints/status.ts | 4 ++-- .../backend/src/server/api/mastodon/endpoints/timeline.ts | 4 ++-- 10 files changed, 18 insertions(+), 18 deletions(-) rename packages/backend/src/server/api/mastodon/{converters.ts => MastodonConverters.ts} (99%) diff --git a/packages/backend/src/server/ServerModule.ts b/packages/backend/src/server/ServerModule.ts index 5af41ddd9f..d217c49fa2 100644 --- a/packages/backend/src/server/ServerModule.ts +++ b/packages/backend/src/server/ServerModule.ts @@ -35,7 +35,7 @@ import { SignupApiService } from './api/SignupApiService.js'; import { StreamingApiServerService } from './api/StreamingApiServerService.js'; import { OpenApiServerService } from './api/openapi/OpenApiServerService.js'; import { ClientServerService } from './web/ClientServerService.js'; -import { MastoConverters } from './api/mastodon/converters.js'; +import { MastodonConverters } from './api/mastodon/MastodonConverters.js'; import { MastodonLogger } from './api/mastodon/MastodonLogger.js'; import { MastodonDataService } from './api/mastodon/MastodonDataService.js'; import { FeedService } from './web/FeedService.js'; @@ -113,7 +113,7 @@ import { SigninWithPasskeyApiService } from './api/SigninWithPasskeyApiService.j OpenApiServerService, MastodonApiServerService, OAuth2ProviderService, - MastoConverters, + MastodonConverters, MastodonLogger, MastodonDataService, MastodonClientService, diff --git a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts index d7afc1254e..b289ad7135 100644 --- a/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts +++ b/packages/backend/src/server/api/mastodon/MastodonApiServerService.ts @@ -21,7 +21,7 @@ import { ApiTimelineMastodon } from '@/server/api/mastodon/endpoints/timeline.js import { ApiSearchMastodon } from '@/server/api/mastodon/endpoints/search.js'; import { ApiError } from '@/server/api/error.js'; import { parseTimelineArgs, TimelineArgs, toBoolean } from './argsUtils.js'; -import { convertAnnouncement, convertAttachment, MastoConverters, convertRelationship } from './converters.js'; +import { convertAnnouncement, convertAttachment, MastodonConverters, convertRelationship } from './MastodonConverters.js'; import type { Entity } from 'megalodon'; import type { FastifyInstance, FastifyPluginOptions } from 'fastify'; @@ -31,7 +31,7 @@ export class MastodonApiServerService { @Inject(DI.config) private readonly config: Config, - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly logger: MastodonLogger, private readonly clientService: MastodonClientService, private readonly apiAccountMastodon: ApiAccountMastodon, diff --git a/packages/backend/src/server/api/mastodon/converters.ts b/packages/backend/src/server/api/mastodon/MastodonConverters.ts similarity index 99% rename from packages/backend/src/server/api/mastodon/converters.ts rename to packages/backend/src/server/api/mastodon/MastodonConverters.ts index 1adbd95642..11ddcd23da 100644 --- a/packages/backend/src/server/api/mastodon/converters.ts +++ b/packages/backend/src/server/api/mastodon/MastodonConverters.ts @@ -47,7 +47,7 @@ export const escapeMFM = (text: string): string => text .replace(/\r?\n/g, '
'); @Injectable() -export class MastoConverters { +export class MastodonConverters { constructor( @Inject(DI.config) private readonly config: Config, diff --git a/packages/backend/src/server/api/mastodon/endpoints/account.ts b/packages/backend/src/server/api/mastodon/endpoints/account.ts index f669b71efb..efb26ca53e 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/account.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/account.ts @@ -10,7 +10,7 @@ import { DriveService } from '@/core/DriveService.js'; import { DI } from '@/di-symbols.js'; import type { AccessTokensRepository, UserProfilesRepository } from '@/models/_.js'; import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js'; -import { MastoConverters, convertRelationship, convertFeaturedTag, convertList } from '../converters.js'; +import { MastodonConverters, convertRelationship, convertFeaturedTag, convertList } from '../MastodonConverters.js'; import type multer from 'fastify-multer'; import type { FastifyInstance } from 'fastify'; @@ -30,7 +30,7 @@ export class ApiAccountMastodon { private readonly accessTokensRepository: AccessTokensRepository, private readonly clientService: MastodonClientService, - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly driveService: DriveService, ) {} diff --git a/packages/backend/src/server/api/mastodon/endpoints/filter.ts b/packages/backend/src/server/api/mastodon/endpoints/filter.ts index d02ddd1999..deac1e9aad 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/filter.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/filter.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { toBoolean } from '@/server/api/mastodon/argsUtils.js'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; -import { convertFilter } from '../converters.js'; +import { convertFilter } from '../MastodonConverters.js'; import type { FastifyInstance } from 'fastify'; import type multer from 'fastify-multer'; diff --git a/packages/backend/src/server/api/mastodon/endpoints/instance.ts b/packages/backend/src/server/api/mastodon/endpoints/instance.ts index 1f08f0a3b0..d6ee92b466 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/instance.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/instance.ts @@ -9,7 +9,7 @@ import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; import type { Config } from '@/config.js'; import { DI } from '@/di-symbols.js'; import type { MiMeta, UsersRepository } from '@/models/_.js'; -import { MastoConverters } from '@/server/api/mastodon/converters.js'; +import { MastodonConverters } from '@/server/api/mastodon/MastodonConverters.js'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; import { RoleService } from '@/core/RoleService.js'; import type { FastifyInstance } from 'fastify'; @@ -27,7 +27,7 @@ export class ApiInstanceMastodon { @Inject(DI.config) private readonly config: Config, - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly clientService: MastodonClientService, private readonly roleService: RoleService, ) {} diff --git a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts index 120b9ba7f9..c81b3ca236 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/notifications.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/notifications.ts @@ -5,7 +5,7 @@ import { Injectable } from '@nestjs/common'; import { parseTimelineArgs, TimelineArgs } from '@/server/api/mastodon/argsUtils.js'; -import { MastoConverters } from '@/server/api/mastodon/converters.js'; +import { MastodonConverters } from '@/server/api/mastodon/MastodonConverters.js'; import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js'; import { MastodonClientService } from '../MastodonClientService.js'; import type { FastifyInstance } from 'fastify'; @@ -21,7 +21,7 @@ interface ApiNotifyMastodonRoute { @Injectable() export class ApiNotificationsMastodon { constructor( - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly clientService: MastodonClientService, ) {} diff --git a/packages/backend/src/server/api/mastodon/endpoints/search.ts b/packages/backend/src/server/api/mastodon/endpoints/search.ts index 997a585077..7277a35220 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/search.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/search.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; import { attachMinMaxPagination, attachOffsetPagination } from '@/server/api/mastodon/pagination.js'; -import { MastoConverters } from '../converters.js'; +import { MastodonConverters } from '../MastodonConverters.js'; import { parseTimelineArgs, TimelineArgs, toBoolean, toInt } from '../argsUtils.js'; import Account = Entity.Account; import Status = Entity.Status; @@ -23,7 +23,7 @@ interface ApiSearchMastodonRoute { @Injectable() export class ApiSearchMastodon { constructor( - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly clientService: MastodonClientService, ) {} diff --git a/packages/backend/src/server/api/mastodon/endpoints/status.ts b/packages/backend/src/server/api/mastodon/endpoints/status.ts index e64df3d74c..ea796e4f0b 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/status.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/status.ts @@ -8,7 +8,7 @@ import { Injectable } from '@nestjs/common'; import { emojiRegexAtStartToEnd } from '@/misc/emoji-regex.js'; import { parseTimelineArgs, TimelineArgs, toBoolean, toInt } from '@/server/api/mastodon/argsUtils.js'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; -import { convertAttachment, convertPoll, MastoConverters } from '../converters.js'; +import { convertAttachment, convertPoll, MastodonConverters } from '../MastodonConverters.js'; import type { Entity } from 'megalodon'; import type { FastifyInstance } from 'fastify'; @@ -20,7 +20,7 @@ function normalizeQuery(data: Record) { @Injectable() export class ApiStatusMastodon { constructor( - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, private readonly clientService: MastodonClientService, ) {} diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts index a333e77c3e..b6162d9eb2 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts @@ -6,7 +6,7 @@ import { Injectable } from '@nestjs/common'; import { MastodonClientService } from '@/server/api/mastodon/MastodonClientService.js'; import { attachMinMaxPagination } from '@/server/api/mastodon/pagination.js'; -import { convertList, MastoConverters } from '../converters.js'; +import { convertList, MastodonConverters } from '../MastodonConverters.js'; import { parseTimelineArgs, TimelineArgs, toBoolean } from '../argsUtils.js'; import type { Entity } from 'megalodon'; import type { FastifyInstance } from 'fastify'; @@ -15,7 +15,7 @@ import type { FastifyInstance } from 'fastify'; export class ApiTimelineMastodon { constructor( private readonly clientService: MastodonClientService, - private readonly mastoConverters: MastoConverters, + private readonly mastoConverters: MastodonConverters, ) {} public register(fastify: FastifyInstance): void {