vbatts/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Blocking will prevent e-mail notifications from blocked user, blocks in UI

Browse source
This commit is contained in:
Eugen Rochko 2016-10-03 18:49:52 +02:00
parent 7b9a4af311
commit 70e9dd0b5b
12 changed files with 134 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/services/favourite_service.rb
View file

@ -8,7 +8,7 @@ class FavouriteService < BaseService
account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url])
if status.local?
NotificationMailer.favourite(status, account).deliver_later
NotificationMailer.favourite(status, account).deliver_later unless status.account.blocking?(account)
else
NotificationWorker.perform_async(favourite.stream_entry.id, status.account_id)
end

2
app/services/follow_service.rb
View file

@ -10,7 +10,7 @@ class FollowService < BaseService
follow = source_account.follow!(target_account)
if target_account.local?
NotificationMailer.follow(target_account, source_account).deliver_later
NotificationMailer.follow(target_account, source_account).deliver_later unless target_account.blocking?(source_account)
else
subscribe_service.call(target_account)
NotificationWorker.perform_async(follow.stream_entry.id, target_account.id)

4
app/services/process_feed_service.rb
View file

@ -69,7 +69,7 @@ class ProcessFeedService < BaseService
unless mentioned_account.nil?
mentioned_account.mentions.where(status: status).first_or_create(status: status)
NotificationMailer.mention(mentioned_account, status).deliver_later
NotificationMailer.mention(mentioned_account, status).deliver_later unless mentioned_account.blocking?(status.account)
end
else
# What to do about remote user?
@ -114,7 +114,7 @@ class ProcessFeedService < BaseService
if !status.reblog.nil?
status.save!
NotificationMailer.reblog(status.reblog, status.account).deliver_later if status.reblog.local?
NotificationMailer.reblog(status.reblog, status.account).deliver_later if status.reblog.local? && !status.reblog.account.blocking?(status.account)
end
end

4
app/services/process_interaction_service.rb
View file

@ -58,7 +58,7 @@ class ProcessInteractionService < BaseService
def follow!(account, target_account)
account.follow!(target_account)
NotificationMailer.follow(target_account, account).deliver_later
NotificationMailer.follow(target_account, account).deliver_later unless target_account.blocking?(account)
end
def unfollow!(account, target_account)
@ -78,7 +78,7 @@ class ProcessInteractionService < BaseService
def favourite!(xml, from_account)
current_status = status(xml)
current_status.favourites.where(account: from_account).first_or_create!(account: from_account)
NotificationMailer.favourite(current_status, from_account).deliver_later
NotificationMailer.favourite(current_status, from_account).deliver_later unless current_status.account.blocking?(from_account)
end
def add_post!(body, account)

2
app/services/process_mentions_service.rb
View file

@ -27,7 +27,7 @@ class ProcessMentionsService < BaseService
mentioned_account = mention.account
if mentioned_account.local?
NotificationMailer.mention(mentioned_account, status).deliver_later
NotificationMailer.mention(mentioned_account, status).deliver_later unless mentioned_account.blocking?(status.account)
else
NotificationWorker.perform_async(status.stream_entry.id, mentioned_account.id)
end

2
app/services/reblog_service.rb
View file

@ -9,7 +9,7 @@ class ReblogService < BaseService
account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url])
if reblogged_status.local?
NotificationMailer.reblog(reblogged_status, account).deliver_later
NotificationMailer.reblog(reblogged_status, account).deliver_later unless reblogged_status.account.blocking?(account)
else
NotificationWorker.perform_async(reblog.stream_entry.id, reblogged_status.account_id)
end