alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into oauth2

This commit is contained in:
Roger Braun 2017-09-11 20:54:44 +02:00
parent 464c33e9a1 95aa6a3c65
commit f0d41a3abf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -299,7 +299,7 @@ def fetch_activity_from_html_url(url) do
end end
def fetch_activity_from_url(url) do def fetch_activity_from_url(url) do
with {:ok, activities} <- fetch_activity_from_atom_url(url) do with {:ok, activities} when length(activities) > 0 <- fetch_activity_from_atom_url(url) do
{:ok, activities} {:ok, activities}
else else
_e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do _e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do