diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-07 22:17:32 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-07 22:17:32 +0300 |
| commit | 8c6cdff3cc48101711d0f09852866311780d97db (patch) | |
| tree | bef5ffd0fb9e47d25d52077caac34c9328529f8e /lib/pleroma/web | |
| parent | eb74c3d5c7a4bebbee43e123661d87e7605a32ba (diff) | |
| parent | c45013df8e53334bcc1afb8cd1df673c290037ee (diff) | |
| download | pleroma-8c6cdff3cc48101711d0f09852866311780d97db.tar.gz | |
Merge branch 'develop' into issue/1218
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index eeb826814..d23ec66ac 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -796,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 |