diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-25 08:45:42 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-25 08:45:42 +0000 |
| commit | fc012491a5174139b06cc9945e6dc4bc687ebdb7 (patch) | |
| tree | 5a0efca99bc064db1ee6863f0f104b4b026741dc /lib | |
| parent | dfc96f222cc65eda92e5696a2fc2d6d926f960ed (diff) | |
| parent | 6160a1b3c07c49cf81e2353cc25a123e75843581 (diff) | |
| download | pleroma-fc012491a5174139b06cc9945e6dc4bc687ebdb7.tar.gz | |
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index ebe68218b..34652cdde 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -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 diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index ff5921807..8f5b3c786 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -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 |