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

Merge branch 'delete-status' into 'develop'

Browse source 
Allow an admin to delete a user status #721 (MastoAPI)

See merge request pleroma/pleroma!914
This commit is contained in:
kaniini 2019-03-08 22:47:41 +00:00
commit 735f40047a
2 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/common_api/common_api.ex
View file

@ -30,7 +30,7 @@ defmodule Pleroma.Web.CommonAPI do
def delete(activity_id, user) do
with %Activity{data: %{"object" => %{"id" => object_id}}} <- Repo.get(Activity, activity_id),
%Object{} = object <- Object.normalize(object_id),
true <- user.info.is_moderator || user.ap_id == object.data["actor"],
true <- User.superuser?(user) || user.ap_id == object.data["actor"],
{:ok, _} <- unpin(activity_id, user),
{:ok, delete} <- ActivityPub.delete(object) do
{:ok, delete}