X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frich_media%2Fhelpers.ex;h=f67aaf58b655af4cfbe714f0b9b9810aacc2585c;hb=a58813e7a14fda8eff2f2a659094444d20765e85;hp=fc9cbc868d8f038eaef8f22b25369de146d30f90;hpb=d38d537beebd1efe61778b2a26ecab0bed84d1c1;p=akkoma

diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index fc9cbc868..f67aaf58b 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -4,19 +4,26 @@
 
 defmodule Pleroma.Web.RichMedia.Helpers do
   alias Pleroma.Activity
-  alias Pleroma.Object
   alias Pleroma.HTML
+  alias Pleroma.Object
   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: URI.parse(page_url) |> validate_page_url
+  defp validate_page_url(_), do: :error
 
-  def fetch_data_for_activity(%Activity{} = activity) do
+  def fetch_data_for_activity(%Activity{data: %{"type" => "Create"}} = activity) do
     with true <- Pleroma.Config.get([:rich_media, :enabled]),
-         %Object{} = object <- Object.normalize(activity.data["object"]),
+         %Object{} = object <- Object.normalize(activity),
          {:ok, page_url} <- HTML.extract_first_external_url(object, object.data["content"]),
          :ok <- validate_page_url(page_url),
          {:ok, rich_media} <- Parser.parse(page_url) do
@@ -25,4 +32,6 @@ defmodule Pleroma.Web.RichMedia.Helpers do
       _ -> %{}
     end
   end
+
+  def fetch_data_for_activity(_), do: %{}
 end