diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-23 23:47:36 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-23 23:47:36 +0000 |
| commit | 4983e6e9d2b0830294193f18de5cb1a84f1ec388 (patch) | |
| tree | 43b4b2e28eca2a849a3885b51696ca2b4341e3ca | |
| parent | 4a278cd80a02fa1882db17397bb97b155c76570e (diff) | |
| parent | 4333fea1dc2942526c78d97f3e8694fdc79b0575 (diff) | |
| download | pleroma-4983e6e9d2b0830294193f18de5cb1a84f1ec388.tar.gz pleroma-4983e6e9d2b0830294193f18de5cb1a84f1ec388.zip | |
Merge branch 'fix/hide-network-setting' into 'develop'
Send "hide_network" in user_view
See merge request pleroma/pleroma!704
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 1 | ||||
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index a8cf83613..15682db8f 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -108,6 +108,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "locked" => user.info.locked, "default_scope" => user.info.default_scope, "no_rich_text" => user.info.no_rich_text, + "hide_network" => user.info.hide_network, "fields" => fields, # Pleroma extension diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 5f7481eb6..daf18c1c5 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -100,6 +100,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -146,6 +147,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -193,6 +195,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, @@ -254,6 +257,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "locked" => false, "default_scope" => "public", "no_rich_text" => false, + "hide_network" => false, "fields" => [], "pleroma" => %{ "confirmation_pending" => false, |