projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
299ef74
)
user: fix maybe_direct_follow() after user_info() refactoring broke it slightly
author
William Pitcock
<nenolod@dereferenced.org>
Fri, 8 Jun 2018 02:47:07 +0000
(
02:47
+0000)
committer
William Pitcock
<nenolod@dereferenced.org>
Fri, 8 Jun 2018 02:52:36 +0000
(
02:52
+0000)
lib/pleroma/user.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index b1b935a0f4e95919f2a10e31999c976b16a48915..828370cabb43df0e61d206fddd87b292f9fdc8a2 100644
(file)
--- 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