sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return unquoted empty array from /api/qvitter/mutes.json

Browse Source
This commit is contained in:
Vivian Lim 2018-06-23 23:20:30 -07:00
parent 6316003946
commit 1299bccc7d
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/router.ex
View File

@ -269,7 +269,7 @@ def user_fetcher(username) do
get("/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array) get("/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array)
get("/mutes/users/ids", TwitterAPI.Controller, :empty_array) get("/mutes/users/ids", TwitterAPI.Controller, :empty_array)
get("/qvitter/mutes", TwitterAPI.Controller, :empty_array) get("/qvitter/mutes", TwitterAPI.Controller, :raw_empty_array)
get("/externalprofile/show", TwitterAPI.Controller, :external_profile) get("/externalprofile/show", TwitterAPI.Controller, :external_profile)
end end

4
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -404,6 +404,10 @@ def empty_array(conn, _params) do
json(conn, Jason.encode!([])) json(conn, Jason.encode!([]))
end end
def raw_empty_array(conn, _params) do
json(conn, [])
end
def update_profile(%{assigns: %{user: user}} = conn, params) do def update_profile(%{assigns: %{user: user}} = conn, params) do
params = params =
if bio = params["description"] do if bio = params["description"] do

2
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -506,7 +506,7 @@ test "unimplemented mutes with credentials", %{conn: conn, user: current_user} d
|> get("/api/qvitter/mutes.json") |> get("/api/qvitter/mutes.json")
current_user = Repo.get(User, current_user.id) current_user = Repo.get(User, current_user.id)
assert "[]" = json_response(conn, 200) assert [] = json_response(conn, 200)
end end
end end