Merge remote-tracking branch 'upstream/master'

2017-06-27 20:46:13 +00:00
parent e6300de142 da42bfadb5
commit ddafde942c
91 changed files with 1274 additions and 751 deletions
--- a/app/services/send_interaction_service.rb
+++ b/app/services/send_interaction_service.rb
@@ -13,7 +13,8 @@ class SendInteractionService < BaseService
    return if block_notification?

    envelope = salmon.pack(@xml, @source_account.keypair)
-    salmon.post(@target_account.salmon_url, envelope)
+    delivery = salmon.post(@target_account.salmon_url, envelope)
+    raise "Delivery failed for #{target_account.salmon_url}: HTTP #{delivery.code}" unless delivery.code > 199 && delivery.code < 300
  end

  private