projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a0d732e
)
elixir too new for CI's mix format lol
author
Karen Konou
<konoukaren@gmail.com>
Sat, 9 Feb 2019 17:08:46 +0000
(18:08 +0100)
committer
Karen Konou
<konoukaren@gmail.com>
Sat, 9 Feb 2019 17:08:46 +0000
(18:08 +0100)
lib/pleroma/notification.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/notification.ex
b/lib/pleroma/notification.ex
index d05708e41eb2aaf988e73d067a276ece87b26af8..ce4826b236bcdb07824039912a7733db5c592c0c 100644
(file)
--- 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