aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-05 12:06:45 +0200
committerlain <lain@soykaf.club>2019-06-05 12:06:45 +0200
commit8b9a0dd4a7e60f610e3aa1db92e62bc0fbe54521 (patch)
tree7123f6083e911a43a0e68ed92db9d53b1789b814 /lib
parente4babb1c9ff4c28ff08888736cc330a48b19b396 (diff)
downloadpleroma-8b9a0dd4a7e60f610e3aa1db92e62bc0fbe54521.tar.gz
User: Don't error out when following a user that's already followed.
This leads to a few situations where it is impossible to follow a user.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/user.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index dc534b05c..48b9f1d7d 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 deactivatedt."}
deny_follow_blocked and blocks?(followed, follower) ->
{:error, "Could not follow user: #{followed.nickname} blocked you."}