Bump capybara from 3.37.1 to 3.39.2

Gemfile

@@ -97,6 +97,7 @@ gem 'webauthn', '~> 3.0.0.alpha1'
 gem 'json-ld'
 gem 'json-ld-preloaded', '~> 3.2'
 gem 'rdf-normalize', '~> 0.5'
+gem 'ruby-bbcode'
 
 group :development, :test do
   gem 'fabrication', '~> 2.28'
@@ -112,7 +113,7 @@ group :production, :test do
 end
 
 group :test do
-  gem 'capybara', '~> 3.37'
+  gem 'capybara', '~> 3.39'
   gem 'climate_control', '~> 0.2'
   gem 'faker', '~> 2.21'
   gem 'microformats', '~> 4.2'

Gemfile.lock

@@ -144,7 +144,7 @@ GEM
       sshkit (~> 1.3)
     capistrano-yarn (2.0.2)
       capistrano (~> 3.0)
-    capybara (3.37.1)
+    capybara (3.39.2)
       addressable
       matrix
       mini_mime (>= 0.1.3)
@@ -394,7 +394,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.0)
+    mini_portile2 (2.8.2)
     minitest (5.15.0)
     msgpack (1.5.1)
     multi_json (1.15.0)
@@ -473,7 +473,7 @@ GEM
     pundit (2.2.0)
       activesupport (>= 3.0.0)
     raabro (1.4.0)
-    racc (1.6.0)
+    racc (1.7.0)
     rack (2.2.3)
     rack-attack (6.6.1)
       rack (>= 1.0, < 3)
@@ -487,8 +487,8 @@ GEM
       rack (>= 2.1.0)
     rack-proxy (0.7.0)
       rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
+    rack-test (2.1.0)
+      rack (>= 1.3)
     rails (6.1.6)
       actioncable (= 6.1.6)
       actionmailbox (= 6.1.6)
@@ -533,7 +533,7 @@ GEM
     redis (4.5.1)
     redis-namespace (1.8.2)
       redis (>= 3.0.4)
-    regexp_parser (2.4.0)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.0.1)
@@ -583,6 +583,8 @@ GEM
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.7.0, < 2.0)
+    ruby-bbcode (2.0.2)
+      activesupport (>= 3.2.3)
     ruby-progressbar (1.11.0)
     ruby-saml (1.13.0)
       nokogiri (>= 1.10.5)
@@ -742,7 +744,7 @@ DEPENDENCIES
   capistrano-rails (~> 1.6)
   capistrano-rbenv (~> 2.2)
   capistrano-yarn (~> 2.0)
-  capybara (~> 3.37)
+  capybara (~> 3.39)
   charlock_holmes (~> 0.7.7)
   chewy (~> 7.2)
   climate_control (~> 0.2)
@@ -822,6 +824,7 @@ DEPENDENCIES
   rspec_junit_formatter (~> 0.5)
   rubocop (~> 1.29)
   rubocop-rails (~> 2.14)
+  ruby-bbcode
   ruby-progressbar (~> 1.11)
   sanitize (~> 6.0)
   scenic (~> 1.6)
@@ -846,3 +849,9 @@ DEPENDENCIES
   webpacker (~> 5.4)
   webpush (~> 0.3)
   xorcist (~> 1.1)
+
+RUBY VERSION
+   ruby 3.0.3p157
+
+BUNDLED WITH
+   2.2.32

app/controllers/api/v1/statuses_controller.rb

@@ -48,6 +48,7 @@ def create
       scheduled_at: status_params[:scheduled_at],
       application: doorkeeper_token.application,
       poll: status_params[:poll],
+      public_in_local: status_params[:public_in_local],
       idempotency: request.headers['Idempotency-Key'],
       with_rate_limit: true
     )
@@ -107,6 +108,7 @@ def status_params
       :in_reply_to_id,
       :sensitive,
       :spoiler_text,
+      :public_in_local,
       :visibility,
       :language,
       :scheduled_at,

app/controllers/application_controller.rb

@@ -14,6 +14,20 @@ class ApplicationController < ActionController::Base
   helper_method :current_account
   helper_method :current_session
   helper_method :current_theme
+  helper_method :current_emoji_size_simple
+  helper_method :current_emoji_size_detailed
+  helper_method :current_emoji_size_name
+  helper_method :current_column_size
+  helper_method :current_bbcode_spin
+  helper_method :current_bbcode_flip
+  helper_method :current_bbcode_size
+  helper_method :current_bbcode_color
+  helper_method :current_bbcode_pulse
+  helper_method :current_bbcode_large
+  helper_method :current_bbcode_i
+  helper_method :current_bbcode_b
+  helper_method :current_bbcode_s
+  helper_method :current_bbcode_u
   helper_method :single_user_mode?
   helper_method :use_seamless_external_login?
   helper_method :whitelist_mode?
@@ -138,6 +152,62 @@ def current_theme
     return Setting.theme unless Themes.instance.names.include? current_user&.setting_theme
     current_user.setting_theme
   end
+
+  def current_emoji_size_simple
+    return current_user&.setting_emoji_size_simple
+  end
+
+  def current_emoji_size_detailed
+    return current_user&.setting_emoji_size_detailed
+  end
+
+  def current_emoji_size_name
+    return current_user&.setting_emoji_size_name
+  end
+
+  def current_column_size
+    return current_user&.setting_column_size
+  end
+
+  def current_bbcode_spin
+    return current_user&.setting_bbcode_spin
+  end
+
+  def current_bbcode_pulse
+    return current_user&.setting_bbcode_pulse
+  end
+
+  def current_bbcode_flip
+    return current_user&.setting_bbcode_flip
+  end
+
+  def current_bbcode_color
+    return current_user&.setting_bbcode_color
+  end
+
+  def current_bbcode_large
+    return current_user&.setting_bbcode_large
+  end
+
+  def current_bbcode_size
+    return current_user&.setting_bbcode_size
+  end
+
+  def current_bbcode_b
+    return current_user&.setting_bbcode_b
+  end
+
+  def current_bbcode_i
+    return current_user&.setting_bbcode_i
+  end
+
+  def current_bbcode_u
+    return current_user&.setting_bbcode_u
+  end
+
+  def current_bbcode_s
+    return current_user&.setting_bbcode_s
+  end
 
   def respond_with_error(code)
     respond_to do |format|

app/controllers/auth/registrations_controller.rb

@@ -22,6 +22,12 @@ def new
     super(&:build_invite_request)
   end
 
+  def create
+    super do |resource|
+      UserSettingsDecorator.new(resource).update(params.require(:user).permit(:setting_advanced_layout).to_h) unless resource.id.nil?
+    end
+  end
+
   def destroy
     not_found
   end

app/controllers/settings/preferences_controller.rb

@@ -55,6 +55,21 @@ def user_settings_params
       :setting_trends,
       :setting_crop_images,
       :setting_always_send_emails,
+      :setting_emoji_size_simple,
+      :setting_emoji_size_detailed,
+      :setting_emoji_size_name,
+      :setting_column_size,
+      :setting_bbcode_spin,
+      :setting_bbcode_pulse,
+      :setting_bbcode_flip,
+      :setting_bbcode_large,
+      :setting_bbcode_size,
+      :setting_bbcode_color,
+      :setting_bbcode_b,
+      :setting_bbcode_i,
+      :setting_bbcode_u,
+      :setting_bbcode_s,
+      :setting_show_cw_box,
       notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag appeal),
       interactions: %i(must_be_follower must_be_following must_be_following_dm)
     )

app/helpers/application_helper.rb

@@ -209,7 +209,7 @@ def render_initial_state
       text: [params[:title], params[:text], params[:url]].compact.join(' '),
     }
 
-    permit_visibilities = %w(public unlisted private direct)
+    permit_visibilities = %w(public local unlisted private direct)
     default_privacy     = current_account&.user&.setting_default_privacy
     permit_visibilities.shift(permit_visibilities.index(default_privacy) + 1) if default_privacy.present?
     state_params[:visibility] = params[:visibility] if permit_visibilities.include? params[:visibility]