projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
464c33e
)
Merge branch 'develop' into oauth2
author
Roger Braun
<roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000
(20:54 +0200)
committer
Roger Braun
<roger@rogerbraun.net>
Mon, 11 Sep 2017 18:54:44 +0000
(20:54 +0200)
lib/pleroma/web/ostatus/ostatus.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/ostatus/ostatus.ex
b/lib/pleroma/web/ostatus/ostatus.ex
index 3e2acdd0facba28119100c3a043c05709f33124b..fa8c086d618b82f5d9751b899a504d4c6021c5a7 100644
(file)
--- 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