usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolver.resolveがacct like urlを解決できる必要性はいっさいなさそう

This commit is contained in:
tamaina 2025-08-30 20:41:57 +09:00
parent eb86784b6a
commit 3561dc98cf
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/backend/src/core/activitypub/ApResolverService.ts
View File

@ -16,8 +16,8 @@ import { LoggerService } from '@/core/LoggerService.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
import { SystemAccountService } from '@/core/SystemAccountService.js'; import { SystemAccountService } from '@/core/SystemAccountService.js';
import { IdentifiableError } from '@/misc/identifiable-error.js'; import { IdentifiableError } from '@/misc/identifiable-error.js';
import { getApId, isCollectionOrOrderedCollection } from './type.js'; import { isCollectionOrOrderedCollection } from './type.js';
import { ApDbResolverService, type UriParseResult } from './ApDbResolverService.js'; import { ApDbResolverService } from './ApDbResolverService.js';
import { ApRendererService } from './ApRendererService.js'; import { ApRendererService } from './ApRendererService.js';
import { ApRequestService } from './ApRequestService.js'; import { ApRequestService } from './ApRequestService.js';
import { FetchAllowSoftFailMask } from './misc/check-against-url.js'; import { FetchAllowSoftFailMask } from './misc/check-against-url.js';
@ -96,9 +96,8 @@ export class Resolver {
this.history.add(value); this.history.add(value);
const host = this.utilityService.extractDbHost(value); const host = this.utilityService.extractDbHost(value);
const parsed = this.apDbResolverService.parseLocalUri(value); if (this.utilityService.isSelfHost(host)) {
if (parsed.local === true) { return await this.resolveLocal(value);
return await this.resolveLocal(getApId(value), parsed);
} }
if (!this.utilityService.isFederationAllowedHost(host)) { if (!this.utilityService.isFederationAllowedHost(host)) {
@ -125,18 +124,9 @@ export class Resolver {
} }
@bindThis @bindThis
private resolveLocal(url: string, parsed: UriParseResult): Promise<IObject> { private resolveLocal(url: string): Promise<IObject> {
if (parsed.local === false || 'uri' in parsed) { const parsed = this.apDbResolverService.parseLocalUri(url);
throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', 'resolveLocal: not local'); if (!parsed.local) throw new IdentifiableError('02b40cd0-fa92-4b0c-acc9-fb2ada952ab8', 'resolveLocal: not local');
}
if ('acct' in parsed) {
return this.usersRepository.findOneByOrFail({
usernameLower: parsed.acct.username.toLowerCase(),
host: IsNull(),
})
.then(user => this.apRendererService.renderPerson(user as MiLocalUser));
}
switch (parsed.type) { switch (parsed.type) {
case 'notes': case 'notes':