From 9f3cb38012281c596d1aa8c479f07362fa58dacb Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sat, 2 Mar 2019 12:22:02 +0000 Subject: helpers: use AutoLinker to validate URIs as well as the other tests --- lib/pleroma/web/rich_media/helpers.ex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex index fc9cbc868..ba57171d3 100644 --- a/lib/pleroma/web/rich_media/helpers.ex +++ b/lib/pleroma/web/rich_media/helpers.ex @@ -12,7 +12,10 @@ defmodule Pleroma.Web.RichMedia.Helpers do defp validate_page_url(%URI{authority: nil}), do: :error defp validate_page_url(%URI{scheme: nil}), do: :error defp validate_page_url(%URI{}), do: :ok - defp validate_page_url(page_url), do: URI.parse(page_url) |> validate_page_url + + defp validate_page_url(page_url) do + AutoLinker.Parser.is_url?(page_url, true) && URI.parse(page_url) |> validate_page_url + end def fetch_data_for_activity(%Activity{} = activity) do with true <- Pleroma.Config.get([:rich_media, :enabled]), -- cgit v1.2.3