From acb82fe7b643519411673fbab5157f5d8ebf4fa6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 9 Feb 2019 12:04:03 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC=E5=87=A6?= =?UTF-8?q?=E7=90=86=E3=81=AE=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF=E3=82=BF?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=B0=20(#4196)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix #4185 * Fix bug --- src/services/following/create.ts | 170 ++++++++++++---------- src/services/following/requests/accept.ts | 62 +------- 2 files changed, 99 insertions(+), 133 deletions(-) diff --git a/src/services/following/create.ts b/src/services/following/create.ts index 05f463258..e6c95a72a 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -13,6 +13,101 @@ import perUserFollowingChart from '../../services/chart/per-user-following'; import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc'; import Instance from '../../models/instance'; import instanceChart from '../../services/chart/instance'; +import Logger from '../../misc/logger'; +import FollowRequest from '../../models/follow-request'; + +const logger = new Logger('following/create'); + +export async function insertFollowingDoc(followee: IUser, follower: IUser) { + let alreadyFollowed = false; + + await Following.insert({ + createdAt: new Date(), + followerId: follower._id, + followeeId: followee._id, + + // 非正規化 + _follower: { + host: follower.host, + inbox: isRemoteUser(follower) ? follower.inbox : undefined, + sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined + }, + _followee: { + host: followee.host, + inbox: isRemoteUser(followee) ? followee.inbox : undefined, + sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined + } + }).catch(e => { + if (e.code === 11000 && isRemoteUser(follower) && isLocalUser(followee)) { + logger.info(`Insert duplicated ignore. ${follower._id} => ${followee._id}`); + alreadyFollowed = true; + } else { + throw e; + } + }); + + await FollowRequest.remove({ + followeeId: followee._id, + followerId: follower._id + }); + + if (alreadyFollowed) return; + + //#region Increment counts + User.update({ _id: follower._id }, { + $inc: { + followingCount: 1 + } + }); + + User.update({ _id: followee._id }, { + $inc: { + followersCount: 1 + } + }); + //#endregion + + //#region Update instance stats + if (isRemoteUser(follower) && isLocalUser(followee)) { + registerOrFetchInstanceDoc(follower.host).then(i => { + Instance.update({ _id: i._id }, { + $inc: { + followingCount: 1 + } + }); + + instanceChart.updateFollowing(i.host, true); + }); + } else if (isLocalUser(follower) && isRemoteUser(followee)) { + registerOrFetchInstanceDoc(followee.host).then(i => { + Instance.update({ _id: i._id }, { + $inc: { + followersCount: 1 + } + }); + + instanceChart.updateFollowers(i.host, true); + }); + } + //#endregion + + perUserFollowingChart.update(follower, followee, true); + + // Publish follow event + if (isLocalUser(follower)) { + packUser(followee, follower, { + detail: true + }).then(packed => publishMainStream(follower._id, 'follow', packed)); + } + + // Publish followed event + if (isLocalUser(followee)) { + packUser(follower, followee).then(packed => publishMainStream(followee._id, 'followed', packed)), + + // 通知を作成 + notify(followee._id, follower._id, 'follow'); + } +} export default async function(follower: IUser, followee: IUser, requestId?: string) { // check blocking @@ -66,80 +161,7 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri } } - await Following.insert({ - createdAt: new Date(), - followerId: follower._id, - followeeId: followee._id, - - // 非正規化 - _follower: { - host: follower.host, - inbox: isRemoteUser(follower) ? follower.inbox : undefined, - sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined - }, - _followee: { - host: followee.host, - inbox: isRemoteUser(followee) ? followee.inbox : undefined, - sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined - } - }); - - //#region Increment following count - User.update({ _id: follower._id }, { - $inc: { - followingCount: 1 - } - }); - //#endregion - - //#region Increment followers count - User.update({ _id: followee._id }, { - $inc: { - followersCount: 1 - } - }); - //#endregion - - //#region Update instance stats - if (isRemoteUser(follower) && isLocalUser(followee)) { - registerOrFetchInstanceDoc(follower.host).then(i => { - Instance.update({ _id: i._id }, { - $inc: { - followingCount: 1 - } - }); - - instanceChart.updateFollowing(i.host, true); - }); - } else if (isLocalUser(follower) && isRemoteUser(followee)) { - registerOrFetchInstanceDoc(followee.host).then(i => { - Instance.update({ _id: i._id }, { - $inc: { - followersCount: 1 - } - }); - - instanceChart.updateFollowers(i.host, true); - }); - } - //#endregion - - perUserFollowingChart.update(follower, followee, true); - - // Publish follow event - if (isLocalUser(follower)) { - packUser(followee, follower, { - detail: true - }).then(packed => publishMainStream(follower._id, 'follow', packed)); - } - - // Publish followed event - if (isLocalUser(followee)) { - packUser(follower, followee).then(packed => publishMainStream(followee._id, 'followed', packed)), - - // 通知を作成 - notify(followee._id, follower._id, 'follow'); - } + await insertFollowingDoc(followee, follower); if (isRemoteUser(follower) && isLocalUser(followee)) { const content = renderActivity(renderAccept(renderFollow(follower, followee, requestId), followee)); diff --git a/src/services/following/requests/accept.ts b/src/services/following/requests/accept.ts index 34c7036d1..81ecc74ab 100644 --- a/src/services/following/requests/accept.ts +++ b/src/services/following/requests/accept.ts @@ -1,43 +1,14 @@ -import User, { IUser, isRemoteUser, ILocalUser, pack as packUser, isLocalUser } from '../../../models/user'; +import User, { IUser, isRemoteUser, ILocalUser, pack as packUser } from '../../../models/user'; import FollowRequest from '../../../models/follow-request'; import { renderActivity } from '../../../remote/activitypub/renderer'; import renderFollow from '../../../remote/activitypub/renderer/follow'; import renderAccept from '../../../remote/activitypub/renderer/accept'; import { deliver } from '../../../queue'; -import Following from '../../../models/following'; import { publishMainStream } from '../../stream'; -import perUserFollowingChart from '../../../services/chart/per-user-following'; -import Logger from '../../../misc/logger'; - -const logger = new Logger('following/requests/accept'); +import { insertFollowingDoc } from '../create'; export default async function(followee: IUser, follower: IUser) { - let incremented = 1; - - await Following.insert({ - createdAt: new Date(), - followerId: follower._id, - followeeId: followee._id, - - // 非正規化 - _follower: { - host: follower.host, - inbox: isRemoteUser(follower) ? follower.inbox : undefined, - sharedInbox: isRemoteUser(follower) ? follower.sharedInbox : undefined - }, - _followee: { - host: followee.host, - inbox: isRemoteUser(followee) ? followee.inbox : undefined, - sharedInbox: isRemoteUser(followee) ? followee.sharedInbox : undefined - } - }).catch(e => { - if (e.code === 11000 && isRemoteUser(follower) && isLocalUser(followee)) { - logger.info(`Accept => Insert duplicated ignore. ${follower._id} => ${followee._id}`); - incremented = 0; - } else { - throw e; - } - }); + await insertFollowingDoc(followee, follower); if (isRemoteUser(follower)) { const request = await FollowRequest.findOne({ @@ -49,29 +20,6 @@ export default async function(followee: IUser, follower: IUser) { deliver(followee as ILocalUser, content, follower.inbox); } - await FollowRequest.remove({ - followeeId: followee._id, - followerId: follower._id - }); - - //#region Increment following count - await User.update({ _id: follower._id }, { - $inc: { - followingCount: incremented - } - }); - //#endregion - - //#region Increment followers count - await User.update({ _id: followee._id }, { - $inc: { - followersCount: incremented - } - }); - //#endregion - - perUserFollowingChart.update(follower, followee, true); - await User.update({ _id: followee._id }, { $inc: { pendingReceivedFollowRequestsCount: -1 @@ -81,8 +29,4 @@ export default async function(followee: IUser, follower: IUser) { packUser(followee, followee, { detail: true }).then(packed => publishMainStream(followee._id, 'meUpdated', packed)); - - packUser(followee, follower, { - detail: true - }).then(packed => publishMainStream(follower._id, 'follow', packed)); }