From 638456ce8f6b7f44356e69bac89d794c19e969d7 Mon Sep 17 00:00:00 2001 From: Karen Konou Date: Sat, 9 Feb 2019 18:08:46 +0100 Subject: [PATCH] elixir too new for CI's mix format lol --- lib/pleroma/notification.ex | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex index d05708e41..ce4826b23 100644 --- a/lib/pleroma/notification.ex +++ b/lib/pleroma/notification.ex @@ -113,8 +113,7 @@ def create_notifications(_), do: {:ok, []} # TODO move to sql, too. def create_notification(%Activity{} = activity, %User{} = user) do unless User.blocks?(user, %{ap_id: activity.data["actor"]}) or - ThreadMute.muted?(user, activity) or - user.ap_id == activity.data["actor"] or + ThreadMute.muted?(user, activity) or user.ap_id == activity.data["actor"] or (activity.data["type"] == "Follow" and Enum.any?(Notification.for_user(user), fn notif -> notif.activity.data["type"] == "Follow" and