Merge branch 'fix/hide-network-setting' into 'develop'

Send "hide_network" in user_view

See merge request pleroma/pleroma!704
This commit is contained in:
kaniini 2019-01-23 23:47:36 +00:00
commit 4983e6e9d2
2 changed files with 5 additions and 0 deletions

View File

@ -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

View File

@ -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,