Merge branch 'master' of https://github.com/syuilo/misskey
This commit is contained in:
commit
ee13d2382b
2 changed files with 10 additions and 0 deletions
|
@ -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 },
|
||||||
|
|
|
@ -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));
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in a new issue