mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-11 13:18:54 +09:00
Code

Merge pull request #1530 from mei23/mei-ap3

Browse Source 
Fix can't communicate with other Misskey
This commit is contained in:
syuilo 2018-04-22 06:22:42 +09:00 committed by GitHub
commit 1aeeb1f073
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/queue/processors/http/process-inbox.ts
View File

@ -33,6 +33,11 @@ export default async (job: kue.Job, done): Promise<void> => {
} }
user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser; user = await User.findOne({ usernameLower: username, host: host.toLowerCase() }) as IRemoteUser;
// アクティビティを送信してきたユーザーがまだMisskeyサーバーに登録されていなかったら登録する
if (user === null) {
user = await resolvePerson(activity.actor);
}
} else { } else {
user = await User.findOne({ user = await User.findOne({
host: { $ne: null }, host: { $ne: null },

5
src/remote/activitypub/request.ts
View File

@ -40,5 +40,10 @@ export default (user: ILocalUser, url: string, object) => new Promise((resolve,
keyId: `acct:${user.username}@${config.host}` keyId: `acct:${user.username}@${config.host}`
}); });
// Signature: Signature ... => Signature: ...
let sig = req.getHeader('Signature').toString();
sig = sig.replace(/^Signature /, '');
req.setHeader('Signature', sig);
req.end(JSON.stringify(object)); req.end(JSON.stringify(object));
}); });