mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Fix processing of incoming authorizations/rejections

This commit is contained in:
Eugen Rochko 2017-02-11 13:55:07 +01:00
parent 514fdfa268
commit e610555e10
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/services/process_interaction_service.rb
View File

@ -33,6 +33,8 @@ class ProcessInteractionService < BaseService
follow_request!(account, target_account) unless !target_account.locked? || target_account.blocking?(account) follow_request!(account, target_account) unless !target_account.locked? || target_account.blocking?(account)
when :authorize when :authorize
authorize_follow_request!(account, target_account) authorize_follow_request!(account, target_account)
when :reject
reject_follow_request!(account, target_account)
when :unfollow when :unfollow
unfollow!(account, target_account) unfollow!(account, target_account)
when :favorite when :favorite
@ -76,14 +78,20 @@ class ProcessInteractionService < BaseService
NotifyService.new.call(target_account, follow) NotifyService.new.call(target_account, follow)
end end
def follow_request(account, target_account) def follow_request!(account, target_account)
follow_request = FollowRequest.create!(account: account, target_account: target_account) follow_request = FollowRequest.create!(account: account, target_account: target_account)
NotifyService.new.call(target_account, follow_request) NotifyService.new.call(target_account, follow_request)
end end
def authorize_target_account!(account, target_account) def authorize_follow_request!(account, target_account)
follow_request = FollowRequest.find_by(account: target_account, target_account: account) follow_request = FollowRequest.find_by(account: target_account, target_account: account)
follow_request&.authorize! follow_request&.authorize!
SubscribeService.new.call(account) unless account.subscribed?
end
def reject_follow_request!(account, target_account)
follow_request = FollowRequest.find_by(account: target_account, target_account: account)
follow_request&.reject!
end end
def unfollow!(account, target_account) def unfollow!(account, target_account)