diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-12 00:48:53 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-02-12 01:19:14 +0100 |
commit | 0518492158af247f3b99a8f27f4498d1bcc91117 (patch) | |
tree | 4e82d1e73bd9a8ac1096d788b684283c8f8c93dd /app/services/block_service.rb | |
parent | 94d21827174c52a6b70ba2e45f098223f5d904fa (diff) |
Stop trying to shoehorn all Salmon updates into the poor database-connected
StreamEntry model. Simply render Salmon slaps as they are needed
Diffstat (limited to 'app/services/block_service.rb')
-rw-r--r-- | app/services/block_service.rb | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/app/services/block_service.rb b/app/services/block_service.rb index 095d2a8eb..bcd8c44c4 100644 --- a/app/services/block_service.rb +++ b/app/services/block_service.rb @@ -12,6 +12,27 @@ class BlockService < BaseService block = account.block!(target_account) BlockWorker.perform_async(account.id, target_account.id) - NotificationWorker.perform_async(stream_entry_to_xml(block.stream_entry), account.id, target_account.id) unless target_account.local? + NotificationWorker.perform_async(build_xml(block), account.id, target_account.id) unless target_account.local? + end + + private + + def build_xml(block) + Nokogiri::XML::Builder.new do |xml| + entry(xml, true) do + title xml, "#{block.account.acct} no longer wishes to interact with #{block.target_account.acct}" + + author(xml) do + include_author xml, block.account + end + + object_type xml, :activity + verb xml, :block + + target(xml) do + include_author xml, block.target_account + end + end + end.to_xml end end |