diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-09-11 20:54:44 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-09-11 20:54:44 +0200 |
| commit | f0d41a3abf3e584c90c96644f73d533ea0680237 (patch) | |
| tree | d389818eff185ca584449f2fb47ad7c1254fa3af /lib | |
| parent | 464c33e9a1daf0477be050209043d2c26943d1fd (diff) | |
| parent | 95aa6a3c651fed9810889d3446f2a1d710efb55e (diff) | |
| download | pleroma-f0d41a3abf3e584c90c96644f73d533ea0680237.tar.gz | |
Merge branch 'develop' into oauth2
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/ostatus.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex index 3e2acdd0f..fa8c086d6 100644 --- a/lib/pleroma/web/ostatus/ostatus.ex +++ b/lib/pleroma/web/ostatus/ostatus.ex @@ -299,7 +299,7 @@ defmodule Pleroma.Web.OStatus do end 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} else _e -> with {:ok, activities} <- fetch_activity_from_html_url(url) do |