aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-06-18 20:47:36 +0000
committerlain <lain@soykaf.club>2019-06-18 20:47:36 +0000
commit966317e052133b484ffddd7fa987d28dfbedfe9c (patch)
treeb762fb9406a9aae434ffc16d3cacc3fdf4f23880 /lib
parenta392ad52ada6d7482369409ed2cd1eff6c87ef6f (diff)
parentf30a3241d20be9407335c88fa86deb873de5b872 (diff)
downloadpleroma-966317e052133b484ffddd7fa987d28dfbedfe9c.tar.gz
Merge branch 'deps/update-auto-linker' into 'develop'
Deps: Update auto_linker See merge request pleroma/pleroma!1300
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index f377125d7..94f56f70d 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -9,7 +9,9 @@ defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.Web.RichMedia.Parser
defp validate_page_url(page_url) when is_binary(page_url) do
- if AutoLinker.Parser.url?(page_url, true) do
+ validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
+
+ if AutoLinker.Parser.url?(page_url, scheme: true, validate_tld: validate_tld) do
URI.parse(page_url) |> validate_page_url
else
:error