Accept remote follow

This commit is contained in:
Akihiko Odaki 2018-04-03 12:07:29 +09:00
parent 32c008d008
commit cc3704c3e9
2 changed files with 32 additions and 21 deletions

View file

@ -4,11 +4,13 @@ import Following from '../../../models/following';
import User from '../../../models/user'; import User from '../../../models/user';
import config from '../../../config'; import config from '../../../config';
import queue from '../../../queue'; import queue from '../../../queue';
import context from '../renderer/context';
import renderAccept from '../renderer/accept';
import request from '../../request';
export default async (actor, activity) => { export default async (actor, activity) => {
const prefix = config.url + '/@'; const prefix = config.url + '/@';
const id = activity.object.id || activity.object; const id = activity.object.id || activity.object;
let following;
if (!id.startsWith(prefix)) { if (!id.startsWith(prefix)) {
return null; return null;
@ -24,28 +26,33 @@ export default async (actor, activity) => {
throw new Error(); throw new Error();
} }
try { const accept = renderAccept(activity);
following = await Following.insert({ accept['@context'] = context;
await Promise.all([
request(followee, actor.account.inbox, accept),
Following.insert({
createdAt: new Date(), createdAt: new Date(),
followerId: actor._id, followerId: actor._id,
followeeId: followee._id followeeId: followee._id
}); }).then(following => new Promise((resolve, reject) => {
} catch (exception) { queue.create('http', { type: 'follow', following: following._id }).save(error => {
// duplicate key error if (error) {
if (exception instanceof MongoError && exception.code === 11000) { reject(error);
return null; } else {
} resolve();
}
throw exception; });
} }), error => {
// duplicate key error
await new Promise((resolve, reject) => { if (error instanceof MongoError && error.code === 11000) {
queue.create('http', { type: 'follow', following: following._id }).save(error => { return;
if (error) {
reject(error);
} else {
resolve(null);
} }
});
}); throw error;
})
]);
return null;
}; };

View file

@ -0,0 +1,4 @@
export default object => ({
type: 'Accept',
object
});