diff options
| author | Karen Konou <konoukaren@gmail.com> | 2019-02-09 18:08:46 +0100 |
|---|---|---|
| committer | Karen Konou <konoukaren@gmail.com> | 2019-02-09 18:08:46 +0100 |
| commit | 638456ce8f6b7f44356e69bac89d794c19e969d7 (patch) | |
| tree | bf86a17fdaa6637729e3da6126640fa862a552ce /lib | |
| parent | a0d732ec55fcbce8cf345344d1456dc77bb0f3bf (diff) | |
| download | pleroma-638456ce8f6b7f44356e69bac89d794c19e969d7.tar.gz | |
elixir too new for CI's mix format lol
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/notification.ex | 3 |
1 files changed, 1 insertions, 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 @@ 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 |