parent
ad7f23556b
commit
33f254be42
7 changed files with 1 additions and 20 deletions
|
@ -323,13 +323,6 @@ class Account < ApplicationRecord
|
|||
user&.setting_translatable_private || (settings.present? && settings['translatable_private']) || false
|
||||
end
|
||||
|
||||
def link_preview?
|
||||
return user.setting_link_preview if local? && user.present?
|
||||
return settings['link_preview'] if settings.present? && settings.key?('link_preview')
|
||||
|
||||
true
|
||||
end
|
||||
|
||||
def public_statuses_count
|
||||
hide_statuses_count? ? 0 : statuses_count
|
||||
end
|
||||
|
@ -406,7 +399,6 @@ class Account < ApplicationRecord
|
|||
'hide_following_count' => hide_following_count?,
|
||||
'hide_followers_count' => hide_followers_count?,
|
||||
'translatable_private' => translatable_private?,
|
||||
'link_preview' => link_preview?,
|
||||
}
|
||||
if Setting.enable_emoji_reaction
|
||||
config = config.merge({
|
||||
|
|
|
@ -123,10 +123,6 @@ module HasUserSettings
|
|||
settings['translatable_private']
|
||||
end
|
||||
|
||||
def setting_link_preview
|
||||
settings['link_preview']
|
||||
end
|
||||
|
||||
def setting_single_ref_to_quote
|
||||
settings['single_ref_to_quote']
|
||||
end
|
||||
|
|
|
@ -13,7 +13,6 @@ class UserSettings
|
|||
setting :noindex, default: -> { ::Setting.noindex }
|
||||
setting :noai, default: true
|
||||
setting :translatable_private, default: false
|
||||
setting :link_preview, default: true
|
||||
setting :bio_markdown, default: false
|
||||
setting :discoverable_local, default: false
|
||||
setting :hide_statuses_count, default: false
|
||||
|
|
|
@ -20,7 +20,7 @@ class FetchLinkCardService < BaseService
|
|||
@status = status
|
||||
@original_url = parse_urls
|
||||
|
||||
return if @original_url.nil? || @status.preview_cards.any? || !@status.account.link_preview?
|
||||
return if @original_url.nil? || @status.preview_cards.any?
|
||||
|
||||
@url = @original_url.to_s
|
||||
|
||||
|
|
|
@ -18,9 +18,6 @@
|
|||
.fields-group
|
||||
= ff.input :translatable_private, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_translatable_private')
|
||||
|
||||
.fields-group
|
||||
= ff.input :link_preview, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_link_preview'), hint: I18n.t('simple_form.hints.defaults.setting_link_preview')
|
||||
|
||||
.fields-group
|
||||
= f.input :dissubscribable, as: :boolean, wrapper: :with_label, kmyblue: true, hint: t('simple_form.hints.defaults.dissubscribable')
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue