diff options
| author | lain <lain@soykaf.club> | 2018-02-21 18:34:19 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-02-21 18:34:19 +0100 |
| commit | 94db9ac4dba6ba02fcae1b9055b532818cf787c7 (patch) | |
| tree | 0b6189c60adbca5e0ea6b9aded01dccfbbc35755 /lib/pleroma/web/common_api | |
| parent | a06b9a3e0b5639dfc3a975c7a5f3ea11a05a286f (diff) | |
| parent | e98aeabbdebee8f6c9a10d0c9e3f48c1031172cb (diff) | |
| download | pleroma-94db9ac4dba6ba02fcae1b9055b532818cf787c7.tar.gz | |
Merge branch 'develop' into feature/activitypub
Diffstat (limited to 'lib/pleroma/web/common_api')
| -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 c6657b8e8..5bd6e136f 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -8,7 +8,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.get_by_ap_id(object_id), - true <- user.ap_id == object.data["actor"], + true <- user.info["is_moderator"] || (user.ap_id == object.data["actor"]), {:ok, delete} <- ActivityPub.delete(object) do {:ok, delete} end |