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

Merge a5727cb72a into 8c413d01e6

This commit is contained in:
anatawa12 2025-09-17 18:53:21 +09:00 committed by GitHub
parent 8c413d01e6 a5727cb72a
commit ed8b7f797f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
packages/backend/src/server/api/endpoints/ap/show.ts
View File

@ -21,6 +21,10 @@ import { bindThis } from '@/decorators.js';
import { ApiError } from '../../error.js';
import { IdentifiableError } from '@/misc/identifiable-error.js';
import { FetchAllowSoftFailMask } from '@/core/activitypub/misc/check-against-url.js';
import * as Acct from '@/misc/acct.js';
import { IsNull } from 'typeorm';
import { DI } from '@/di-symbols.js';
import type { NotesRepository, UsersRepository } from '@/models/_.js';
export const meta = {
tags: ['federation'],
@ -109,6 +113,9 @@ export const paramDef = {
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
constructor(
@Inject(DI.usersRepository)
private usersRepository: UsersRepository,
private utilityService: UtilityService,
private userEntityService: UserEntityService,
private noteEntityService: NoteEntityService,
@ -137,7 +144,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
}
let local = await this.mergePack(me, ...await Promise.all([
this.apDbResolverService.getUserFromApId(uri),
this.apDbResolverService.getUserFromApId(uri).then(async x => x ?? await this.getUserFromProfileUrl(uri)),
this.apDbResolverService.getNoteFromApId(uri),
]));
if (local != null) return local;
@ -200,6 +207,32 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
);
}
// To keep consistency with ap/show from external server,
// this function will handle `https://local.instance/@user`
// profile url to resolve user.
@bindThis
private async getUserFromProfileUrl(url: string): Promise<MiUser | null | undefined> {
if (!this.utilityService.isUriLocal(url)) {
return null;
}
const uri = new URL(url);
const pathComponents = uri.pathname.split('/').filter(Boolean);
if (pathComponents.length === 1 && pathComponents[0].startsWith('@')) {
const acct = Acct.parse(pathComponents[0]);
// normalize acct host
if (this.utilityService.isSelfHost(acct.host)) acct.host = null;
return await this.usersRepository.findOneBy({
usernameLower: acct.username.toLowerCase(),
host: acct.host ?? IsNull(),
isSuspended: false,
});
}
return null;
}
@bindThis
private async mergePack(me: MiLocalUser | null | undefined, user: MiUser | null | undefined, note: MiNote | null | undefined): Promise<SchemaType<typeof meta.res> | null> {
if (user != null) {