hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into feature/tag_feed

Browse source
This commit is contained in:
Maksim Pechnikov 2020-01-14 16:26:56 +03:00
commit c9f45edeac
206 changed files with 2338 additions and 3626 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/metadata/twitter_card.ex
View file

@ -31,7 +31,7 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCard do
if attachments == [] or Metadata.activity_nsfw?(object) do
[
image_tag(user),
{:meta, [property: "twitter:card", content: "summary_large_image"], []}
{:meta, [property: "twitter:card", content: "summary"], []}
]
else
attachments

2
lib/pleroma/web/metadata/utils.ex
View file

@ -15,6 +15,7 @@ defmodule Pleroma.Web.Metadata.Utils do
|> String.replace(~r/<br\s?\/?>/, " ")
|> HTML.get_cached_stripped_html_for_activity(object, "metadata")
|> Emoji.Formatter.demojify()
|> HtmlEntities.decode()
|> Formatter.truncate()
end
@ -22,6 +23,7 @@ defmodule Pleroma.Web.Metadata.Utils do
content
|> scrub_html
|> Emoji.Formatter.demojify()
|> HtmlEntities.decode()
|> Formatter.truncate(max_length)
end