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

Follow requests send e-mail notifications, but are excluded from notifications API

Browse Source 
Better initial state for unlisted/nsfw toggles
This commit is contained in:
Eugen Rochko
2016-12-26 21:52:03 +01:00
parent 3689c119f0
commit 2146ac91a0
11 changed files with 48 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/services/follow_service.rb
View File

@ -20,7 +20,12 @@ class FollowService < BaseService
private
def request_follow(source_account, target_account)
FollowRequest.create!(account: source_account, target_account: target_account)
return unless target_account.local?
follow_request = FollowRequest.create!(account: source_account, target_account: target_account)
NotifyService.new.call(target_account, follow_request)
follow_request
end
def direct_follow(source_account, target_account)

5
app/services/notify_service.rb
View File

@ -32,6 +32,10 @@ class NotifyService < BaseService
false
end
def blocked_follow_request?
false
end
def blocked?
blocked = @recipient.suspended? # Skip if the recipient account is suspended anyway
blocked ||= @recipient.id == @notification.from_account.id # Skip for interactions with self
@ -45,6 +49,7 @@ class NotifyService < BaseService
def create_notification
@notification.save!
return unless @notification.browserable?
FeedManager.instance.broadcast(@recipient.id, type: 'notification', message: FeedManager.instance.inline_render(@recipient, 'api/v1/notifications/show', @notification))
end