aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-03-04 18:38:23 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-03-04 18:39:13 +0000
commitb7aa1ea9e6ea919b4eab2762b56f7e4b09300189 (patch)
treefaf74db6dcd2293afe97e5ea2270ed3be2d8dcc6
parent9f3cb38012281c596d1aa8c479f07362fa58dacb (diff)
downloadpleroma-b7aa1ea9e6ea919b4eab2762b56f7e4b09300189.tar.gz
rich media: helpers: rework validate_page_url()
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index ba57171d3..8317a1162 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -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]),