projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SideEffects: Refactor.
[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 0779065ee1bc9c00e2ddb54f7b3e8c28d9920551..ef5ead2daf1fdcad1309591344223c07513f5136 100644
(file)
--- a/
lib/pleroma/web/rich_media/parser.ex
+++ b/
lib/pleroma/web/rich_media/parser.ex
@@
-3,11
+3,9
@@
# 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
- @
hackney_
options [
+ @options [
pool: :media,
pool: :media,
- recv_timeout: 2_000,
- max_body: 2_000_000,
- with_body: true
+ max_body: 2_000_000
]
defp parsers do
]
defp parsers do
@@
-77,13
+75,23
@@
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:
@hackney_option
s)
+ {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter:
opt
s)
html
|> parse_html()
|> maybe_parse()
html
|> parse_html()
|> maybe_parse()
- |> Map.put(
:url
, url)
+ |> Map.put(
"url"
, url)
|> clean_parsed_data()
|> check_parsed_data()
rescue
|> clean_parsed_data()
|> check_parsed_data()
rescue
@@
-97,14
+105,14
@@
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
- defp check_parsed_data(%{
title:
title} = data)
- when is_binary(title) and
byte_size(title) > 0
do
+ defp check_parsed_data(%{
"title" =>
title} = data)
+ when is_binary(title) and
title != ""
do
{:ok, data}
end
{:ok, data}
end
@@
-115,11
+123,7
@@
defmodule Pleroma.Web.RichMedia.Parser do
defp clean_parsed_data(data) do
data
|> Enum.reject(fn {key, val} ->
defp clean_parsed_data(data) do
data
|> Enum.reject(fn {key, val} ->
- with {:ok, _} <- Jason.encode(%{key => val}) do
- false
- else
- _ -> true
- end
+ not match?({:ok, _}, Jason.encode(%{key => val}))
end)
|> Map.new()
end
end)
|> Map.new()
end