elixir too new for CI's mix format lol
authorKaren Konou <konoukaren@gmail.com>
Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)
committerKaren Konou <konoukaren@gmail.com>
Sat, 9 Feb 2019 17:08:46 +0000 (18:08 +0100)
lib/pleroma/notification.ex

index d05708e41eb2aaf988e73d067a276ece87b26af8..ce4826b236bcdb07824039912a7733db5c592c0c 100644 (file)
@@ -113,8 +113,7 @@ defmodule Pleroma.Notification do
   # 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