tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92 from tootsuite/master

Browse Source 
tiny upstream merge
This commit is contained in:
Ondřej Hruška
2017-07-22 22:20:17 +02:00
committed by GitHub
parent 3ba7c1e725 4cd82d442e
commit 6913426e48
8 changed files with 161 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/services/notify_service.rb
View File

@@ -21,7 +21,7 @@ class NotifyService < BaseService
end
def blocked_favourite?
@recipient.muting?(@notification.from_account)
false
end
def blocked_follow?
@@ -41,6 +41,7 @@ class NotifyService < BaseService
blocked ||= @recipient.id == @notification.from_account.id # Skip for interactions with self
blocked ||= @recipient.domain_blocking?(@notification.from_account.domain) && !@recipient.following?(@notification.from_account) # Skip for domain blocked accounts
blocked ||= @recipient.blocking?(@notification.from_account) # Skip for blocked accounts
blocked ||= @recipient.muting?(@notification.from_account) # Skip for muted accounts
blocked ||= (@notification.from_account.silenced? && !@recipient.following?(@notification.from_account)) # Hellban
blocked ||= (@recipient.user.settings.interactions['must_be_follower'] && !@notification.from_account.following?(@recipient)) # Options
blocked ||= (@recipient.user.settings.interactions['must_be_following'] && !@recipient.following?(@notification.from_account)) # Options