projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[#2497] Media preview proxy: preview bypass for small images
[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 6210f2c5af6d154875df94b2177fadba62025021..bd7f03cbeba8c3bf55bf86341e47440ae17464d9 100644
(file)
--- a/
lib/pleroma/web/rich_media/helpers.ex
+++ b/
lib/pleroma/web/rich_media/helpers.ex
@@
-9,14
+9,15
@@
defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.Object
alias Pleroma.Web.RichMedia.Parser
alias Pleroma.Object
alias Pleroma.Web.RichMedia.Parser
- @
rich_media_
options [
+ @options [
pool: :media,
pool: :media,
- max_body: 2_000_000
+ max_body: 2_000_000,
+ recv_timeout: 2_000
]
@spec validate_page_url(URI.t() | binary()) :: :ok | :error
defp validate_page_url(page_url) when is_binary(page_url) do
]
@spec validate_page_url(URI.t() | binary()) :: :ok | :error
defp validate_page_url(page_url) when is_binary(page_url) do
- validate_tld =
Pleroma.
Config.get([Pleroma.Formatter, :validate_tld])
+ validate_tld = Config.get([Pleroma.Formatter, :validate_tld])
page_url
|> Linkify.Parser.url?(validate_tld: validate_tld)
page_url
|> Linkify.Parser.url?(validate_tld: validate_tld)
@@
-58,7
+59,7
@@
defmodule Pleroma.Web.RichMedia.Helpers do
with true <- Config.get([:rich_media, :enabled]),
false <- object.data["sensitive"] || false,
{:ok, page_url} <-
with true <- Config.get([:rich_media, :enabled]),
false <- object.data["sensitive"] || false,
{:ok, page_url} <-
- HTML.extract_first_external_url
(object, object.data["content"]
),
+ HTML.extract_first_external_url
_from_object(object
),
:ok <- validate_page_url(page_url),
{:ok, rich_media} <- Parser.parse(page_url) do
%{page_url: page_url, rich_media: rich_media}
:ok <- validate_page_url(page_url),
{:ok, rich_media} <- Parser.parse(page_url) do
%{page_url: page_url, rich_media: rich_media}
@@
-86,16
+87,6
@@
defmodule Pleroma.Web.RichMedia.Helpers do
def rich_media_get(url) do
headers = [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
def rich_media_get(url) do
headers = [{"user-agent", Pleroma.Application.user_agent() <> "; Bot"}]
- options =
- if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
- Keyword.merge(@rich_media_options,
- recv_timeout: 2_000,
- with_body: true
- )
- else
- @rich_media_options
- end
-
- Pleroma.HTTP.get(url, headers, options)
+ Pleroma.HTTP.get(url, headers, @options)
end
end
end
end