Merge pull request #1377 from akihikodaki/misc

This commit is contained in:
syuilo 2018-04-03 12:11:51 +09:00 committed by GitHub
commit 858999b07f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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) {
// duplicate key error
if (exception instanceof MongoError && exception.code === 11000) {
return null;
}
throw exception;
}
await new Promise((resolve, reject) => {
queue.create('http', { type: 'follow', following: following._id }).save(error => { queue.create('http', { type: 'follow', following: following._id }).save(error => {
if (error) { if (error) {
reject(error); reject(error);
} else { } else {
resolve(null); resolve();
} }
}); });
}); }), error => {
// duplicate key error
if (error instanceof MongoError && error.code === 11000) {
return;
}
throw error;
})
]);
return null;
}; };

View File

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