summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-17 14:32:59 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-17 14:32:59 +0900
commit0ede390fefb4aae460deccc09755af85e5af6002 (patch)
treea3d86468bd6ef53e206382a2812eb74e2039ccc5 /src/services
parentFix #4721 Fix #4722 (diff)
downloadsharkey-0ede390fefb4aae460deccc09755af85e5af6002.tar.gz
sharkey-0ede390fefb4aae460deccc09755af85e5af6002.tar.bz2
sharkey-0ede390fefb4aae460deccc09755af85e5af6002.zip
Refactor
Diffstat (limited to 'src/services')
-rw-r--r--src/services/drive/add-file.ts2
-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
4 files changed, 4 insertions, 4 deletions
diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts
index cdb1a60092..9287fa820b 100644
--- a/src/services/drive/add-file.ts
+++ b/src/services/drive/add-file.ts
@@ -372,7 +372,7 @@ export default async function(
propPromises = [calcWh(), calcAvg()];
}
- const profile = await UserProfiles.findOne({ userId: user.id });
+ const profile = await UserProfiles.findOne(user.id);
const [folder] = await Promise.all([fetchFolder(), Promise.all(propPromises)]);
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) {