From 7ecfc007a99d1df6d65b5f227a49d295e3df5913 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Sun, 18 Aug 2019 12:47:45 +0900 Subject: updateHashtagを並列で行わないように (#5284) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/remote/activitypub/models/person.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/remote') diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts index bfcad100fe..b09446d698 100644 --- a/src/remote/activitypub/models/person.ts +++ b/src/remote/activitypub/models/person.ts @@ -12,7 +12,7 @@ import { ITag, extractHashtags } from './tag'; import { IIdentifier } from './identifier'; import { apLogger } from '../logger'; import { Note } from '../../../models/entities/note'; -import { updateHashtag } from '../../../services/update-hashtag'; +import { updateUsertags } from '../../../services/update-hashtag'; import { Users, UserNotePinings, Instances, DriveFiles, Followings, UserProfiles, UserPublickeys } from '../../../models'; import { User, IRemoteUser } from '../../../models/entities/user'; import { Emoji } from '../../../models/entities/emoji'; @@ -194,8 +194,7 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise !tags.includes(x))) updateHashtag(user!, tag, true, false); + updateUsertags(user!, tags); //#region アイコンとヘッダー画像をフェッチ const [avatar, banner] = (await Promise.all([ @@ -355,8 +354,7 @@ export async function updatePerson(uri: string, resolver?: Resolver | null, hint }); // ハッシュタグ更新 - for (const tag of tags) updateHashtag(exist, tag, true, true); - for (const tag of (exist.tags || []).filter(x => !tags.includes(x))) updateHashtag(exist, tag, true, false); + updateUsertags(exist, tags); // 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする await Followings.update({ -- cgit v1.2.3-freya