Merge branch 'kb_development' into kb_migration

app/serializers/activitypub/activity_for_misskey_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class ActivityPub::ActivityForMisskeySerializer < ActivityPub::Serializer
+  def self.serializer_for(model, options)
+    case model.class.name
+    when 'Status'
+      ActivityPub::NoteForMisskeySerializer
+    when 'DeliverToDeviceService::EncryptedMessage'
+      ActivityPub::EncryptedMessageSerializer
+    else
+      super
+    end
+  end
+
+  attributes :id, :type, :actor, :published, :to, :cc
+
+  has_one :virtual_object, key: :object
+
+  def published
+    object.published.iso8601
+  end
+end

app/serializers/activitypub/note_for_misskey_serializer.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class ActivityPub::NoteForMisskeySerializer < ActivityPub::NoteSerializer
+
+  def cc
+    ActivityPub::TagManager.instance.cc_for_misskey(object)
+  end
+
+end

app/serializers/rest/admin/domain_block_serializer.rb

@@ -3,9 +3,9 @@
 class REST::Admin::DomainBlockSerializer < ActiveModel::Serializer
   attributes :id, :domain, :created_at, :severity,
              :reject_media, :reject_favourite, :reject_reply, :reject_reports,
-             :reject_send_not_public_searchability, :reject_send_unlisted_dissubscribable,
+             :reject_send_not_public_searchability,
              :reject_send_public_unlisted, :reject_send_dissubscribable, :reject_send_media, :reject_send_sensitive,
-             :reject_hashtag, :reject_straight_follow, :reject_new_follow,
+             :reject_hashtag, :reject_straight_follow, :reject_new_follow, :detect_invalid_subscription,
              :private_comment, :public_comment, :obfuscate
 
   def id