Merge branch 'next-minor' into develop

2 files changed, 4 insertions, 3 deletions

diff --git a/lib/diaspora/federated/retraction.rb b/lib/diaspora/federated/retraction.rb
index b0ea20dbc..538ba7e9b 100644
--- a/lib/diaspora/federated/retraction.rb
+++ b/lib/diaspora/federated/retraction.rb
@@ -36,7 +36,8 @@ class Retraction
 
   def defer_dispatch(user, include_target_author=true)
     subscribers = dispatch_subscribers(include_target_author)
-    Workers::DeferredRetraction.perform_async(user.id, self.class.to_s, data, subscribers.map(&:id), service_opts(user))
+    Workers::DeferredRetraction.perform_async(user.id, self.class.to_s, data.deep_stringify_keys,
+                                              subscribers.map(&:id), service_opts(user).deep_stringify_keys)
   end
 
   def perform
diff --git a/lib/diaspora/federation/dispatcher.rb b/lib/diaspora/federation/dispatcher.rb
index 4e03e725f..2ad441715 100644
--- a/lib/diaspora/federation/dispatcher.rb
+++ b/lib/diaspora/federation/dispatcher.rb
@@ -21,7 +21,7 @@ module Diaspora
       end
 
       def self.defer_dispatch(sender, object, opts={})
-        Workers::DeferredDispatch.perform_async(sender.id, object.class.to_s, object.id, opts)
+        Workers::DeferredDispatch.perform_async(sender.id, object.class.to_s, object.id, opts.deep_stringify_keys)
       end
 
       def dispatch
@@ -69,7 +69,7 @@ module Diaspora
         when StatusMessage
           each_service {|service| Workers::PostToService.perform_async(service.id, object.id, opts[:url]) }
         when Retraction
-          each_service {|service| Workers::DeletePostFromService.perform_async(service.id, opts) }
+          each_service {|service| Workers::DeletePostFromService.perform_async(service.id, opts.deep_stringify_keys) }
         end
       end