projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'http-fixes' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parser.ex
diff --git
a/lib/pleroma/web/rich_media/parser.ex
b/lib/pleroma/web/rich_media/parser.ex
index d9b5068b117bf81a6b5d0a6b7573d4ed2fb21300..ca592833f3d7574973eb5776126741de3bb42daf 100644
(file)
--- a/
lib/pleroma/web/rich_media/parser.ex
+++ b/
lib/pleroma/web/rich_media/parser.ex
@@
-3,11
+3,6
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RichMedia.Parser do
- @options [
- pool: :media,
- max_body: 2_000_000
- ]
-
defp parsers do
Pleroma.Config.get([:rich_media, :parsers])
end
defp parsers do
Pleroma.Config.get([:rich_media, :parsers])
end
@@
-75,18
+70,8
@@
defmodule Pleroma.Web.RichMedia.Parser do
end
defp parse_url(url) do
end
defp parse_url(url) do
- opts =
- if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
- Keyword.merge(@options,
- recv_timeout: 2_000,
- with_body: true
- )
- else
- @options
- end
-
try do
try do
- {:ok, %Tesla.Env{body: html}} = Pleroma.
HTTP.get(url, [], adapter: opts
)
+ {:ok, %Tesla.Env{body: html}} = Pleroma.
Web.RichMedia.Helpers.rich_media_get(url
)
html
|> parse_html()
html
|> parse_html()
@@
-105,8
+90,8
@@
defmodule Pleroma.Web.RichMedia.Parser do
defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc ->
case parser.parse(html, acc) do
defp maybe_parse(html) do
Enum.reduce_while(parsers(), %{}, fn parser, acc ->
case parser.parse(html, acc) do
-
{:ok, data
} -> {:halt, data}
-
{:error, _msg}
-> {:cont, acc}
+
data when data != %{
} -> {:halt, data}
+
_
-> {:cont, acc}
end
end)
end
end
end)
end