squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Log error when handling unrepeats"

Browse Source 
This reverts commit c17c55e989.
This commit is contained in:
Francis Dinh 2018-05-11 15:34:46 -04:00
parent c17c55e989
commit 4d88747561
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -216,14 +216,17 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
{:ok, activity} <- ActivityPub.delete(object, false) do {:ok, activity} <- ActivityPub.delete(object, false) do
{:ok, activity} {:ok, activity}
else else
e -> e -> :error
Logger.error(e)
:error
end end
end end
def handle_incoming( def handle_incoming(
%{"type" => "Undo", "object" => %{"type" => "Announce", "id" => object_id}, "actor" => actor, "id" => id} = data %{
"type" => "Undo",
"object" => %{"type" => "Announce", "id" => object_id},
"actor" => actor,
"id" => id
} = data
) do ) do
with %User{} = actor <- User.get_or_fetch_by_ap_id(actor), with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
{:ok, object} <- {:ok, object} <-
@ -231,9 +234,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
{:ok, activity, _, _} <- ActivityPub.unannounce(actor, object, id, false) do {:ok, activity, _, _} <- ActivityPub.unannounce(actor, object, id, false) do
{:ok, activity} {:ok, activity}
else else
e -> e -> :error
Logger.error(e)
:error
end end
end end