Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...

# Conflicts:
#	lib/pleroma/web/activity_pub/activity_pub.ex

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
index b24139117eccd61510bd5e2b28671d2ab8ad113e,f25314ff611bcda168134014bdb32519107ad636..cb132a87000a69b927cf1a82e75663bdccf82b3b
--- 1/lib/pleroma/web/activity_pub/activity_pub.ex
--- 2/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)