Merge branch 'capture-test-errors' into 'develop'

[akkoma] / lib / pleroma / web / activity_pub / activity_pub.ex

diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index 8f07638cd00f18fe249729030765a40eaf2a149c..d23ec66ac4c6afd403099286a48409ac9c125fca 100644 (file)
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -556,7 +556,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     q
     |> restrict_unlisted()
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
   end
 
@@ -797,7 +796,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
       )
 
     unless opts["skip_preload"] do
-      from([thread_mute: tm] in query, where: is_nil(tm))
+      from([thread_mute: tm] in query, where: is_nil(tm.user_id))
     else
       query
     end
@@ -954,7 +953,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
 
     fetch_activities_query(recipients ++ list_memberships, opts)
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
     |> maybe_update_cc(list_memberships, opts["user"])
   end
@@ -989,7 +987,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
     fetch_activities_query([], opts)
     |> fetch_activities_bounded_query(recipients, recipients_with_public)
     |> Pagination.fetch_paginated(opts)
-    |> Map.get(:items)
     |> Enum.reverse()
   end