Embed player suitable for Twitter Cards

This commit is contained in:
href 2019-02-19 17:39:42 +01:00
parent c984e8272a
commit 10a11f083c
No known key found for this signature in database
GPG Key ID: EE8296C1A152C325
5 changed files with 71 additions and 6 deletions

View File

@ -0,0 +1,21 @@
defmodule Pleroma.Web.Metadata.PlayerView do
use Pleroma.Web, :view
import Phoenix.HTML.Tag, only: [content_tag: 3, tag: 2]
def render("player.html", %{"mediaType" => type, "href" => href}) do
tag_type =
case type do
"audio" <> _ -> :audio
"video" <> _ -> :video
end
content_tag(
tag_type,
[
tag(:source, src: href, type: type),
"Your browser does not support #{type} playback."
],
controls: true
)
end
end

View File

@ -12,10 +12,11 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
@impl Provider @impl Provider
def build_tags(%{ def build_tags(%{
activity_id: id,
object: object, object: object,
user: user user: user
}) do }) do
attachments = build_attachments(object) attachments = build_attachments(id, object)
scrubbed_content = Utils.scrub_html_and_truncate(object) scrubbed_content = Utils.scrub_html_and_truncate(object)
# Zero width space # Zero width space
content = content =
@ -65,7 +66,9 @@ def build_tags(%{user: user}) do
end end
end end
defp build_attachments(%{data: %{"attachment" => attachments}}) do defp build_attachments(id, z = %{data: %{"attachment" => attachments}}) do
IO.puts(inspect(z))
Enum.reduce(attachments, [], fn attachment, acc -> Enum.reduce(attachments, [], fn attachment, acc ->
rendered_tags = rendered_tags =
Enum.reduce(attachment["url"], [], fn url, acc -> Enum.reduce(attachment["url"], [], fn url, acc ->
@ -79,8 +82,9 @@ defp build_attachments(%{data: %{"attachment" => attachments}}) do
"audio" -> "audio" ->
[ [
{:meta, [property: "twitter:card", content: "player"], []}, {:meta, [property: "twitter:card", content: "player"], []},
{:meta, [property: "twitter:player", content: Utils.attachment_url(url["href"])], {:meta, [property: "twitter:player:width", content: "480"], []},
[]} {:meta, [property: "twitter:player:height", content: "80"], []},
{:meta, [property: "twitter:player", content: player_url(id)], []}
| acc | acc
] ]
@ -99,8 +103,7 @@ defp build_attachments(%{data: %{"attachment" => attachments}}) do
"video" -> "video" ->
[ [
{:meta, [property: "twitter:card", content: "player"], []}, {:meta, [property: "twitter:card", content: "player"], []},
{:meta, [property: "twitter:player", content: Utils.attachment_url(url["href"])], {:meta, [property: "twitter:player", content: player_url(id)], []},
[]},
{:meta, [property: "twitter:player:width", content: "1280"], []}, {:meta, [property: "twitter:player:width", content: "1280"], []},
{:meta, [property: "twitter:player:height", content: "720"], []} {:meta, [property: "twitter:player:height", content: "720"], []}
| acc | acc
@ -114,4 +117,8 @@ defp build_attachments(%{data: %{"attachment" => attachments}}) do
acc ++ rendered_tags acc ++ rendered_tags
end) end)
end end
defp player_url(id) do
Pleroma.Web.Router.Helpers.o_status_url(Pleroma.Web.Endpoint, :notice_player, id)
end
end end

View File

@ -153,6 +153,7 @@ def notice(conn, %{"id" => id}) do
%Object{} = object = Object.normalize(activity.data["object"]) %Object{} = object = Object.normalize(activity.data["object"])
Fallback.RedirectController.redirector_with_meta(conn, %{ Fallback.RedirectController.redirector_with_meta(conn, %{
activity_id: activity.id,
object: object, object: object,
url: url:
Pleroma.Web.Router.Helpers.o_status_url( Pleroma.Web.Router.Helpers.o_status_url(
@ -184,6 +185,25 @@ def notice(conn, %{"id" => id}) do
end end
end end
# Returns an HTML embedded <audio> or <video> player suitable for embed iframes.
def notice_player(conn, %{"id" => id}) do
with %Activity{data: %{"type" => "Create"}} = activity <- Activity.get_by_id(id),
true <- ActivityPub.is_public?(activity),
%Object{} = object <- Object.normalize(activity.data["object"]),
%{data: %{"attachment" => [%{"url" => [url | _]} | _]}} <- object,
true <- String.starts_with?(url["mediaType"], ["audio", "video"]) do
conn
|> put_layout(:metadata_player)
|> put_view(Pleroma.Web.Metadata.PlayerView)
|> render("player.html", url)
else
_error ->
conn
|> put_status(404)
|> Fallback.RedirectController.redirector(nil, 404)
end
end
defp represent_activity( defp represent_activity(
conn, conn,
"activity+json", "activity+json",

View File

@ -409,6 +409,7 @@ defmodule Pleroma.Web.Router do
get("/objects/:uuid", OStatus.OStatusController, :object) get("/objects/:uuid", OStatus.OStatusController, :object)
get("/activities/:uuid", OStatus.OStatusController, :activity) get("/activities/:uuid", OStatus.OStatusController, :activity)
get("/notice/:id", OStatus.OStatusController, :notice) get("/notice/:id", OStatus.OStatusController, :notice)
get("/notice/:id/embed_player", OStatus.OStatusController, :notice_player)
get("/users/:nickname/feed", OStatus.OStatusController, :feed) get("/users/:nickname/feed", OStatus.OStatusController, :feed)
get("/users/:nickname", OStatus.OStatusController, :feed_redirect) get("/users/:nickname", OStatus.OStatusController, :feed_redirect)

View File

@ -0,0 +1,16 @@
<!DOCTYPE html>
<html>
<body>
<style type="text/css">
video {
width:100%;
max-width:600px;
height:auto;
}
</style>
<%= render @view_module, @view_template, assigns %>
</body>
</html>