aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2019-01-27 12:21:05 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2019-01-28 05:53:17 +0000
commitde42646634e65a5216efe2f353352575b97b6390 (patch)
tree348629444b6f398531d233b034b449f1699c4901
parent5d895093fd26ce0884957664c1214a66f5a36195 (diff)
downloadpleroma-de42646634e65a5216efe2f353352575b97b6390.tar.gz
rich media: add try/rescue to ensure we catch parsing and fetching failures
-rw-r--r--lib/pleroma/web/rich_media/parser.ex9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/pleroma/web/rich_media/parser.ex b/lib/pleroma/web/rich_media/parser.ex
index 947dc0c3c..7787bf954 100644
--- a/lib/pleroma/web/rich_media/parser.ex
+++ b/lib/pleroma/web/rich_media/parser.ex
@@ -21,9 +21,14 @@ defmodule Pleroma.Web.RichMedia.Parser do
end
defp parse_url(url) do
- {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
+ try do
+ {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url)
- html |> maybe_parse() |> get_parsed_data()
+ html |> maybe_parse() |> get_parsed_data()
+ rescue
+ _e ->
+ {:error, "Parsing error"}
+ end
end
defp maybe_parse(html) do