Merge branch 'develop' into oauth2

2017-09-11 20:54:44 +02:00 · 2017-09-11 20:54:44 +02:00 · f0d41a3abf
parent 464c33e9a1 95aa6a3c65
commit f0d41a3abf
1 changed files with 1 additions and 1 deletions
--- 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