aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 21:00:37 +0000
committerWilliam Pitcock <nenolod@dereferenced.org>2018-11-17 21:00:37 +0000
commit0d1375f2746eb927e516064df3fd9fd0ee7e9ff8 (patch)
tree89d4b9375495a77077cb05b108d4d6837ee547c9
parent3d9266a8cbf7e1d0979ad7e17dd553851e73d81e (diff)
downloadpleroma-0d1375f2746eb927e516064df3fd9fd0ee7e9ff8.tar.gz
federator: return :ok or :error depending on if an AP doc was accepted or not
-rw-r--r--lib/pleroma/web/federator/federator.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/federator/federator.ex b/lib/pleroma/web/federator/federator.ex
index 33e6db9b9..6554fd2ef 100644
--- a/lib/pleroma/web/federator/federator.ex
+++ b/lib/pleroma/web/federator/federator.ex
@@ -106,15 +106,18 @@ defmodule Pleroma.Web.Federator do
with {:ok, _user} <- ap_enabled_actor(params["actor"]),
nil <- Activity.normalize(params["id"]),
:ok <- Transmogrifier.contain_origin_from_id(params["actor"], params),
- {:ok, _activity} <- Transmogrifier.handle_incoming(params) do
+ {:ok, activity} <- Transmogrifier.handle_incoming(params) do
+ {:ok, activity}
else
%Activity{} ->
Logger.info("Already had #{params["id"]}")
+ :error
_e ->
# Just drop those for now
Logger.info("Unhandled activity")
Logger.info(Poison.encode!(params, pretty: 2))
+ :error
end
end