X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frich_media%2Fhelpers.ex;h=9d3d7f978b10b48c9afc3960a222fb85bcfb4061;hb=3126f8a334e4f0aeb6aad59e22c8f8c1ac9ec668;hp=4ece3e846ba1c6192db3b71dcb027958676747bf;hpb=4ad15ad2a90ca1ac370c8a79f796adc603a90479;p=akkoma
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index 4ece3e846..9d3d7f978 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright _ 2017-2019 Pleroma Authors
+# Copyright _ 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Helpers do
@@ -9,12 +9,12 @@ defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.Object
alias Pleroma.Web.RichMedia.Parser
- @validate_tld Application.get_env(:auto_linker, :opts)[:validate_tld]
-
@spec validate_page_url(any()) :: :ok | :error
defp validate_page_url(page_url) when is_binary(page_url) do
+ validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
+
page_url
- |> AutoLinker.Parser.url?(scheme: true, validate_tld: @validate_tld)
+ |> AutoLinker.Parser.url?(scheme: true, validate_tld: validate_tld)
|> parse_uri(page_url)
end
@@ -64,5 +64,8 @@ defmodule Pleroma.Web.RichMedia.Helpers do
def fetch_data_for_activity(_), do: %{}
- def perform(:fetch, %Activity{} = activity), do: fetch_data_for_activity(activity)
+ def perform(:fetch, %Activity{} = activity) do
+ fetch_data_for_activity(activity)
+ :ok
+ end
end