moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/mastoapi-card' into 'develop' 

MastoAPI: Add unimplemented status card endpoint.

See merge request pleroma/pleroma!71
This commit is contained in:
eal 2018-03-09 18:58:55 +00:00
parent c661cf504b 18e1202a3b
commit 62037690e8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -624,6 +624,11 @@ def empty_array(conn, _) do
json(conn, []) json(conn, [])
end end
def empty_object(conn, _) do
Logger.debug("Unimplemented, returning an empty object")
json(conn, %{})
end
def render_notification(user, %{id: id, activity: activity, inserted_at: created_at} = _params) do def render_notification(user, %{id: id, activity: activity, inserted_at: created_at} = _params) do
actor = User.get_cached_by_ap_id(activity.data["actor"]) actor = User.get_cached_by_ap_id(activity.data["actor"])
created_at = NaiveDateTime.to_iso8601(created_at) created_at = NaiveDateTime.to_iso8601(created_at)

1
lib/pleroma/web/router.ex
View File

@ -132,6 +132,7 @@ def user_fetcher(username) do
get "/statuses/:id", MastodonAPIController, :get_status get "/statuses/:id", MastodonAPIController, :get_status
get "/statuses/:id/context", MastodonAPIController, :get_context get "/statuses/:id/context", MastodonAPIController, :get_context
get "/statuses/:id/card", MastodonAPIController, :empty_object
get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by get "/statuses/:id/favourited_by", MastodonAPIController, :favourited_by
get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by get "/statuses/:id/reblogged_by", MastodonAPIController, :reblogged_by