diff options
| author | kaniini <nenolod@gmail.com> | 2019-01-11 23:09:41 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-01-11 23:09:41 +0000 |
| commit | 19b6a8239387869c69c6885044ee488d097b723f (patch) | |
| tree | 585dcbb2b2674736b0fac7de3af5743a126976dc /lib | |
| parent | eeb9e632e47b64cf1dfb7ee6c9e86e4e5c30e6d0 (diff) | |
| parent | 728587fdaabbf8db8ee0d3626ab706044f0249f7 (diff) | |
| download | pleroma-19b6a8239387869c69c6885044ee488d097b723f.tar.gz | |
Merge branch 'bugfix/pinned-statuses' into 'develop'
Unpin when deleting a status
See merge request pleroma/pleroma!655
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 7ec6aa0ea..2902905fd 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -14,6 +14,7 @@ defmodule Pleroma.Web.CommonAPI 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"], + {:ok, _} <- unpin(activity_id, user), {:ok, delete} <- ActivityPub.delete(object) do {:ok, delete} end |