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-11-06 23:55:01 -05:00
parent ac324655c3
commit 1fc337f9d0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
packages/backend/src/core/RemoteUserResolveService.ts
View file

@ -20,10 +20,10 @@ import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderInlineError } from '@/misc/render-inline-error.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';
import * as Acct from '@/misc/acct.js'; import * as Acct from '@/misc/acct.js';
import { IdentifiableError } from '@/misc/identifiable-error.js'; import { IdentifiableError } from '@/misc/identifiable-error.js';
import { InternalEventService } from '@/core/InternalEventService.js'; import { InternalEventService } from '@/global/InternalEventService.js';
@Injectable() @Injectable()
export class RemoteUserResolveService { export class RemoteUserResolveService {

1
packages/backend/src/core/UtilityService.ts
View file

@ -15,6 +15,7 @@ import type { MiMeta, SoftwareSuspension } from '@/models/Meta.js';
import type { MiInstance } from '@/models/Instance.js'; import type { MiInstance } from '@/models/Instance.js';
import { IdentifiableError } from '@/misc/identifiable-error.js'; import { IdentifiableError } from '@/misc/identifiable-error.js';
import { EnvService } from '@/global/EnvService.js'; import { EnvService } from '@/global/EnvService.js';
import { getApId, type IObject } from '@/core/activitypub/type.js';
export type UriParseResult = { export type UriParseResult = {
/** wether the URI was generated by us */ /** wether the URI was generated by us */