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

Lint

This commit is contained in:
Mark Felder 2021-06-09 11:06:53 -05:00
parent 86bcb87e6c
commit 2a47156b87
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/pleroma/web/metadata/providers/open_graph.ex
View File

@ -37,7 +37,8 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
] ++ ] ++
if attachments == [] or Metadata.activity_nsfw?(object) do if attachments == [] or Metadata.activity_nsfw?(object) do
[ [
{:meta, [property: "og:image", content: MediaProxy.preview_url(User.avatar_url(user))], []}, {:meta, [property: "og:image", content: MediaProxy.preview_url(User.avatar_url(user))],
[]},
{:meta, [property: "og:image:width", content: 150], []}, {:meta, [property: "og:image:width", content: 150], []},
{:meta, [property: "og:image:height", content: 150], []} {:meta, [property: "og:image:height", content: 150], []}
] ]
@ -58,7 +59,8 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
{:meta, [property: "og:url", content: user.uri || user.ap_id], []}, {:meta, [property: "og:url", content: user.uri || user.ap_id], []},
{:meta, [property: "og:description", content: truncated_bio], []}, {:meta, [property: "og:description", content: truncated_bio], []},
{:meta, [property: "og:type", content: "article"], []}, {:meta, [property: "og:type", content: "article"], []},
{:meta, [property: "og:image", content: MediaProxy.preview_url(User.avatar_url(user))], []}, {:meta, [property: "og:image", content: MediaProxy.preview_url(User.avatar_url(user))],
[]},
{:meta, [property: "og:image:width", content: 150], []}, {:meta, [property: "og:image:width", content: 150], []},
{:meta, [property: "og:image:height", content: 150], []} {:meta, [property: "og:image:height", content: 150], []}
] ]
@ -130,11 +132,11 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraph do
cond do cond do
Pleroma.Config.get([:media_preview_proxy, :enabled], false) -> Pleroma.Config.get([:media_preview_proxy, :enabled], false) ->
metadata ++ metadata ++
[ [
{:meta, [property: "og:image:width", content: "#{url["width"]}"], []}, {:meta, [property: "og:image:width", content: "#{url["width"]}"], []},
{:meta, [property: "og:image:height", content: "#{url["height"]}"], []}, {:meta, [property: "og:image:height", content: "#{url["height"]}"], []},
{:meta, [property: "og:image", content: MediaProxy.preview_url(url["href"])], []} {:meta, [property: "og:image", content: MediaProxy.preview_url(url["href"])], []}
] ]
true -> true ->
metadata metadata

3
lib/pleroma/web/metadata/providers/twitter_card.ex
View File

@ -93,7 +93,8 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
{:meta, [property: "twitter:player", content: player_url(id)], []}, {:meta, [property: "twitter:player", content: player_url(id)], []},
{:meta, [property: "twitter:player:width", content: "#{width}"], []}, {:meta, [property: "twitter:player:width", content: "#{width}"], []},
{:meta, [property: "twitter:player:height", content: "#{height}"], []}, {:meta, [property: "twitter:player:height", content: "#{height}"], []},
{:meta, [property: "twitter:player:stream", content: MediaProxy.url(url["href"])], []}, {:meta, [property: "twitter:player:stream", content: MediaProxy.url(url["href"])],
[]},
{:meta, {:meta,
[property: "twitter:player:stream:content_type", content: url["mediaType"]], []} [property: "twitter:player:stream:content_type", content: url["mediaType"]], []}
| acc | acc