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

app/models/concerns/has_user_settings.rb

@@ -59,6 +59,10 @@ module HasUserSettings
     settings['web.display_media']
   end
 
+  def setting_display_media_expand
+    settings['web.display_media_expand']
+  end
+
   def setting_expand_spoilers
     settings['web.expand_content_warnings']
   end

app/models/media_attachment.rb

@@ -35,6 +35,9 @@ class MediaAttachment < ApplicationRecord
   include Attachmentable
   include RoutingHelper
 
+  LOCAL_STATUS_ATTACHMENT_MAX = 4
+  ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 8
+
   enum type: { :image => 0, :gifv => 1, :video => 2, :unknown => 3, :audio => 4 }
   enum processing: { :queued => 0, :in_progress => 1, :complete => 2, :failed => 3 }, _prefix: true
 

app/models/user_settings.rb

@@ -31,6 +31,7 @@ class UserSettings
     setting :reduce_motion, default: false
     setting :expand_content_warnings, default: false
     setting :display_media, default: 'default', in: %w(default show_all hide_all)
+    setting :display_media_expand, default: false
     setting :auto_play, default: false
   end