mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 00:54:49 +01:00
Use old rules for mention notifications as for mentions timeline
This commit is contained in:
parent
fb48cc3b74
commit
93577f74e7
@ -14,10 +14,27 @@ class NotifyService < BaseService
|
|||||||
|
|
||||||
private
|
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?
|
def blocked?
|
||||||
blocked = false
|
blocked = false
|
||||||
blocked ||= @recipient.id == @notification.from_account.id
|
blocked ||= @recipient.id == @notification.from_account.id
|
||||||
blocked ||= @recipient.blocking?(@notification.from_account)
|
blocked ||= @recipient.blocking?(@notification.from_account)
|
||||||
|
blocked ||= send("blocked_#{@notification.type}?")
|
||||||
blocked
|
blocked
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user