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

Make "unfollow" undo pending outgoing follow request too (#4781)

Browse Source 
* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling
This commit is contained in:
Eugen Rochko
2017-09-02 20:44:41 +02:00
committed by GitHub
parent 2a5d1d5a1b
commit d3b6746173
8 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/process_interaction_service.rb
View File

@ -67,10 +67,13 @@ class ProcessInteractionService < BaseService
def follow!(account, target_account)
follow = account.follow!(target_account)
FollowRequest.find_by(account: account, target_account: target_account)&.destroy
NotifyService.new.call(target_account, follow)
end
def follow_request!(account, target_account)
return if account.requested?(target_account)
follow_request = FollowRequest.create!(account: account, target_account: target_account)
NotifyService.new.call(target_account, follow_request)
end
@ -88,6 +91,7 @@ class ProcessInteractionService < BaseService
def unfollow!(account, target_account)
account.unfollow!(target_account)
FollowRequest.find_by(account: account, target_account: target_account)&.destroy
end
def reflect_block!(account, target_account)