AdminAPI: Fix grouped reports for closed/resolved reports
authorMaxim Filippov <colixer@gmail.com>
Sun, 24 Nov 2019 16:39:35 +0000 (01:39 +0900)
committerMaxim Filippov <colixer@gmail.com>
Mon, 25 Nov 2019 15:13:11 +0000 (00:13 +0900)
lib/pleroma/web/activity_pub/utils.ex

index 277ca3c7cfe32826550d2a776288efdc652aeb2b..9e460b6049da4978d8f9dcc26711ae10299bc909 100644 (file)
@@ -852,7 +852,8 @@ defmodule Pleroma.Web.ActivityPub.Utils do
   def get_reports_by_status_id(ap_id) do
     from(a in Activity,
       where: fragment("(?)->>'type' = 'Flag'", a.data),
-      where: fragment("(?)->'object' @> ?", a.data, ^[%{id: ap_id}])
+      where: fragment("(?)->'object' @> ?", a.data, ^[%{id: ap_id}]),
+      or_where: fragment("(?)->'object' @> ?", a.data, ^[ap_id])
     )
     |> Activity.with_preloaded_user_actor()
     |> Repo.all()