From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Wed, 23 Oct 2019 14:22:42 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=8cc809e44e3a899f93061c4c5f68d9736d79d79e;p=akkoma

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

# Conflicts:
#	lib/pleroma/notification.ex
---

8cc809e44e3a899f93061c4c5f68d9736d79d79e
diff --cc lib/pleroma/notification.ex
index 21b26a53d,e5da1492b..83844d3be
--- a/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)
      )