summaryrefslogtreecommitdiff
path: root/src/services/note
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-17 19:37:32 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-17 19:37:32 +0900
commit611e4f34dcb90666f2bc3da699dc965e30f7cba6 (patch)
tree4a37539090b4c90ee4dfe5b08d8aae0682678032 /src/services/note
parentMerge branch 'develop' (diff)
parent11.1.5 (diff)
downloadmisskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.tar.gz
misskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.tar.bz2
misskey-611e4f34dcb90666f2bc3da699dc965e30f7cba6.zip
Merge branch 'develop'
Diffstat (limited to 'src/services/note')
-rw-r--r--src/services/note/create.ts2
-rw-r--r--src/services/note/polls/vote.ts2
-rw-r--r--src/services/note/reaction/create.ts2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 8c85a5c275..02e33d6789 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -253,7 +253,7 @@ export default async (user: User, data: Option, silent = false) => new Promise<N
deliverNoteToMentionedRemoteUsers(mentionedUsers, user, noteActivity);
}
- const profile = await UserProfiles.findOne({ userId: user.id }).then(ensure);
+ const profile = await UserProfiles.findOne(user.id).then(ensure);
// If has in reply to note
if (data.reply) {
diff --git a/src/services/note/polls/vote.ts b/src/services/note/polls/vote.ts
index c6876484f5..aee52ba10d 100644
--- a/src/services/note/polls/vote.ts
+++ b/src/services/note/polls/vote.ts
@@ -67,7 +67,7 @@ export default async function(user: User, note: Note, choice: number) {
}
});
- const profile = await UserProfiles.findOne({ userId: user.id });
+ const profile = await UserProfiles.findOne(user.id);
// ローカルユーザーが投票した場合この投稿をWatchする
if (Users.isLocalUser(user) && profile!.autoWatch) {
diff --git a/src/services/note/reaction/create.ts b/src/services/note/reaction/create.ts
index 0e8bcebdbc..7711ba0737 100644
--- a/src/services/note/reaction/create.ts
+++ b/src/services/note/reaction/create.ts
@@ -80,7 +80,7 @@ export default async (user: User, note: Note, reaction?: string) => {
}
});
- const profile = await UserProfiles.findOne({ userId: user.id });
+ const profile = await UserProfiles.findOne(user.id);
// ユーザーがローカルユーザーかつ自動ウォッチ設定がオンならばこの投稿をWatchする
if (Users.isLocalUser(user) && profile!.autoWatch) {