aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLain Iwakura <lain@soykaf.club>2017-12-07 17:51:55 +0100
committerLain Iwakura <lain@soykaf.club>2017-12-07 17:51:55 +0100
commita78ae2a685769cbf7459eb347aca581d389018ad (patch)
treeacdeeabb37fa71b70b64ac9b42ab86667eac0886 /lib
parentb727ecc5e75388e2b2d67c76cab6df1a7e6719b3 (diff)
downloadpleroma-a78ae2a685769cbf7459eb347aca581d389018ad.tar.gz
Don't follow deactivated users.
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 779a89a12..b21caba9d 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -142,9 +142,9 @@ defmodule Pleroma.User do
end
end
- def follow(%User{} = follower, %User{} = followed) do
+ def follow(%User{} = follower, %User{info: info} = followed) do
ap_followers = followed.follower_address
- if following?(follower, followed) do
+ if following?(follower, followed) or info["deactivated"] do
{:error,
"Could not follow user: #{followed.nickname} is already on your list."}
else