aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFrancis Dinh <normandy@firemail.cc>2018-05-11 15:34:46 -0400
committerFrancis Dinh <normandy@firemail.cc>2018-05-11 15:34:46 -0400
commit4d887475618ebceacd76840a2a7be6d6ad4987e6 (patch)
tree8258d4ef1932d168a7402d3a19a3566b80b40b4b /lib
parentc17c55e989a47f0722b115ffba48b7a1b45b7628 (diff)
downloadpleroma-4d887475618ebceacd76840a2a7be6d6ad4987e6.tar.gz
Revert "Log error when handling unrepeats"
This reverts commit c17c55e989a47f0722b115ffba48b7a1b45b7628.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex17
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index 0c4a62762..586fe2eb2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -216,24 +216,25 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
{:ok, activity} <- ActivityPub.delete(object, false) do
{:ok, activity}
else
- e ->
- Logger.error(e)
- :error
+ e -> :error
end
end
def handle_incoming(
- %{"type" => "Undo", "object" => %{"type" => "Announce", "id" => object_id}, "actor" => actor, "id" => id} = data
- ) do
+ %{
+ "type" => "Undo",
+ "object" => %{"type" => "Announce", "id" => object_id},
+ "actor" => actor,
+ "id" => id
+ } = data
+ ) do
with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
{:ok, object} <-
get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
{:ok, activity, _, _} <- ActivityPub.unannounce(actor, object, id, false) do
{:ok, activity}
else
- e ->
- Logger.error(e)
- :error
+ e -> :error
end
end