diff options
| author | Hazelnoot <acomputerdog@gmail.com> | 2025-02-08 13:16:17 -0500 |
|---|---|---|
| committer | Hazelnoot <acomputerdog@gmail.com> | 2025-02-08 13:16:37 -0500 |
| commit | 7e1b4b259a4efd383dac368178a9c4ed0cd9fc20 (patch) | |
| tree | 0068429295e31528d356c74a8dcae28bb04bae42 /packages/backend/src/server/ActivityPubServerService.ts | |
| parent | Merge remote-tracking branch 'fEmber/merge/2024-02-03' into merge/2024-02-03 (diff) | |
| parent | merge: Rework rate limit factors and add caching (resolves #884) (!884) (diff) | |
| download | sharkey-7e1b4b259a4efd383dac368178a9c4ed0cd9fc20.tar.gz sharkey-7e1b4b259a4efd383dac368178a9c4ed0cd9fc20.tar.bz2 sharkey-7e1b4b259a4efd383dac368178a9c4ed0cd9fc20.zip | |
Merge branch 'develop' into merge/2024-02-03
# Conflicts:
# packages/backend/src/server/ActivityPubServerService.ts
# pnpm-lock.yaml
Diffstat (limited to 'packages/backend/src/server/ActivityPubServerService.ts')
| -rw-r--r-- | packages/backend/src/server/ActivityPubServerService.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts index 1f838ffdbe..72faa3318c 100644 --- a/packages/backend/src/server/ActivityPubServerService.ts +++ b/packages/backend/src/server/ActivityPubServerService.ts @@ -30,12 +30,12 @@ import type { MiNote } from '@/models/Note.js'; import { QueryService } from '@/core/QueryService.js'; import { UtilityService } from '@/core/UtilityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js'; +import type Logger from '@/logger.js'; +import { LoggerService } from '@/core/LoggerService.js'; import { bindThis } from '@/decorators.js'; import { IActivity } from '@/core/activitypub/type.js'; import { isQuote, isRenote } from '@/misc/is-renote.js'; import * as Acct from '@/misc/acct.js'; -import type Logger from '@/logger.js'; -import { LoggerService } from '@/core/LoggerService.js'; import type { FastifyInstance, FastifyRequest, FastifyReply, FastifyPluginOptions, FastifyBodyParser } from 'fastify'; import type { FindOptionsWhere } from 'typeorm'; |