aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-06-08 02:47:07 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-06-08 02:52:36 +0000
commit1e9dd6fbc2ecf0c3e7528c40f3145b2a9e591d7a (patch)
tree393016292dff4d443dcc294a7a37490fcfacb622 /lib
parent299ef74f2e840ebdb79fce13a2f56c55563219a9 (diff)
downloadpleroma-1e9dd6fbc2ecf0c3e7528c40f3145b2a9e591d7a.tar.gz
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
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 b1b935a0f..828370cab 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -174,7 +174,7 @@ defmodule Pleroma.User do
should_direct_follow =
cond do
# if the account is locked, don't pre-create the relationship
- user_info["locked"] == true ->
+ user_info[:locked] == true ->
false
# if the users are blocking each other, we shouldn't even be here, but check for it anyway
@@ -193,7 +193,7 @@ defmodule Pleroma.User do
if should_direct_follow do
follow(follower, followed)
else
- follower
+ {:ok, follower}
end
end