Commit 0dd98a5c authored by Benjamin Neff's avatar Benjamin Neff Committed by Dennis Schubert

Bump diaspora_federation

closes #7145
parent 4480f59e
......@@ -36,6 +36,7 @@ Note: Although this is a minor release, the configuration file changed because t
* Don't display tag following button when logged out [#7155](https://github.com/diaspora/diaspora/pull/7155)
* Fix message modal on profile page [#7137](https://github.com/diaspora/diaspora/pull/7137)
* Display error message when aspect membership changes fail [#7132](https://github.com/diaspora/diaspora/pull/7132)
* Avoid the creation of pod that are none [#7145](https://github.com/diaspora/diaspora/pull/7145)
## Features
* Deleted comments will be removed when loading more comments [#7045](https://github.com/diaspora/diaspora/pull/7045)
......
......@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation
gem "diaspora_federation-rails", "0.1.4"
gem "diaspora_federation-rails", "0.1.5"
# API and JSON
......@@ -285,7 +285,7 @@ group :test do
gem "webmock", "2.1.0", require: false
gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.4"
gem "diaspora_federation-test", "0.1.5"
# Coverage
gem 'coveralls', require: false
......
......@@ -177,17 +177,17 @@ GEM
devise
rails (>= 3.0.4)
diaspora-prosody-config (0.0.7)
diaspora_federation (0.1.4)
diaspora_federation (0.1.5)
faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0)
valid (~> 1.0)
diaspora_federation-rails (0.1.4)
diaspora_federation (= 0.1.4)
diaspora_federation-rails (0.1.5)
diaspora_federation (= 0.1.5)
rails (~> 4.2)
diaspora_federation-test (0.1.4)
diaspora_federation (= 0.1.4)
diaspora_federation-test (0.1.5)
diaspora_federation (= 0.1.5)
factory_girl (~> 4.7)
diff-lcs (1.2.5)
docile (1.1.5)
......@@ -207,7 +207,7 @@ GEM
execjs
multi_json (>= 1.3)
rake
ethon (0.9.0)
ethon (0.9.1)
ffi (>= 1.3.0)
excon (0.49.0)
execjs (2.7.0)
......@@ -934,8 +934,8 @@ DEPENDENCIES
devise-token_authenticatable (= 0.5.2)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7)
diaspora_federation-rails (= 0.1.4)
diaspora_federation-test (= 0.1.4)
diaspora_federation-rails (= 0.1.5)
diaspora_federation-test (= 0.1.5)
entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8.1)
factory_girl_rails (= 4.7.0)
......
......@@ -21,11 +21,12 @@ class Pod < ActiveRecord::Base
# this are only the most common errors, the rest will be +unknown_error+
CURL_ERROR_MAP = {
couldnt_resolve_host: :dns_failed,
couldnt_connect: :net_failed,
operation_timedout: :net_failed,
ssl_cipher: :ssl_failed,
ssl_cacert: :ssl_failed
couldnt_resolve_host: :dns_failed,
couldnt_connect: :net_failed,
operation_timedout: :net_failed,
ssl_cipher: :ssl_failed,
ssl_cacert: :ssl_failed,
redirected_to_other_hostname: :http_failed
}.freeze
DEFAULT_PORTS = [URI::HTTP::DEFAULT_PORT, URI::HTTPS::DEFAULT_PORT]
......
......@@ -93,7 +93,7 @@ DiasporaFederation.configure do |config|
end
end
on :receive_entity do |entity, recipient_id|
on :receive_entity do |entity, _sender, recipient_id|
case entity
when DiasporaFederation::Entities::AccountDeletion
Diaspora::Federation::Receive.account_deletion(entity)
......
......@@ -343,7 +343,7 @@ describe "diaspora federation callbacks" do
expect(Diaspora::Federation::Receive).to receive(:account_deletion).with(account_deletion)
expect(Workers::ReceiveLocal).not_to receive(:perform_async)
DiasporaFederation.callbacks.trigger(:receive_entity, account_deletion, nil)
DiasporaFederation.callbacks.trigger(:receive_entity, account_deletion, account_deletion.author, nil)
end
it "receives a Retraction" do
......@@ -352,7 +352,7 @@ describe "diaspora federation callbacks" do
expect(Diaspora::Federation::Receive).to receive(:retraction).with(retraction, 42)
expect(Workers::ReceiveLocal).not_to receive(:perform_async)
DiasporaFederation.callbacks.trigger(:receive_entity, retraction, 42)
DiasporaFederation.callbacks.trigger(:receive_entity, retraction, retraction.author, 42)
end
it "receives a entity" do
......@@ -362,7 +362,7 @@ describe "diaspora federation callbacks" do
expect(Diaspora::Federation::Receive).to receive(:perform).with(received).and_return(persisted)
expect(Workers::ReceiveLocal).to receive(:perform_async).with(persisted.class.to_s, persisted.id, [])
DiasporaFederation.callbacks.trigger(:receive_entity, received, nil)
DiasporaFederation.callbacks.trigger(:receive_entity, received, received.author, nil)
end
it "receives a entity for a recipient" do
......@@ -372,7 +372,7 @@ describe "diaspora federation callbacks" do
expect(Diaspora::Federation::Receive).to receive(:perform).with(received).and_return(persisted)
expect(Workers::ReceiveLocal).to receive(:perform_async).with(persisted.class.to_s, persisted.id, [42])
DiasporaFederation.callbacks.trigger(:receive_entity, received, 42)
DiasporaFederation.callbacks.trigger(:receive_entity, received, received.author, 42)
end
it "does not trigger a ReceiveLocal job if Receive.perform returned nil" do
......@@ -381,7 +381,7 @@ describe "diaspora federation callbacks" do
expect(Diaspora::Federation::Receive).to receive(:perform).with(received).and_return(nil)
expect(Workers::ReceiveLocal).not_to receive(:perform_async)
DiasporaFederation.callbacks.trigger(:receive_entity, received, nil)
DiasporaFederation.callbacks.trigger(:receive_entity, received, received.author, nil)
end
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment