Merge branch 'develop' into support/tests

2019-09-07 22:13:43 +03:00 · 2019-09-07 22:13:43 +03:00 · 39f99dc6cd
commit 39f99dc6cd
parent ae506ca997 c45013df8e
62 changed files with 450 additions and 5343 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -790,7 +790,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