Browse Source

Don't die on fetching problems.

tags/v0.9.9
Roger Braun 6 years ago
parent
commit
f445a1b376
1 changed files with 12 additions and 6 deletions
  1. +12
    -6
      lib/pleroma/web/ostatus/ostatus.ex

+ 12
- 6
lib/pleroma/web/ostatus/ostatus.ex View File

@@ -300,12 +300,18 @@ defmodule Pleroma.Web.OStatus do
end

def fetch_activity_from_url(url) do
with {:ok, activities} when length(activities) > 0 <- fetch_activity_from_atom_url(url) do
{:ok, activities}
else
_e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do
{:ok, activities}
end
try do
with {:ok, activities} when length(activities) > 0 <- fetch_activity_from_atom_url(url) do
{:ok, activities}
else
_e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do
{:ok, activities}
end
end
rescue
e ->
Logger.debug("Couldn't get #{url}: #{inspect(e)}")
{:error, "Couldn't get #{url}: #{inspect(e)}"}
end
end
end

Loading…
Cancel
Save