Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

# Conflicts:
#	lib/pleroma/notification.ex

diff --cc CHANGELOG.md
Simple merge

diff --cc lib/pleroma/notification.ex
index 21b26a53d7b894369a446ebc1d0ee31a2a49d111,e5da1492b8c372437c81ca35ef35542ce6870b97..83844d3be4c58f78f81f17e6fc6e47a71af3ad1b
--- 1/lib/pleroma/notification.ex
--- 2/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@@ -64,12 -74,7 +74,7 @@@ defmodule Pleroma.Notification d
  
    defp exclude_muted(query, user, _opts) do
      query
 -    |> where([n, a], a.actor not in ^user.info.muted_notifications)
 +    |> where([n, a], a.actor not in ^user.muted_notifications)
-     |> where([n, a], a.actor not in ^user.blocks)
-     |> where(
-       [n, a],
-       fragment("substring(? from '.*://([^/]*)')", a.actor) not in ^user.domain_blocks
-     )
      |> join(:left, [n, a], tm in Pleroma.ThreadMute,
        on: tm.user_id == ^user.id and tm.context == fragment("?->>'context'", a.data)
      )

diff --cc test/notification_test.exs
Simple merge

diff --cc test/web/activity_pub/activity_pub_controller_test.exs
Simple merge

diff --cc test/web/activity_pub/transmogrifier_test.exs
Simple merge