参照１つの場合は引用に変換する設定を削除

kmycode · Oct 1, 2023 · 9f0f247 · 9f0f247
1 parent 2d909dc
commit 9f0f247
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/app/models/concerns/has_user_settings.rb b/app/models/concerns/has_user_settings.rb
@@ -139,10 +139,6 @@ def setting_link_preview
     settings['link_preview']
   end
 
-  def setting_single_ref_to_quote
-    settings['single_ref_to_quote']
-  end
-
   def setting_dtl_force_with_tag
     settings['dtl_force_with_tag']&.to_sym || :none
   end

diff --git a/app/models/user_settings.rb b/app/models/user_settings.rb
@@ -41,7 +41,6 @@ class KeyError < Error; end
   setting :dtl_force_with_tag, default: :none, in: %w(full searchability none)
   setting :dtl_force_subscribable, default: false
   setting :lock_follow_from_bot, default: false
-  setting :single_ref_to_quote, default: false
   setting :allow_quote, default: true
 
   setting_inverse_alias :indexable, :noindex

diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb
@@ -170,12 +170,10 @@ def local?
     object.account.local?
   end
 
-  def quote?
-    @quote ||= (object.reference_objects.count == 1 && object.account.user&.settings&.[]('single_ref_to_quote')) || object.reference_objects.where(attribute_type: 'QT').count == 1
-  end
+  delegate :quote?, to: :object
 
   def quote_post
-    @quote_post ||= object.quote || object.references.first
+    @quote_post ||= object.quote
   end
 
   def quote_uri

diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
@@ -14,9 +14,6 @@
     .fields-group
       = ff.input :lock_follow_from_bot, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_lock_follow_from_bot')
 
-    .fields-group
-      = ff.input :single_ref_to_quote, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_single_ref_to_quote'), hint: I18n.t('simple_form.hints.defaults.setting_single_ref_to_quote')
-
     %h4= t 'preferences.posting_defaults'
 
     .fields-row