diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-02-15 05:58:18 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-02-15 05:58:18 +0900 |
| commit | a6c3663155c2faed2954bb4265adba3c483043c0 (patch) | |
| tree | f8019cb807f3af8011cac6f5cbff251970a9d1f6 /src | |
| parent | Update setup.ja.md (diff) | |
| parent | 既にフォローされている場合はフォローリクエストを生... (diff) | |
| download | misskey-a6c3663155c2faed2954bb4265adba3c483043c0.tar.gz misskey-a6c3663155c2faed2954bb4265adba3c483043c0.tar.bz2 misskey-a6c3663155c2faed2954bb4265adba3c483043c0.zip | |
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
| -rw-r--r-- | src/services/following/create.ts | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/services/following/create.ts b/src/services/following/create.ts index a050f40b0e..5a92e4103a 100644 --- a/src/services/following/create.ts +++ b/src/services/following/create.ts @@ -153,8 +153,17 @@ export default async function(follower: IUser, followee: IUser, requestId?: stri if (followee.isLocked || (followee.carefulBot && follower.isBot) || (isLocalUser(follower) && isRemoteUser(followee))) { let autoAccept = false; + // 鍵アカウントであっても、既にフォローされていた場合はスルー + const following = await Following.findOne({ + followerId: follower._id, + followeeId: followee._id, + }); + if (following) { + autoAccept = true; + } + // フォローしているユーザーは自動承認オプション - if (isLocalUser(followee) && followee.autoAcceptFollowed) { + if (!autoAccept && (isLocalUser(followee) && followee.autoAcceptFollowed)) { const followed = await Following.findOne({ followerId: followee._id, followeeId: follower._id |