diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-05-18 15:10:41 -0400 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-18 21:10:41 +0200 |
commit | 8ec8410651ad95ef1da4484497caf93899c31e9b (patch) | |
tree | 04aaccbe0d1f673b104eb391edd950b6380eedd5 /app/workers/after_remote_follow_request_worker.rb | |
parent | 4cc8ddabe5a925fe8dc93f943ae196dfdca2175d (diff) |
After remote follow worker specs (#3098)
* Add specs for the after remote follow workers * Refactor the after remote follow workers
Diffstat (limited to 'app/workers/after_remote_follow_request_worker.rb')
-rw-r--r-- | app/workers/after_remote_follow_request_worker.rb | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/app/workers/after_remote_follow_request_worker.rb b/app/workers/after_remote_follow_request_worker.rb index 928069211..84eb6ade2 100644 --- a/app/workers/after_remote_follow_request_worker.rb +++ b/app/workers/after_remote_follow_request_worker.rb @@ -5,15 +5,27 @@ class AfterRemoteFollowRequestWorker sidekiq_options queue: 'pull', retry: 5 + attr_reader :follow_request + def perform(follow_request_id) - follow_request = FollowRequest.find(follow_request_id) - updated_account = FetchRemoteAccountService.new.call(follow_request.target_account.remote_url) + @follow_request = FollowRequest.find(follow_request_id) + process_follow_service if processing_required? + rescue ActiveRecord::RecordNotFound + true + end - return if updated_account.nil? || updated_account.locked? + private + def process_follow_service follow_request.destroy FollowService.new.call(follow_request.account, updated_account.acct) - rescue ActiveRecord::RecordNotFound - true + end + + def processing_required? + !updated_account.nil? && !updated_account.locked? + end + + def updated_account + @_updated_account ||= FetchRemoteAccountService.new.call(follow_request.target_account.remote_url) end end |