Merge 290f6d428d into 8b34daf254

Additionally, add `configuration.closed_federation` to indicate whether the
server has switched to limited federation.

Also sets `usage.users.active_month` to `0` in limited federation mode.

app/controllers/api/v2/instances_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Api::V2::InstancesController < Api::BaseController
-  skip_before_action :require_authenticated_user!, unless: :limited_federation_mode?
+  skip_before_action :require_authenticated_user!
   skip_around_action :set_locale
 
   vary_by ''

app/lib/activitypub/parser/status_parser.rb

@@ -95,11 +95,11 @@ class ActivityPub::Parser::StatusParser
   end
 
   def favourites_count
-    @object.dig(:likes, :totalItems)
+    @object.dig('likes', 'totalItems')
   end
 
   def reblogs_count
-    @object.dig(:shares, :totalItems)
+    @object.dig('shares', 'totalItems')
   end
 
   def quote_policy

app/serializers/rest/instance_serializer.rb

@@ -49,7 +49,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
   def usage
     {
       users: {
-        active_month: object.active_user_count(4),
+        active_month: limited_federation? ? 0 : object.active_user_count(4),
       },
     }
   end
@@ -99,6 +99,8 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       translation: {
         enabled: TranslationService.configured?,
       },
+
+      closed_federation: limited_federation?,
     }
   end
 
@@ -127,6 +129,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
     markdown.render(Setting.closed_registrations_message) if Setting.closed_registrations_message.present?
   end
 
+  def limited_federation?
+    Rails.configuration.x.limited_federation_mode
+  end
+
   def markdown
     @markdown ||= Redcarpet::Markdown.new(Redcarpet::Render::HTML, no_images: true)
   end