summaryrefslogtreecommitdiff
path: root/src/models/user.ts
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-09-04 18:33:16 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-09-04 18:33:16 +0900
commiteaec936fa6a53d0fd1004a613ea09f482198f366 (patch)
treece7f4b15378eeb4dc3f8b4f17de5f86355cb118e /src/models/user.ts
parentfix(package): update webpack to version 4.17.2 (#2599) (diff)
downloadsharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.tar.gz
sharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.tar.bz2
sharkey-eaec936fa6a53d0fd1004a613ea09f482198f366.zip
Fix remote follow (#2606)
Diffstat (limited to 'src/models/user.ts')
-rw-r--r--src/models/user.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/models/user.ts b/src/models/user.ts
index 31d09bc8f8..8f3fbbdc8f 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -432,10 +432,10 @@ export const pack = (
followerId: _user.id,
followeeId: meId
}),
- _user.isLocked ? FollowRequest.findOne({
+ FollowRequest.findOne({
followerId: meId,
followeeId: _user.id
- }) : Promise.resolve(null),
+ }),
FollowRequest.findOne({
followerId: _user.id,
followeeId: meId