Merge branch 'feature/split-hide-network-v2' into 'develop'

Split hide_network into hide_followers & hide_followings (fixed)

See merge request pleroma/pleroma!765
This commit is contained in:
kaniini 2019-02-05 18:56:59 +00:00
commit eb2b1960e0
10 changed files with 90 additions and 45 deletions

View file

@ -605,7 +605,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
followers =
cond do
for_user && user.id == for_user.id -> followers
user.info.hide_network -> []
user.info.hide_followers -> []
true -> followers
end
@ -621,7 +621,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
followers =
cond do
for_user && user.id == for_user.id -> followers
user.info.hide_network -> []
user.info.hide_followings -> []
true -> followers
end