commit: 7458adc2567caf90c3b01ef4b8bf90a67cbc041c parent: c9585ec00760b46f013f36a7f7625ac36471d3e8 Author: Haelwenn <git.pleroma.social@hacktivis.me> Date: Thu, 20 Sep 2018 14:54:30 +0000 Merge branch 'feature/mastodon_api_2.5.0' into 'develop' Update mastodon API to 2.5.0 Closes: https://git.pleroma.social/pleroma/pleroma/issues/298 Closes: https://git.pleroma.social/pleroma/pleroma/issues/299 See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351Diffstat:
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -125,7 +125,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end @instance Application.get_env(:pleroma, :instance) - @mastodon_api_level "2.4.3" + @mastodon_api_level "2.5.0" def masto_instance(conn, _params) do response = %{ @@ -441,7 +441,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do new_data = %{object.data | "name" => description} change = Object.change(object, %{data: new_data}) - {:ok, media_obj} = Repo.update(change) + {:ok, _} = Repo.update(change) data = new_data @@ -1077,7 +1077,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end end - def get_filters(%{assigns: %{user: user}} = conn, params) do + def get_filters(%{assigns: %{user: user}} = conn, _) do filters = Pleroma.Filter.get_filters(user) res = FilterView.render("filters.json", filters: filters) json(conn, res) @@ -1101,7 +1101,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do json(conn, res) end - def get_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id} = params) do + def get_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do filter = Pleroma.Filter.get(filter_id, user) res = FilterView.render("filter.json", filter: filter) json(conn, res) @@ -1126,13 +1126,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do json(conn, res) end - def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id} = params) do + def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do query = %Pleroma.Filter{ user_id: user.id, filter_id: filter_id } - {:ok, response} = Pleroma.Filter.delete(query) + {:ok, _} = Pleroma.Filter.delete(query) json(conn, %{}) end diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -79,7 +79,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do muting_notifications: false, requested: false, domain_blocking: false, - showing_reblogs: false + showing_reblogs: false, + endorsed: false } end diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex @@ -63,6 +63,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do content: reblogged[:content], created_at: created_at, reblogs_count: 0, + replies_count: 0, favourites_count: 0, reblogged: false, favourited: false, @@ -132,6 +133,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do content: render_content(object), created_at: created_at, reblogs_count: announcement_count, + replies_count: 0, favourites_count: like_count, reblogged: !!repeated, favourited: !!favorited, diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -172,6 +172,8 @@ defmodule Pleroma.Web.Router do delete("/filters/:id", MastodonAPIController, :delete_filter) get("/suggestions", MastodonAPIController, :suggestions) + + get("/endorsements", MastodonAPIController, :empty_array) end scope "/api/web", Pleroma.Web.MastodonAPI do diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs @@ -126,7 +126,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do muting_notifications: false, requested: false, domain_blocking: false, - showing_reblogs: false + showing_reblogs: false, + endorsed: false } assert expected == AccountView.render("relationship.json", %{user: user, target: other_user}) diff --git a/test/web/mastodon_api/status_view_test.exs b/test/web/mastodon_api/status_view_test.exs @@ -28,6 +28,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do content: HtmlSanitizeEx.basic_html(note.data["object"]["content"]), created_at: created_at, reblogs_count: 0, + replies_count: 0, favourites_count: 0, reblogged: false, favourited: false,