mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 00:54:49 +01:00
Code Issues Projects Releases Wiki Activity

Use old rules for mention notifications as for mentions timeline

Browse Source
This commit is contained in:
Eugen Rochko 2016-11-21 10:37:34 +01:00
parent fb48cc3b74
commit 93577f74e7
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/services/notify_service.rb
View File

@ -14,10 +14,27 @@ class NotifyService < BaseService
private
def blocked_mention?
FeedManager.instance.filter?(:mentions, @notification.mention.status, @recipient)
end
def blocked_favourite?
false
end
def blocked_follow?
false
end
def blocked_reblog?
false
end
def blocked?
blocked = false
blocked ||= @recipient.id == @notification.from_account.id
blocked ||= @recipient.blocking?(@notification.from_account)
blocked ||= send("blocked_#{@notification.type}?")
blocked
end