diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-02 20:44:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-02 20:44:41 +0200 |
| commit | d3b67461735f9a1c38a7eee655a8131bcf6a0cbf (patch) | |
| tree | 3228ad4c8a815867c0ddd6e4f2806686636d2292 /app/services/process_interaction_service.rb | |
| parent | 2a5d1d5a1b2a3c152f2deadac3308f655b6e96be (diff) | |
Make "unfollow" undo pending outgoing follow request too (#4781)
* 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
Diffstat (limited to 'app/services/process_interaction_service.rb')
| -rw-r--r-- | app/services/process_interaction_service.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb index cc99cde0355..d04e926e7d7 100644 --- a/app/services/process_interaction_service.rb +++ b/app/services/process_interaction_service.rb @@ -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) |