Merge pull request #930 from kmycode/upstream-20241203

Upstream 20241203

app/models/concerns/user/has_settings.rb

@@ -131,6 +131,10 @@ module User::HasSettings
     settings['reject_send_limited_to_suspects']
   end
 
+  def setting_system_scrollbars_ui
+    settings['web.use_system_scrollbars']
+  end
+
   def setting_noindex
     settings['noindex']
   end

app/models/list_account.rb

@@ -25,17 +25,16 @@ class ListAccount < ApplicationRecord
   private
 
   def set_follow
-    self.follow = Follow.find_by!(account_id: list.account_id, target_account_id: account.id)
-  rescue ActiveRecord::RecordNotFound
-    self.follow_request = FollowRequest.find_by!(account_id: list.account_id, target_account_id: account.id)
+    self.follow = Follow.find_by(account_id: list.account_id, target_account_id: account.id)
+    self.follow_request = FollowRequest.find_by(account_id: list.account_id, target_account_id: account.id) if follow.nil?
   end
 
   def validate_relationship
-    return if list.account_id == account_id
+    return if list_owner_account_is_account?
 
-    errors.add(:account_id, 'follow relationship missing') if follow_id.nil? && follow_request_id.nil?
-    errors.add(:follow, 'mismatched accounts') if follow_id.present? && follow.target_account_id != account_id
-    errors.add(:follow_request, 'mismatched accounts') if follow_request_id.present? && follow_request.target_account_id != account_id
+    errors.add(:account_id, :must_be_following) if follow_id.nil? && follow_request_id.nil?
+    errors.add(:follow, :invalid) if follow_id.present? && follow.target_account_id != account_id
+    errors.add(:follow_request, :invalid) if follow_request_id.present? && follow_request.target_account_id != account_id
   end
 
   def list_owner_account_is_account?

app/models/relay.rb

@@ -13,7 +13,7 @@
 #
 
 class Relay < ApplicationRecord
-  validates :inbox_url, presence: true, uniqueness: true, url: true, if: :will_save_change_to_inbox_url?
+  validates :inbox_url, presence: true, uniqueness: true, url: true # rubocop:disable Rails/UniqueValidationWithoutIndex
 
   enum :state, { idle: 0, pending: 1, accepted: 2, rejected: 3 }
 

app/models/user_settings.rb

@@ -59,6 +59,7 @@ class UserSettings
     setting :use_custom_css, default: false
     setting :content_font_size, default: 'medium', in: %w(medium large x_large xx_large)
     setting :bookmark_category_needed, default: false
+    setting :use_system_scrollbars, default: false
     setting :disable_swiping, default: false
     setting :disable_hover_cards, default: false
     setting :delete_modal, default: true