Merge branch 'fix/mutes.json-emptyarray' into 'develop'

Return empty array from /api/qvitter/mutes.json

See merge request pleroma/pleroma!234
This commit is contained in:
lambda 2018-06-25 08:45:42 +00:00
commit fc012491a5
3 changed files with 25 additions and 0 deletions

View file

@ -276,6 +276,7 @@ defmodule Pleroma.Web.Router do
get("/friendships/no_retweets/ids", TwitterAPI.Controller, :empty_array)
get("/mutes/users/ids", TwitterAPI.Controller, :empty_array)
get("/qvitter/mutes", TwitterAPI.Controller, :raw_empty_array)
get("/externalprofile/show", TwitterAPI.Controller, :external_profile)
end

View file

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