Merge branch 'kb_development' into kb_migration

app/serializers/rest/admin/domain_block_serializer.rb

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

app/serializers/rest/domain_block_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::DomainBlockSerializer < ActiveModel::Serializer
-  attributes :domain, :digest, :severity, :comment
+  attributes :domain, :digest, :severity, :severity_ex, :comment
 
   def domain
     object.public_domain
@@ -11,6 +11,14 @@ class REST::DomainBlockSerializer < ActiveModel::Serializer
     object.domain_digest
   end
 
+  def severity
+    object.severity == 'noop' ? 'silence' : object.severity
+  end
+
+  def severity_ex
+    object.severity
+  end
+
   def comment
     object.public_comment if instance_options[:with_comment]
   end