Fetch only non blocked pesons

diaspora · Jun 15, 2021 · e14f182 · e14f182
1 parent dc4483a
commit e14f182
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/Gemfile b/Gemfile
@@ -251,7 +251,9 @@ group :development do
   gem "rubocop",        "0.93.1", require: false
   gem "rubocop-rails",  "2.9.1", require: false
 
-
+  # Debugging
+  gem "pry"
+  gem "pry-byebug"
 
   # test coverage
   gem "simplecov", "0.21.2", require: false
@@ -303,8 +305,4 @@ group :development, :test do
 
   # For `assigns` in controller specs
   gem "rails-controller-testing", "1.0.4"
-
-    # Debugging
-  gem "pry"
-  gem "pry-byebug"
 end
diff --git a/config/initializers/diaspora_federation.rb b/config/initializers/diaspora_federation.rb
@@ -15,7 +15,7 @@
   config.define_callbacks do
     on :fetch_person_for_webfinger do |diaspora_id|
       person = Person.where(diaspora_handle: diaspora_id, closed_account: false).where.not(owner: nil).first
-      if person
+      unless person.nil? || person.closed_account?
         DiasporaFederation::Discovery::WebFinger.new(
           {
             acct_uri:      "acct:#{person.diaspora_handle}",
@@ -39,7 +39,7 @@
 
     on :fetch_person_for_hcard do |guid|
       person = Person.where(guid: guid, closed_account: false).where.not(owner: nil).take
-      if person
+      unless person.nil? || person.closed_account?
         DiasporaFederation::Discovery::HCard.new(
           guid:             person.guid,
           nickname:         person.username,
@@ -111,13 +111,15 @@
       when DiasporaFederation::Entities::Retraction
         Diaspora::Federation::Receive.retraction(entity, recipient_id)
       else
+        # TODO: Check for person.closed_account? when merging with #8228 'Block Pod'
         persisted = Diaspora::Federation::Receive.perform(entity)
         Workers::ReceiveLocal.perform_async(persisted.class.to_s, persisted.id, [recipient_id].compact) if persisted
       end
     end
 
     on :fetch_public_entity do |entity_type, guid|
       entity = Diaspora::Federation::Mappings.model_class_for(entity_type).all_public.find_by(guid: guid)
+      # TODO: Check for person.closed_account? when merging with #8228 'Block Pod'
       case entity
       when Post
         Diaspora::Federation::Entities.post(entity)

diff --git a/spec/federation_callbacks_spec.rb b/spec/federation_callbacks_spec.rb
@@ -364,7 +364,6 @@
     it "receives a entity" do
       received = Fabricate(:status_message_entity, author: remote_person.diaspora_handle)
       persisted = FactoryBot.create(:status_message)
-      byebug
       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, [])