diff options
author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-03 11:51:35 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-03 11:51:35 -0700 |
commit | de154dbd5dbb04d083f5a66dc288d9fef7006c01 (patch) | |
tree | 88a1715021c33add55501351dbf74950deeac481 /app/services/process_interaction_service.rb | |
parent | c3e9ba6a66bfcb9e33edebc73adea0a17d7f02a6 (diff) | |
parent | e6657d7342ee1ce08973bf1e5ab89e423eb8b760 (diff) |
Merge pull request #1 from Gargron/master
Catchup merge
Diffstat (limited to 'app/services/process_interaction_service.rb')
-rw-r--r-- | app/services/process_interaction_service.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/app/services/process_interaction_service.rb b/app/services/process_interaction_service.rb index 3d3cccb6a..11ec0d2dd 100644 --- a/app/services/process_interaction_service.rb +++ b/app/services/process_interaction_service.rb @@ -30,7 +30,7 @@ class ProcessInteractionService < BaseService case verb(xml) when :follow - follow!(account, target_account) unless target_account.locked? + follow!(account, target_account) unless target_account.locked? || target_account.blocking?(account) when :unfollow unfollow!(account, target_account) when :favorite @@ -41,6 +41,10 @@ class ProcessInteractionService < BaseService add_post!(body, account) unless status(xml).nil? when :delete delete_post!(xml, account) + when :block + reflect_block!(account, target_account) + when :unblock + reflect_unblock!(account, target_account) end end rescue Goldfinger::Error, HTTP::Error, OStatus2::BadSalmonError @@ -74,6 +78,15 @@ class ProcessInteractionService < BaseService account.unfollow!(target_account) end + def reflect_block!(account, target_account) + UnfollowService.new.call(target_account, account) if target_account.following?(account) + account.block!(target_account) + end + + def reflect_unblock!(account, target_account) + UnblockService.new.call(account, target_account) + end + def delete_post!(xml, account) status = Status.find(xml.at_xpath('//xmlns:id', xmlns: TagManager::XMLNS).content) |