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

Render peertube videos in mastodon.

Browse Source
This commit is contained in:
lain 2018-03-25 17:07:40 +02:00 committed by Haelwenn (lanodan) Monnier
parent c381d0b577
commit a6b021a52b
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,8 +99,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] || [])
favorited = opts[:for] && opts[:for].ap_id in (object["likes"] || [])
attachments =
render_many(object["attachment"] || [], StatusView, "attachment.json", as: :attachment)
attachment_data = object["attachment"] || []
attachment_data = attachment_data ++ if object["type"] == "Video", do: [object], else: []
attachments = render_many(attachment_data, StatusView, "attachment.json", as: :attachment)
created_at = Utils.to_masto_date(object["published"])
@ -151,7 +152,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
end
def render("attachment.json", %{attachment: attachment}) do
[%{"mediaType" => media_type, "href" => href} | _] = attachment["url"]
[attachment | _] = attachment["url"]
media_type = attachment["mediaType"] || attachment["mimeType"]
href = attachment["href"]
type =
cond do