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/351
This commit is contained in:
Haelwenn 2018-09-20 14:54:30 +00:00
commit 7458adc256
6 changed files with 15 additions and 8 deletions

View file

@ -125,7 +125,7 @@ def user(conn, %{"id" => id}) 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 @@ def update_media(%{assigns: %{user: _}} = conn, data) 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 @@ def render_notification(user, %{id: id, activity: activity, inserted_at: created
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 @@ def create_filter(
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 @@ def update_filter(
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

View file

@ -79,7 +79,8 @@ def render("relationship.json", %{user: user, target: target}) do
muting_notifications: false,
requested: false,
domain_blocking: false,
showing_reblogs: false
showing_reblogs: false,
endorsed: false
}
end

View file

@ -63,6 +63,7 @@ def render(
content: reblogged[:content],
created_at: created_at,
reblogs_count: 0,
replies_count: 0,
favourites_count: 0,
reblogged: false,
favourited: false,
@ -132,6 +133,7 @@ def render("status.json", %{activity: %{data: %{"object" => object}} = activity}
content: render_content(object),
created_at: created_at,
reblogs_count: announcement_count,
replies_count: 0,
favourites_count: like_count,
reblogged: !!repeated,
favourited: !!favorited,

View file

@ -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

View file

@ -126,7 +126,8 @@ test "represent a relationship" 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})

View file

@ -28,6 +28,7 @@ test "a note activity" 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,