Migration: Exporting user blocks

closes #8263

2 files changed, 7 insertions, 2 deletions

diff --git a/app/models/block.rb b/app/models/block.rb
index 147361cac..48254071a 100644
--- a/app/models/block.rb
+++ b/app/models/block.rb
@@ -4,7 +4,7 @@ class Block < ApplicationRecord
   belongs_to :person
   belongs_to :user
 
-  delegate :name, to: :person, prefix: true
+  delegate :name, :diaspora_handle, to: :person, prefix: true
 
   validates :person_id, uniqueness: {scope: :user_id}
 
diff --git a/app/serializers/export/user_serializer.rb b/app/serializers/export/user_serializer.rb
index f1c4db5a3..dcf435b6b 100644
--- a/app/serializers/export/user_serializer.rb
+++ b/app/serializers/export/user_serializer.rb
@@ -10,7 +10,8 @@ module Export
                :show_community_spotlight_in_stream,
                :auto_follow_back,
                :auto_follow_back_aspect,
-               :strip_exif
+               :strip_exif,
+               :blocks
     has_one    :profile, serializer: FederationEntitySerializer
     has_many   :contact_groups, each_serializer: Export::AspectSerializer
     has_many   :contacts, each_serializer: Export::ContactSerializer
@@ -45,6 +46,10 @@ module Export
       }
     end
 
+    def blocks
+      object.blocks.map(&:person_diaspora_handle)
+    end
+
     %i[comments likes poll_participations].each {|collection|
       delegate collection, to: :person
     }