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

Revert "Merge branch 'revert-2b5d9eb1' into 'develop'"

Browse source 
This reverts merge request !2784
This commit is contained in:
lain 2020-07-21 22:18:17 +00:00
commit 5b1eeb06d8
11 changed files with 126 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/rich_media/helpers.ex
View file

@ -11,10 +11,10 @@ defmodule Pleroma.Web.RichMedia.Helpers do
@spec validate_page_url(URI.t() | binary()) :: :ok | :error
defp validate_page_url(page_url) when is_binary(page_url) do
validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
validate_tld = Pleroma.Config.get([Pleroma.Formatter, :validate_tld])
page_url
|> AutoLinker.Parser.url?(scheme: true, validate_tld: validate_tld)
|> Linkify.Parser.url?(validate_tld: validate_tld)
|> parse_uri(page_url)
end