summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2023-06-11 13:17:12 +0000
committerlain <lain@soykaf.club>2023-06-11 13:17:12 +0000
commit4e6ea7cc9186e8a2a88943383f235e4c4e61fc45 (patch)
tree8e51b4a5484289e98a222e09724e9a77af83237d /lib
parentd93b47cf2ccf0666f70c4816acb45194e84a3865 (diff)
parent1fa196d8f7abfeccfcd911c74190866ad0950ca0 (diff)
downloadpleroma-4e6ea7cc9186e8a2a88943383f235e4c4e61fc45.tar.gz
pleroma-4e6ea7cc9186e8a2a88943383f235e4c4e61fc45.zip
Merge branch 'tusooa/3054-banned-delete' into 'develop'
Fix deleting banned users' statuses See merge request pleroma/pleroma!3889
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api.ex b/lib/pleroma/web/common_api.ex
index 89cc0d6fe..65d08de49 100644
--- a/lib/pleroma/web/common_api.ex
+++ b/lib/pleroma/web/common_api.ex
@@ -142,7 +142,7 @@ defmodule Pleroma.Web.CommonAPI do
def delete(activity_id, user) do
with {_, %Activity{data: %{"object" => _, "type" => "Create"}} = activity} <-
- {:find_activity, Activity.get_by_id(activity_id)},
+ {:find_activity, Activity.get_by_id(activity_id, filter: [])},
{_, %Object{} = object, _} <-
{:find_object, Object.normalize(activity, fetch: false), activity},
true <- User.privileged?(user, :messages_delete) || user.ap_id == object.data["actor"],