aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-02 12:22:02 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-04 18:31:49 +0000
commit9f3cb38012281c596d1aa8c479f07362fa58dacb (patch)
tree9d5d7f10e7a0fa196ad079da7be5f0fba860756e /lib/pleroma
parentd7a278a733616d01ee41c3923a3d87730c685879 (diff)
downloadpleroma-9f3cb38012281c596d1aa8c479f07362fa58dacb.tar.gz
helpers: use AutoLinker to validate URIs as well as the other tests
Diffstat (limited to 'lib/pleroma')
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex5
1 files changed, 4 insertions, 1 deletions
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]),