Merge remote-tracking branch 'origin/kb_development' into kb_migration

app/serializers/activitypub/actor_serializer.rb

@@ -7,13 +7,13 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
   context :security
 
   context_extensions :manually_approves_followers, :featured, :also_known_as,
-                     :moved_to, :property_value, :discoverable, :olm, :suspended
+                     :moved_to, :property_value, :discoverable, :olm, :suspended, :searchable_by
 
   attributes :id, :type, :following, :followers,
              :inbox, :outbox, :featured, :featured_tags,
              :preferred_username, :name, :summary,
              :url, :manually_approves_followers,
-             :discoverable, :published
+             :discoverable, :published, :searchable_by
 
   has_one :public_key, serializer: ActivityPub::PublicKeySerializer
 
@@ -162,6 +162,10 @@ class ActivityPub::ActorSerializer < ActivityPub::Serializer
     object.created_at.midnight.iso8601
   end
 
+  def searchable_by
+    ActivityPub::TagManager.instance.account_searchable_by(object)
+  end
+
   class CustomEmojiSerializer < ActivityPub::EmojiSerializer
   end
 

app/serializers/activitypub/note_serializer.rb

@@ -3,13 +3,13 @@
 class ActivityPub::NoteSerializer < ActivityPub::Serializer
   include FormattingHelper
 
-  context_extensions :atom_uri, :conversation, :sensitive, :voters_count
+  context_extensions :atom_uri, :conversation, :sensitive, :voters_count, :searchable_by
 
   attributes :id, :type, :summary,
              :in_reply_to, :published, :url,
              :attributed_to, :to, :cc, :sensitive,
              :atom_uri, :in_reply_to_atom_uri,
-             :conversation
+             :conversation, :searchable_by
 
   attribute :content
   attribute :content_map, if: :language?
@@ -138,6 +138,10 @@ class ActivityPub::NoteSerializer < ActivityPub::Serializer
     end
   end
 
+  def searchable_by
+    ActivityPub::TagManager.instance.searchable_by(object)
+  end
+
   def local?
     object.account.local?
   end

app/serializers/initial_state_serializer.rb

@@ -69,10 +69,11 @@ class InitialStateSerializer < ActiveModel::Serializer
     store = {}
 
     if object.current_account
-      store[:me]                = object.current_account.id.to_s
-      store[:default_privacy]   = object.visibility || object.current_account.user.setting_default_privacy
-      store[:default_sensitive] = object.current_account.user.setting_default_sensitive
-      store[:default_language]  = object.current_account.user.preferred_posting_language
+      store[:me]                    = object.current_account.id.to_s
+      store[:default_privacy]       = object.visibility || object.current_account.user.setting_default_privacy
+      store[:default_searchability] = object.searchability || object.current_account.user.setting_default_searchability
+      store[:default_sensitive]     = object.current_account.user.setting_default_sensitive
+      store[:default_language]      = object.current_account.user.preferred_posting_language
     end
 
     store[:text] = object.text if object.text

app/serializers/rest/account_serializer.rb

@@ -5,7 +5,7 @@ class REST::AccountSerializer < ActiveModel::Serializer
   include FormattingHelper
 
   attributes :id, :username, :acct, :display_name, :locked, :bot, :discoverable, :group, :created_at,
-             :note, :url, :avatar, :avatar_static, :header, :header_static,
+             :note, :url, :avatar, :avatar_static, :header, :header_static, :searchability,
              :followers_count, :following_count, :statuses_count, :last_status_at
 
   has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested?

app/serializers/rest/instance_serializer.rb

@@ -100,6 +100,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       :visibility_public_unlisted,
       :enable_wide_emoji,
       :enable_wide_emoji_reaction,
+      :searchability,
     ]
 
     capabilities << :profile_search unless Chewy.enabled?

app/serializers/rest/status_serializer.rb

@@ -5,7 +5,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
 
   attributes :id, :created_at, :in_reply_to_id, :in_reply_to_account_id,
              :sensitive, :spoiler_text, :visibility, :language,
-             :uri, :url, :replies_count, :reblogs_count,
+             :uri, :url, :replies_count, :reblogs_count, :searchability,
              :favourites_count, :emoji_reactions, :edited_at
 
   attribute :favourited, if: :current_user?
@@ -61,6 +61,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
     end
   end
 
+  def searchability
+    object.compute_searchability
+  end
+
   def sensitive
     if current_user? && current_user.account_id == object.account_id
       object.sensitive