hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge fixes.

Browse source
This commit is contained in:
lain 2020-05-07 14:52:37 +02:00
commit 788b7e7bbd
5 changed files with 10 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/pleroma/user.ex
View file

@ -1557,16 +1557,13 @@ defmodule Pleroma.User do
defp delete_activity(%{data: %{"type" => "Create", "object" => object}}, user) do
{:ok, delete_data, _} = Builder.delete(user, object)
Pipeline.common_pipeline(delete_data, local: true)
Pipeline.common_pipeline(delete_data, local: user.local)
end
defp delete_activity(%{data: %{"type" => type}} = activity) when type in ["Like", "Announce"] do
actor =
activity.actor
|> get_cached_by_ap_id()
{:ok, undo, _} = Builder.undo(actor, activity)
Pipeline.common_pipeline(undo, local: true)
defp delete_activity(%{data: %{"type" => type}} = activity, user)
when type in ["Like", "Announce"] do
{:ok, undo, _} = Builder.undo(user, activity)
Pipeline.common_pipeline(undo, local: user.local)
end
defp delete_activity(_activity, _user), do: "Doing nothing"