Merge remote-tracking branch 'parent/main' into kbtopic-remove-quote

app/serializers/initial_state_serializer.rb

@@ -26,7 +26,7 @@ class InitialStateSerializer < ActiveModel::Serializer
       store[:display_media]     = object_account_user.setting_display_media
       store[:expand_spoilers] = object_account_user.setting_expand_spoilers
       store[:enable_emoji_reaction] = object_account_user.setting_enable_emoji_reaction && Setting.enable_emoji_reaction
-      store[:enable_dtl_menu]   = object_account_user.setting_enable_dtl_menu
+      store[:enable_dtl_menu]   = object_account_user.setting_enable_dtl_menu && dtl_enabled?
       store[:reduce_motion]     = object_account_user.setting_reduce_motion
       store[:disable_swiping]   = object_account_user.setting_disable_swiping
       store[:disable_hover_cards] = object_account_user.setting_disable_hover_cards

app/serializers/rest/application_serializer.rb

@@ -18,6 +18,6 @@ class REST::ApplicationSerializer < ActiveModel::Serializer
   end
 
   def vapid_key
-    Rails.configuration.x.vapid_public_key
+    Rails.configuration.x.vapid.public_key
   end
 end

app/serializers/rest/instance_serializer.rb

@@ -67,7 +67,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
       },
 
       vapid: {
-        public_key: Rails.configuration.x.vapid_public_key,
+        public_key: Rails.configuration.x.vapid.public_key,
       },
 
       accounts: {

app/serializers/rest/status_serializer.rb

@@ -37,6 +37,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
   has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
   has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
 
+  def quote
+    object.quote if object.quote&.acceptable?
+  end
+
   def id
     object.id.to_s
   end

app/serializers/rest/web_push_subscription_serializer.rb

@@ -10,7 +10,7 @@ class REST::WebPushSubscriptionSerializer < ActiveModel::Serializer
   end
 
   def server_key
-    Rails.configuration.x.vapid_public_key
+    Rails.configuration.x.vapid.public_key
   end
 
   def policy