From fb60f8392698f49b9291f3461e7a68ec84def9e2 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sun, 16 Oct 2016 23:50:26 +0200 Subject: [PATCH] add sender parameter to :receive_entity callback --- .../federation/receiver/abstract_receiver.rb | 2 +- .../federation/receiver/private_spec.rb | 12 ++++++------ .../federation/receiver/public_spec.rb | 18 +++++++++--------- .../federation/receiver_spec.rb | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/lib/diaspora_federation/federation/receiver/abstract_receiver.rb b/lib/diaspora_federation/federation/receiver/abstract_receiver.rb index 9046139..1d23a1c 100644 --- a/lib/diaspora_federation/federation/receiver/abstract_receiver.rb +++ b/lib/diaspora_federation/federation/receiver/abstract_receiver.rb @@ -28,7 +28,7 @@ module DiasporaFederation def validate_and_receive validate - DiasporaFederation.callbacks.trigger(:receive_entity, entity, recipient_id) + DiasporaFederation.callbacks.trigger(:receive_entity, entity, sender, recipient_id) logger.info "successfully received #{entity} from person #{sender}#{" for #{recipient_id}" if recipient_id}" end diff --git a/spec/lib/diaspora_federation/federation/receiver/private_spec.rb b/spec/lib/diaspora_federation/federation/receiver/private_spec.rb index 74a9024..8a99f31 100644 --- a/spec/lib/diaspora_federation/federation/receiver/private_spec.rb +++ b/spec/lib/diaspora_federation/federation/receiver/private_spec.rb @@ -6,7 +6,7 @@ module DiasporaFederation describe "#receive" do it "receives a private post" do - expect_callback(:receive_entity, post, recipient) + expect_callback(:receive_entity, post, post.author, recipient) described_class.new(magic_env, recipient).receive end @@ -32,7 +32,7 @@ module DiasporaFederation it "receives a comment from the author" do magic_env = Salmon::MagicEnvelope.new(comment, comment.author) - expect_callback(:receive_entity, comment, recipient) + expect_callback(:receive_entity, comment, comment.author, recipient) described_class.new(magic_env, recipient).receive end @@ -40,7 +40,7 @@ module DiasporaFederation it "receives a comment from the parent author" do magic_env = Salmon::MagicEnvelope.new(comment, comment.parent.author) - expect_callback(:receive_entity, comment, recipient) + expect_callback(:receive_entity, comment, comment.parent.author, recipient) described_class.new(magic_env, recipient).receive end @@ -62,7 +62,7 @@ module DiasporaFederation it "retracts a post from the author" do magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.author) - expect_callback(:receive_entity, retraction, recipient) + expect_callback(:receive_entity, retraction, retraction.author, recipient) described_class.new(magic_env, recipient).receive end @@ -89,7 +89,7 @@ module DiasporaFederation it "retracts a comment from the author" do magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.author) - expect_callback(:receive_entity, retraction, recipient) + expect_callback(:receive_entity, retraction, retraction.target.author, recipient) described_class.new(magic_env, recipient).receive end @@ -97,7 +97,7 @@ module DiasporaFederation it "retracts a comment from the parent author" do magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.parent.author) - expect_callback(:receive_entity, retraction, recipient) + expect_callback(:receive_entity, retraction, retraction.target.parent.author, recipient) described_class.new(magic_env, recipient).receive end diff --git a/spec/lib/diaspora_federation/federation/receiver/public_spec.rb b/spec/lib/diaspora_federation/federation/receiver/public_spec.rb index ad4a0b9..8ec88e1 100644 --- a/spec/lib/diaspora_federation/federation/receiver/public_spec.rb +++ b/spec/lib/diaspora_federation/federation/receiver/public_spec.rb @@ -5,7 +5,7 @@ module DiasporaFederation describe "#receive" do it "receives a public post" do - expect_callback(:receive_entity, post, nil) + expect_callback(:receive_entity, post, post.author, nil) described_class.new(magic_env).receive end @@ -25,7 +25,7 @@ module DiasporaFederation it "receives a comment from the author" do magic_env = Salmon::MagicEnvelope.new(comment, comment.author) - expect_callback(:receive_entity, comment, nil) + expect_callback(:receive_entity, comment, comment.author, nil) described_class.new(magic_env).receive end @@ -33,7 +33,7 @@ module DiasporaFederation it "receives a comment from the author parent" do magic_env = Salmon::MagicEnvelope.new(comment, comment.parent.author) - expect_callback(:receive_entity, comment, nil) + expect_callback(:receive_entity, comment, comment.parent.author, nil) described_class.new(magic_env).receive end @@ -53,9 +53,9 @@ module DiasporaFederation let(:retraction) { FactoryGirl.build(:retraction_entity, target_type: "Post") } it "retracts a post from the author" do - magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.author) + magic_env = Salmon::MagicEnvelope.new(retraction, retraction.author) - expect_callback(:receive_entity, retraction, nil) + expect_callback(:receive_entity, retraction, retraction.author, nil) described_class.new(magic_env).receive end @@ -82,7 +82,7 @@ module DiasporaFederation it "retracts a comment from the author" do magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.author) - expect_callback(:receive_entity, retraction, nil) + expect_callback(:receive_entity, retraction, retraction.target.author, nil) described_class.new(magic_env).receive end @@ -90,7 +90,7 @@ module DiasporaFederation it "retracts a comment from the parent author" do magic_env = Salmon::MagicEnvelope.new(retraction, retraction.target.parent.author) - expect_callback(:receive_entity, retraction, nil) + expect_callback(:receive_entity, retraction, retraction.target.parent.author, nil) described_class.new(magic_env).receive end @@ -111,7 +111,7 @@ module DiasporaFederation public_post = FactoryGirl.build(:status_message_entity, public: true) magic_env = Salmon::MagicEnvelope.new(public_post, public_post.author) - expect_callback(:receive_entity, public_post, nil) + expect_callback(:receive_entity, public_post, public_post.author, nil) described_class.new(magic_env).receive end @@ -129,7 +129,7 @@ module DiasporaFederation profile = FactoryGirl.build(:profile_entity) magic_env = Salmon::MagicEnvelope.new(profile, profile.author) - expect_callback(:receive_entity, profile, nil) + expect_callback(:receive_entity, profile, profile.author, nil) described_class.new(magic_env).receive end diff --git a/spec/lib/diaspora_federation/federation/receiver_spec.rb b/spec/lib/diaspora_federation/federation/receiver_spec.rb index 2e0cbf9..3da808f 100644 --- a/spec/lib/diaspora_federation/federation/receiver_spec.rb +++ b/spec/lib/diaspora_federation/federation/receiver_spec.rb @@ -11,7 +11,7 @@ module DiasporaFederation data = Salmon::MagicEnvelope.new(post, post.author).envelop(sender_key).to_xml - expect_callback(:receive_entity, kind_of(Entities::StatusMessage), nil) do |_, entity| + expect_callback(:receive_entity, kind_of(Entities::StatusMessage), post.author, nil) do |_, entity| expect(entity.guid).to eq(post.guid) expect(entity.author).to eq(post.author) expect(entity.text).to eq(post.text) @@ -26,7 +26,7 @@ module DiasporaFederation data = DiasporaFederation::Salmon::Slap.generate_xml(post.author, sender_key, post) - expect_callback(:receive_entity, kind_of(Entities::StatusMessage), nil) do |_, entity| + expect_callback(:receive_entity, kind_of(Entities::StatusMessage), post.author, nil) do |_, entity| expect(entity.guid).to eq(post.guid) expect(entity.author).to eq(post.author) expect(entity.text).to eq(post.text) @@ -52,7 +52,7 @@ module DiasporaFederation magic_env = Salmon::MagicEnvelope.new(post, post.author).envelop(sender_key) data = Salmon::EncryptedMagicEnvelope.encrypt(magic_env, recipient_key.public_key) - expect_callback(:receive_entity, kind_of(Entities::StatusMessage), 1234) do |_, entity| + expect_callback(:receive_entity, kind_of(Entities::StatusMessage), post.author, 1234) do |_, entity| expect(entity.guid).to eq(post.guid) expect(entity.author).to eq(post.author) expect(entity.text).to eq(post.text) @@ -68,7 +68,7 @@ module DiasporaFederation data = DiasporaFederation::Salmon::EncryptedSlap.prepare(post.author, sender_key, post) .generate_xml(recipient_key) - expect_callback(:receive_entity, kind_of(Entities::StatusMessage), 1234) do |_, entity| + expect_callback(:receive_entity, kind_of(Entities::StatusMessage), post.author, 1234) do |_, entity| expect(entity.guid).to eq(post.guid) expect(entity.author).to eq(post.author) expect(entity.text).to eq(post.text)