squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mastodon api: embed card in status object

Browse Source
This commit is contained in:
William Pitcock 2019-01-27 12:15:41 +00:00
parent 132d815f1f
commit 5a37ddc2dc
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/views/status_view.ex
View File

@ -11,6 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.CommonAPI.Utils alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy
alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.MastodonAPI.AccountView alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView alias Pleroma.Web.MastodonAPI.StatusView
@ -140,6 +141,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
__MODULE__ __MODULE__
) )
card = render("card.json", MastodonAPI.get_status_card(activity.id))
%{ %{
id: to_string(activity.id), id: to_string(activity.id),
uri: object["id"], uri: object["id"],
@ -148,6 +151,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
in_reply_to_id: reply_to && to_string(reply_to.id), in_reply_to_id: reply_to && to_string(reply_to.id),
in_reply_to_account_id: reply_to_user && to_string(reply_to_user.id), in_reply_to_account_id: reply_to_user && to_string(reply_to_user.id),
reblog: nil, reblog: nil,
card: card,
content: content, content: content,
created_at: created_at, created_at: created_at,
reblogs_count: announcement_count, reblogs_count: announcement_count,