aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-21 16:25:45 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-21 16:25:45 -0500
commit97c60b6a4308b77d0e4956b83a16b88292b62e37 (patch)
treedb496d0f94e00b199be95ee285174f378f512daa /lib/pleroma/web
parent7ce722ce3e3dbc633324ff0ccaeddc467397ac5e (diff)
parent2b5d9eb10529325aef1b4aab980bd901ba6b0c70 (diff)
downloadpleroma-97c60b6a4308b77d0e4956b83a16b88292b62e37.tar.gz
Merge branch 'develop' into fix/pleroma-api-emoji-packs
Diffstat (limited to 'lib/pleroma/web')
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 1729141e9..747f2dc6b 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -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