diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-05 11:07:54 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-05 11:07:54 +0000 |
| commit | 50afe5ab9e384676a7e64b476f3655ccf94acb5d (patch) | |
| tree | c95c70401ec98e26d98339b22a06dd06313176d6 /lib | |
| parent | eda4b00a6a76dc282fe83582e7e24209379d4025 (diff) | |
| parent | 024dfdc39c80e3a0c9f625f31101fc6aa896e93d (diff) | |
| download | pleroma-50afe5ab9e384676a7e64b476f3655ccf94acb5d.tar.gz pleroma-50afe5ab9e384676a7e64b476f3655ccf94acb5d.zip | |
Merge branch 'fix-stuck-follows' into 'develop'
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index dc534b05c..d873d7623 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -370,8 +370,8 @@ defmodule Pleroma.User do ap_followers = followed.follower_address cond do - following?(follower, followed) or info.deactivated -> - {:error, "Could not follow user: #{followed.nickname} is already on your list."} + info.deactivated -> + {:error, "Could not follow user: You are deactivated."} deny_follow_blocked and blocks?(followed, follower) -> {:error, "Could not follow user: #{followed.nickname} blocked you."} |