diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-08 22:47:41 +0000 | 
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-08 22:47:41 +0000 | 
| commit | 735f40047aad36dbe2b6ff09d073b7362f82f92a (patch) | |
| tree | 7468a9a9022443c84ade3d982500eed3c8dda00b /lib | |
| parent | 130fc9eae63ef5860e383c8f31c968103ba3b894 (diff) | |
| parent | 2827dfea50280dd080c0ec7762b681ea05e2878e (diff) | |
| download | pleroma-735f40047aad36dbe2b6ff09d073b7362f82f92a.tar.gz pleroma-735f40047aad36dbe2b6ff09d073b7362f82f92a.zip | |
Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 | 
1 files changed, 1 insertions, 1 deletions
| diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 55a9c2572..07bd6548a 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -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} | 
