projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
[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 6506de46c6abecd491cd939e7aeac4f62b01af32..1729141e996bba5fc9de39846da505390e311f0a 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright _ 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright _ 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Helpers do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Helpers do
@@
-9,7
+9,7
@@
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
validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
defp validate_page_url(page_url) when is_binary(page_url) do
validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
@@
-18,8
+18,8
@@
defmodule Pleroma.Web.RichMedia.Helpers do
|> 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