Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue

2019-09-08 08:41:10 +03:00 · 2019-09-08 08:41:10 +03:00 · c3f00447af
commit c3f00447af
parent ca1ba1e272 c45013df8e
3 changed files with 12 additions and 11 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -797,7 +797,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