diff options
author | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
commit | 09e1c8c05dedf96710571a55f0be65fdff4ccdd0 (patch) | |
tree | d639c4f000b3ecafa6c5b7ea8b99f25557ac5141 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 28bfb09b01d324e149e9f36a74db2674a07b07da (diff) | |
parent | 486749064f72ac5078a42ed339519afbbf48027a (diff) | |
download | pleroma-09e1c8c05dedf96710571a55f0be65fdff4ccdd0.tar.gz |
Merge branch 'revert-0a82a7e6' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma!758
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 5e3fe9352..3064d61ea 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -503,7 +503,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do followers = cond do for_user && user.id == for_user.id -> followers - user.info.hide_followers -> [] + user.info.hide_network -> [] true -> followers end @@ -523,7 +523,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do friends = cond do for_user && user.id == for_user.id -> friends - user.info.hide_followings -> [] + user.info.hide_network -> [] true -> friends end @@ -618,7 +618,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do defp build_info_cng(user, params) do info_params = - ["no_rich_text", "locked", "hide_followers", "hide_followings"] + ["no_rich_text", "locked", "hide_network"] |> Enum.reduce(%{}, fn key, res -> if value = params[key] do Map.put(res, key, value == "true") |