From 619f67768a9b66880d8541c03e640201bc378c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20K=C3=BChl?= Date: Wed, 5 Sep 2018 20:13:50 +0200 Subject: [PATCH 1/2] Mastodon API: Add unsupported attributes to relationship responses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These attributes are documented as required by the Mastodon API. Since we don’t support them (I think?), respond with default values. --- lib/pleroma/web/mastodon_api/views/account_view.ex | 4 +++- test/web/mastodon_api/account_view_test.exs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index e206e6486..7915933be 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -75,8 +75,10 @@ def render("relationship.json", %{user: user, target: target}) do followed_by: User.following?(target, user), blocking: User.blocks?(user, target), muting: false, + muting_notifications: false, requested: false, - domain_blocking: false + domain_blocking: false, + showing_reblogs: false } end diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index 7d0367d01..e1e07fbcd 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -123,8 +123,10 @@ test "represent a relationship" do followed_by: false, blocking: true, muting: false, + muting_notifications: false, requested: false, - domain_blocking: false + domain_blocking: false, + showing_reblogs: false } assert expected == AccountView.render("relationship.json", %{user: user, target: other_user}) From c1d07da4e18cc2acd11a5a131e1482aec5996552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20K=C3=BChl?= Date: Wed, 5 Sep 2018 20:14:16 +0200 Subject: [PATCH 2/2] Mastodon API: Fake support for loading filters --- lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 ++++ lib/pleroma/web/router.ex | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 49a8655f0..f2fcc76ad 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -1188,4 +1188,8 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do json(conn, []) end end + + def filters(conn, _) do + json(conn, []) + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 63493ae1c..9dcf44795 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -162,6 +162,8 @@ def user_fetcher(username_or_email) do delete("/filters/:id", MastodonAPIController, :delete_filter) get("/suggestions", MastodonAPIController, :suggestions) + + get("/filters", MastodonAPIController, :filters) end scope "/api/web", Pleroma.Web.MastodonAPI do