summaryrefslogtreecommitdiff
path: root/src/remote
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2019-08-18 12:47:45 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-08-18 12:47:45 +0900
commit7ecfc007a99d1df6d65b5f227a49d295e3df5913 (patch)
tree9bc7619a0a84e59d68797c4330a61ed449e6a5c3 /src/remote
parentFix: Hashtagがupdateできない (#5285) (diff)
downloadsharkey-7ecfc007a99d1df6d65b5f227a49d295e3df5913.tar.gz
sharkey-7ecfc007a99d1df6d65b5f227a49d295e3df5913.tar.bz2
sharkey-7ecfc007a99d1df6d65b5f227a49d295e3df5913.zip
updateHashtagを並列で行わないように (#5284)
Diffstat (limited to 'src/remote')
-rw-r--r--src/remote/activitypub/models/person.ts8
1 files changed, 3 insertions, 5 deletions
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<Us
usersChart.update(user!, true);
// ハッシュタグ更新
- for (const tag of tags) updateHashtag(user!, tag, true, true);
- for (const tag of (user!.tags || []).filter(x => !tags.includes(x))) updateHashtag(user!, tag, true, false);
+ updateUsertags(user!, tags);
//#region アイコンとヘッダー画像をフェッチ
const [avatar, banner] = (await Promise.all<DriveFile | null>([
@@ -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({