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
993312cd
Commit
993312cd
authored
May 28, 2018
by
kaniini
Browse files
twitterapi: add profile setting for locked/unlocked accounts
parent
a0c5b42e
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file @
993312cd
...
...
@@ -357,6 +357,20 @@ def update_profile(%{assigns: %{user: user}} = conn, params) do
params
end
user
=
if
locked
=
params
[
"locked"
]
do
with
locked
<-
locked
==
"true"
,
new_info
<-
Map
.
put
(
user
.
info
,
"locked"
,
locked
),
change
<-
User
.
info_changeset
(
user
,
%{
info:
new_info
}),
{
:ok
,
user
}
<-
User
.
update_and_set_cache
(
change
)
do
user
else
_e
->
user
end
else
user
end
with
changeset
<-
User
.
update_changeset
(
user
,
params
),
{
:ok
,
user
}
<-
User
.
update_and_set_cache
(
changeset
)
do
CommonAPI
.
update
(
user
)
...
...
test/web/twitter_api/twitter_api_controller_test.exs
View file @
993312cd
...
...
@@ -762,6 +762,38 @@ 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 locks an account"
,
%{
conn:
conn
}
do
user
=
insert
(
:user
)
conn
=
conn
|>
assign
(
:user
,
user
)
|>
post
(
"/api/account/update_profile.json"
,
%{
"locked"
=>
"true"
})
user
=
Repo
.
get!
(
User
,
user
.
id
)
assert
user
.
info
[
"locked"
]
==
true
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
,
for:
user
})
end
test
"it unlocks an account"
,
%{
conn:
conn
}
do
user
=
insert
(
:user
)
conn
=
conn
|>
assign
(
:user
,
user
)
|>
post
(
"/api/account/update_profile.json"
,
%{
"locked"
=>
"false"
})
user
=
Repo
.
get!
(
User
,
user
.
id
)
assert
user
.
info
[
"locked"
]
==
false
assert
json_response
(
conn
,
200
)
==
UserView
.
render
(
"user.json"
,
%{
user:
user
,
for:
user
})
end
end
defp
valid_user
(
_context
)
do
...
...
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