Skip to content

Commit 345290a

Browse files
authored
Fix InboxのkeyId探索遅そう Fix #4836 (#4837)
1 parent 36db6dc commit 345290a

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/queue/processors/inbox.ts

+7-12
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,14 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
5858
//#region resolve http-signature signer
5959
let user: IRemoteUser | null;
6060

61-
// keyIdを元にDBから取得
62-
user = await dbResolver.getRemoteUserFromKeyId(signature.keyId);
63-
64-
// || activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
65-
if (user == null) {
66-
try {
67-
user = await resolvePerson(getApId(activity.actor), undefined, resolver, isDelete(activity) || isUndo(activity)) as IRemoteUser;
68-
} catch (e) {
69-
if (e instanceof StatusError && e.isPermanentError) {
70-
return `skip: Ignored actor ${activity.actor} - ${e.statusCode}`;
71-
}
72-
throw `Error in actor ${activity.actor} - ${e.statusCode || e}`;
61+
// activity.actorを元にDBから取得 || activity.actorを元にリモートから取得
62+
try {
63+
user = await resolvePerson(getApId(activity.actor), undefined, resolver, isDelete(activity) || isUndo(activity)) as IRemoteUser;
64+
} catch (e) {
65+
if (e instanceof StatusError && e.isPermanentError) {
66+
return `skip: Ignored actor ${activity.actor} - ${e.statusCode}`;
7367
}
68+
throw `Error in actor ${activity.actor} - ${e.statusCode || e}`;
7469
}
7570

7671
// http-signature signer がわからなければ終了

0 commit comments

Comments
 (0)