misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix rebase errors

Browse source
This commit is contained in:
Hazelnoot 2025-10-09 13:23:34 -04:00
parent a8ca345fd2
commit 74d4799ed5
7 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
packages/backend/src/core/AntennaService.ts
View file

@ -18,7 +18,7 @@ import type { AntennasRepository, UserListMembershipsRepository } from '@/models
import type { MiAntenna } from '@/models/Antenna.js'; import type { MiAntenna } from '@/models/Antenna.js';
import type { MiNote } from '@/models/Note.js'; import type { MiNote } from '@/models/Note.js';
import type { MiUser } from '@/models/User.js'; import type { MiUser } from '@/models/User.js';
import { InternalEventService } from '@/core/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
import { promiseMap } from '@/misc/promise-map.js'; import { promiseMap } from '@/misc/promise-map.js';
import { CacheService } from './CacheService.js'; import { CacheService } from './CacheService.js';
import type { OnApplicationShutdown } from '@nestjs/common'; import type { OnApplicationShutdown } from '@nestjs/common';

6
packages/backend/src/core/CollapsedQueueService.ts
View file

@ -9,14 +9,14 @@ import type Logger from '@/logger.js';
import { CollapsedQueue } from '@/misc/collapsed-queue.js'; import { CollapsedQueue } from '@/misc/collapsed-queue.js';
import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js';
import { FederatedInstanceService } from '@/core/FederatedInstanceService.js'; import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
import { EnvService } from '@/core/EnvService.js'; import { EnvService } from '@/global/EnvService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { InternalEventService } from '@/core/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, FollowingsRepository } from '@/models/_.js'; import type { UsersRepository, NotesRepository, AccessTokensRepository, MiAntenna, FollowingsRepository } from '@/models/_.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { AntennaService } from '@/core/AntennaService.js'; import { AntennaService } from '@/core/AntennaService.js';
import { CacheService } from '@/core/CacheService.js'; import { CacheService } from '@/core/CacheService.js';
import { TimeService } from '@/core/TimeService.js'; import { TimeService } from '@/global/TimeService.js';
export type UpdateInstanceJob = { export type UpdateInstanceJob = {
latestRequestReceivedAt?: Date, latestRequestReceivedAt?: Date,

2
packages/backend/src/core/UserService.ts
View file

@ -10,7 +10,7 @@ import { DI } from '@/di-symbols.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { SystemWebhookService } from '@/core/SystemWebhookService.js'; import { SystemWebhookService } from '@/core/SystemWebhookService.js';
import { UserEntityService } from '@/core/entities/UserEntityService.js'; import { UserEntityService } from '@/core/entities/UserEntityService.js';
import { CollapsedQueueService } from '@/global/CollapsedQueueService.js'; import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
import { TimeService } from '@/global/TimeService.js'; import { TimeService } from '@/global/TimeService.js';
@Injectable() @Injectable()

2
packages/backend/src/core/activitypub/models/ApPersonService.ts
View file

@ -46,7 +46,7 @@ import { isRetryableError } from '@/misc/is-retryable-error.js';
import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js';
import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js'; import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
import { QueueService } from '@/core/QueueService.js'; import { QueueService } from '@/core/QueueService.js';
import { InternalEventService } from '@/core/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
import { CollapsedQueueService } from '@/core/CollapsedQueueService.js'; import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
import { promiseMap } from '@/misc/promise-map.js'; import { promiseMap } from '@/misc/promise-map.js';
import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js'; import { getApId, getApType, getNullableApId, isActor, isPost, isPropertyValue } from '../type.js';

2
packages/backend/src/misc/collapsed-queue.ts
View file

@ -5,7 +5,7 @@
import promiseLimit from 'promise-limit'; import promiseLimit from 'promise-limit';
import type { TimeService, TimerHandle } from '@/global/TimeService.js'; import type { TimeService, TimerHandle } from '@/global/TimeService.js';
import { InternalEventService } from '@/core/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { Serialized } from '@/types.js'; import { Serialized } from '@/types.js';

2
packages/backend/src/queue/processors/BackgroundTaskProcessorService.ts
View file

@ -30,7 +30,7 @@ import { ApLogService } from '@/core/ApLogService.js';
import { CollapsedQueueService } from '@/core/CollapsedQueueService.js'; import { CollapsedQueueService } from '@/core/CollapsedQueueService.js';
import { isRemoteUser } from '@/models/User.js'; import { isRemoteUser } from '@/models/User.js';
import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js'; import { errorCodes, IdentifiableError } from '@/misc/identifiable-error.js';
import { TimeService } from '@/core/TimeService.js'; import { TimeService } from '@/global/TimeService.js';
@Injectable() @Injectable()
export class BackgroundTaskProcessorService { export class BackgroundTaskProcessorService {

3
packages/backend/test/misc/mock-resolver.ts
View file

@ -22,6 +22,7 @@ import type {
UsersRepository, UsersRepository,
} from '@/models/_.js'; } from '@/models/_.js';
import type { CacheService } from '@/core/CacheService.js'; import type { CacheService } from '@/core/CacheService.js';
import type { MiLocalUser } from '@/models/User.js';
import { ApLogService } from '@/core/ApLogService.js'; import { ApLogService } from '@/core/ApLogService.js';
import { LoggerService } from '@/core/LoggerService.js'; import { LoggerService } from '@/core/LoggerService.js';
import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js'; import { ApUtilityService } from '@/core/activitypub/ApUtilityService.js';
@ -31,7 +32,7 @@ import { bindThis } from '@/decorators.js';
import { Resolver } from '@/core/activitypub/ApResolverService.js'; import { Resolver } from '@/core/activitypub/ApResolverService.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import { IdentifiableError } from '@/misc/identifiable-error.js'; import { IdentifiableError } from '@/misc/identifiable-error.js';
import type { MiLocalUser } from '@/models/User.js'; import { NativeTimeService } from '@/global/TimeService.js';
type MockResponse = { type MockResponse = {
type: string; type: string;