hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

Browse source 
This reverts merge request !733
This commit is contained in:
kaniini 2019-02-01 20:22:58 +00:00
commit 486749064f
10 changed files with 45 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
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_followers -> []
user.info.hide_network -> []
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_followings -> []
user.info.hide_network -> []
true -> followers
end