usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

既にフォローされている場合はフォローリクエストを生成しないように (#4266)

This commit is contained in:
syuilo 2019-02-15 05:56:28 +09:00 committed by GitHub
parent 6a0d9d70ed
commit 43864f0da4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/following/create.ts
View File

@ -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))) { if (followee.isLocked || (followee.carefulBot && follower.isBot) || (isLocalUser(follower) && isRemoteUser(followee))) {
let autoAccept = false; 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({ const followed = await Following.findOne({
followerId: followee._id, followerId: followee._id,
followeeId: follower._id followeeId: follower._id