Upgrade diaspora_federation to 1.0

2 files changed, 5 insertions, 6 deletions

diff --git a/config/initializers/diaspora_federation.rb b/config/initializers/diaspora_federation.rb
index 1f56f5c1a..19a9fdfe4 100644
--- a/config/initializers/diaspora_federation.rb
+++ b/config/initializers/diaspora_federation.rb
@@ -44,7 +44,6 @@ DiasporaFederation.configure do |config|
           guid:             person.guid,
           nickname:         person.username,
           full_name:        "#{person.profile.first_name} #{person.profile.last_name}".strip,
-          url:              AppConfig.pod_uri,
           photo_large_url:  person.image_url,
           photo_medium_url: person.image_url(size: :thumb_medium),
           photo_small_url:  person.image_url(size: :thumb_small),
@@ -90,15 +89,15 @@ DiasporaFederation.configure do |config|
       Diaspora::Federation::Entities.related_entity(entity) if entity
     end
 
-    on :queue_public_receive do |xml, legacy=false|
-      Workers::ReceivePublic.perform_async(xml, legacy)
+    on :queue_public_receive do |xml|
+      Workers::ReceivePublic.perform_async(xml)
     end
 
-    on :queue_private_receive do |guid, xml, legacy=false|
+    on :queue_private_receive do |guid, xml|
       person = Person.find_by_guid(guid)
 
       (person.present? && person.owner_id.present?).tap do |user_found|
-        Workers::ReceivePrivate.perform_async(person.owner.id, xml, legacy) if user_found
+        Workers::ReceivePrivate.perform_async(person.owner.id, xml) if user_found
       end
     end
 
diff --git a/config/initializers/faraday.rb b/config/initializers/faraday.rb
index a54963221..76f9d0a32 100644
--- a/config/initializers/faraday.rb
+++ b/config/initializers/faraday.rb
@@ -20,7 +20,7 @@ options = {
 }
 
 Faraday.default_connection = Faraday::Connection.new(options) do |b|
-  b.use FaradayMiddleware::FollowRedirects, limit: 8
+  b.use Faraday::FollowRedirects::Middleware, limit: 8
   b.use :cookie_jar
   b.adapter Faraday.default_adapter
 end