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

acceptAcct

This commit is contained in:
tamaina 2025-08-30 20:55:04 +09:00
parent 3561dc98cf
commit 6614c4343f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/core/activitypub/ApDbResolverService.ts
View File

@ -128,10 +128,10 @@ export class ApDbResolverService implements OnApplicationShutdown {
* AP Person => Misskey User in DB * AP Person => Misskey User in DB
*/ */
@bindThis @bindThis
public async getUserFromApId(value: string | IObject): Promise<MiLocalUser | MiRemoteUser | null> { public async getUserFromApId(value: string | IObject, acceptAcct: boolean = false): Promise<MiLocalUser | MiRemoteUser | null> {
const parsed = this.parseLocalUri(value); const parsed = this.parseLocalUri(value);
if ('acct' in parsed) { if (acceptAcct && 'acct' in parsed) {
return await this.usersRepository.findOneBy({ return await this.usersRepository.findOneBy({
usernameLower: parsed.acct.username.toLowerCase(), usernameLower: parsed.acct.username.toLowerCase(),
host: (parsed.acct.host == null || parsed.local) ? IsNull() : this.utilityService.toPuny(parsed.acct.host), host: (parsed.acct.host == null || parsed.local) ? IsNull() : this.utilityService.toPuny(parsed.acct.host),

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

@ -137,7 +137,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
} }
let local = await this.mergePack(me, ...await Promise.all([ let local = await this.mergePack(me, ...await Promise.all([
this.apDbResolverService.getUserFromApId(uri), this.apDbResolverService.getUserFromApId(uri, true),
this.apDbResolverService.getNoteFromApId(uri), this.apDbResolverService.getNoteFromApId(uri),
])); ]));
if (local != null) return local; if (local != null) return local;