projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'issue/1023' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
helpers.ex
diff --git
a/lib/pleroma/web/rich_media/helpers.ex
b/lib/pleroma/web/rich_media/helpers.ex
index 0314535d27d8a3dd4805f88ae602a56a78b2d22f..747f2dc6be5a2e22832b364c7ed93f15b4aaf512 100644
(file)
--- a/
lib/pleroma/web/rich_media/helpers.ex
+++ b/
lib/pleroma/web/rich_media/helpers.ex
@@
-9,17
+9,17
@@
defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.Object
alias Pleroma.Web.RichMedia.Parser
alias Pleroma.Object
alias Pleroma.Web.RichMedia.Parser
- @spec validate_page_url(
an
y()) :: :ok | :error
+ @spec validate_page_url(
URI.t() | binar
y()) :: :ok | :error
defp validate_page_url(page_url) when is_binary(page_url) do
defp validate_page_url(page_url) when is_binary(page_url) do
- validate_tld =
Application.get_env(:auto_linker, :opts)[:validate_tld]
+ validate_tld =
Pleroma.Config.get([Pleroma.Formatter, :validate_tld])
page_url
page_url
- |>
AutoLinker.Parser.url?(scheme: true,
validate_tld: validate_tld)
+ |>
Linkify.Parser.url?(
validate_tld: validate_tld)
|> parse_uri(page_url)
end
|> parse_uri(page_url)
end
- defp validate_page_url(%URI{host: host, scheme:
scheme
, authority: authority})
- when
scheme == "https" and not is_nil
(authority) do
+ defp validate_page_url(%URI{host: host, scheme:
"https"
, authority: authority})
+ when
is_binary
(authority) do
cond do
host in Config.get([:rich_media, :ignore_hosts], []) ->
:error
cond do
host in Config.get([:rich_media, :ignore_hosts], []) ->
:error
@@
-64,5
+64,8
@@
defmodule Pleroma.Web.RichMedia.Helpers do
def fetch_data_for_activity(_), 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
end