Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
839526a9
Commit
839526a9
authored
Dec 05, 2018
by
lain
Browse files
TwitterAPI: Add network hiding.
parent
8c9a4e8b
Pipeline
#4983
passed with stages
in 4 minutes and 49 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/user/info.ex
View file @
839526a9
...
...
@@ -135,7 +135,8 @@ def profile_update(info, params) do
:locked
,
:no_rich_text
,
:default_scope
,
:banner
:banner
,
:hide_network
])
end
...
...
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
839526a9
...
...
@@ -431,7 +431,7 @@ def raw_empty_array(conn, _params) do
defp
build_info_cng
(
user
,
params
)
do
info_params
=
[
"no_rich_text"
,
"locked"
]
[
"no_rich_text"
,
"locked"
,
"hide_network"
]
|>
Enum
.
reduce
(%{},
fn
key
,
res
->
if
value
=
params
[
key
]
do
Map
.
put
(
res
,
key
,
value
==
"true"
)
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
839526a9
...
...
@@ -1024,6 +1024,30 @@ test "it updates a user's profile", %{conn: conn} do
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
,
for:
user
})
end
test
"it sets and un-sets hide_network"
,
%{
conn:
conn
}
do
user
=
insert
(
:user
)
conn
|>
assign
(
:user
,
user
)
|>
post
(
"/api/account/update_profile.json"
,
%{
"hide_network"
=>
"true"
})
user
=
Repo
.
get!
(
User
,
user
.
id
)
assert
user
.
info
.
hide_network
==
true
conn
=
conn
|>
assign
(
:user
,
user
)
|>
post
(
"/api/account/update_profile.json"
,
%{
"hide_network"
=>
"false"
})
user
=
Repo
.
get!
(
User
,
user
.
id
)
assert
user
.
info
.
hide_network
==
false
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
,
for:
user
})
end
test
"it locks an account"
,
%{
conn:
conn
}
do
user
=
insert
(
:user
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment