From: Ivan Tashkinov Date: Tue, 26 Nov 2019 07:42:36 +0000 (+0300) Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields... X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c8d3c3bfeca66d16846f97b50328e0718cfe5fef;p=akkoma Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations # Conflicts: # lib/pleroma/web/activity_pub/activity_pub.ex --- c8d3c3bfeca66d16846f97b50328e0718cfe5fef diff --cc lib/pleroma/web/activity_pub/activity_pub.ex index b24139117,f25314ff6..cb132a870 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@@ -1066,7 -1065,8 +1091,8 @@@ defmodule Pleroma.Web.ActivityPub.Activ |> restrict_replies(opts) |> restrict_reblogs(opts) |> restrict_pinned(opts) - |> restrict_muted_reblogs(opts) + |> restrict_muted_reblogs(restrict_muted_reblogs_opts) + |> restrict_instance(opts) |> Activity.restrict_deactivated_users() |> exclude_poll_votes(opts) |> exclude_visibility(opts)