rich media: helpers: rework validate_page_url()
authorWilliam Pitcock <nenolod@dereferenced.org>
Mon, 4 Mar 2019 18:38:23 +0000 (18:38 +0000)
committerWilliam Pitcock <nenolod@dereferenced.org>
Mon, 4 Mar 2019 18:39:13 +0000 (18:39 +0000)
lib/pleroma/web/rich_media/helpers.ex

index ba57171d34fb0b24e44a23e13f7553cb0dae540f..8317a11624d8caceca3edfdeca82abd885678e5a 100644 (file)
@@ -8,14 +8,18 @@ defmodule Pleroma.Web.RichMedia.Helpers do
   alias Pleroma.HTML
   alias Pleroma.Web.RichMedia.Parser
 
-  defp validate_page_url(nil), do: :error
+  defp validate_page_url(page_url) when is_binary(page_url) do
+    if AutoLinker.Parser.is_url?(page_url, true) do
+      URI.parse(page_url) |> validate_page_url
+    else
+      :error
+    end
+  end
+
   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
-    AutoLinker.Parser.is_url?(page_url, true) && URI.parse(page_url) |> validate_page_url
-  end
+  defp validate_page_url(_), do: :error
 
   def fetch_data_for_activity(%Activity{} = activity) do
     with true <- Pleroma.Config.get([:rich_media, :enabled]),