Add link_preview setting
This commit is contained in:
parent
621a41b670
commit
bd87415996
7 changed files with 19 additions and 1 deletions
|
@ -323,6 +323,13 @@ class Account < ApplicationRecord
|
||||||
user&.setting_translatable_private || (settings.present? && settings['translatable_private']) || false
|
user&.setting_translatable_private || (settings.present? && settings['translatable_private']) || false
|
||||||
end
|
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
|
def public_statuses_count
|
||||||
hide_statuses_count? ? 0 : statuses_count
|
hide_statuses_count? ? 0 : statuses_count
|
||||||
end
|
end
|
||||||
|
@ -389,6 +396,7 @@ class Account < ApplicationRecord
|
||||||
'hide_following_count' => hide_following_count?,
|
'hide_following_count' => hide_following_count?,
|
||||||
'hide_followers_count' => hide_followers_count?,
|
'hide_followers_count' => hide_followers_count?,
|
||||||
'translatable_private' => translatable_private?,
|
'translatable_private' => translatable_private?,
|
||||||
|
'link_preview' => link_preview?,
|
||||||
}
|
}
|
||||||
if Setting.enable_block_emoji_reaction_settings
|
if Setting.enable_block_emoji_reaction_settings
|
||||||
config = config.merge({
|
config = config.merge({
|
||||||
|
|
|
@ -103,6 +103,10 @@ module HasUserSettings
|
||||||
settings['translatable_private']
|
settings['translatable_private']
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def setting_link_preview
|
||||||
|
settings['link_preview']
|
||||||
|
end
|
||||||
|
|
||||||
def setting_hide_statuses_count
|
def setting_hide_statuses_count
|
||||||
settings['hide_statuses_count']
|
settings['hide_statuses_count']
|
||||||
end
|
end
|
||||||
|
|
|
@ -13,6 +13,7 @@ class UserSettings
|
||||||
setting :noindex, default: -> { ::Setting.noindex }
|
setting :noindex, default: -> { ::Setting.noindex }
|
||||||
setting :noai, default: true
|
setting :noai, default: true
|
||||||
setting :translatable_private, default: false
|
setting :translatable_private, default: false
|
||||||
|
setting :link_preview, default: true
|
||||||
setting :bio_markdown, default: false
|
setting :bio_markdown, default: false
|
||||||
setting :discoverable_local, default: false
|
setting :discoverable_local, default: false
|
||||||
setting :hide_statuses_count, default: false
|
setting :hide_statuses_count, default: false
|
||||||
|
|
|
@ -20,7 +20,7 @@ class FetchLinkCardService < BaseService
|
||||||
@status = status
|
@status = status
|
||||||
@original_url = parse_urls
|
@original_url = parse_urls
|
||||||
|
|
||||||
return if @original_url.nil? || @status.preview_cards.any?
|
return if @original_url.nil? || @status.preview_cards.any? || !@status.account.link_preview?
|
||||||
|
|
||||||
@url = @original_url.to_s
|
@url = @original_url.to_s
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,9 @@
|
||||||
.fields-group
|
.fields-group
|
||||||
= ff.input :translatable_private, wrapper: :with_label, kmyblue: true, label: I18n.t('simple_form.labels.defaults.setting_translatable_private')
|
= 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')
|
||||||
|
|
||||||
%h4= t 'preferences.posting_defaults'
|
%h4= t 'preferences.posting_defaults'
|
||||||
|
|
||||||
.fields-row
|
.fields-row
|
||||||
|
|
|
@ -242,6 +242,7 @@ en:
|
||||||
setting_hide_network: Hide your social graph
|
setting_hide_network: Hide your social graph
|
||||||
setting_hide_recent_emojis: Hide recent emojis
|
setting_hide_recent_emojis: Hide recent emojis
|
||||||
setting_hide_statuses_count: Hide statuses count
|
setting_hide_statuses_count: Hide statuses count
|
||||||
|
setting_link_preview: Generate post link preview card
|
||||||
setting_noai: Set noai meta tags
|
setting_noai: Set noai meta tags
|
||||||
setting_public_post_to_unlisted: Convert public post to public unlisted if not using Web app
|
setting_public_post_to_unlisted: Convert public post to public unlisted if not using Web app
|
||||||
setting_reduce_motion: Reduce motion in animations
|
setting_reduce_motion: Reduce motion in animations
|
||||||
|
|
|
@ -251,6 +251,7 @@ ja:
|
||||||
setting_hide_network: 繋がりを隠す
|
setting_hide_network: 繋がりを隠す
|
||||||
setting_hide_recent_emojis: 絵文字ピッカーで最近使用した絵文字を隠す(リアクションデッキのみを表示する)
|
setting_hide_recent_emojis: 絵文字ピッカーで最近使用した絵文字を隠す(リアクションデッキのみを表示する)
|
||||||
setting_hide_statuses_count: 投稿数を隠す
|
setting_hide_statuses_count: 投稿数を隠す
|
||||||
|
setting_link_preview: リンクのプレビューを生成する
|
||||||
setting_stay_privacy: 投稿時に公開範囲を保存する
|
setting_stay_privacy: 投稿時に公開範囲を保存する
|
||||||
setting_noai: 自分のコンテンツのAI学習利用に対して不快感を表明する
|
setting_noai: 自分のコンテンツのAI学習利用に対して不快感を表明する
|
||||||
setting_public_post_to_unlisted: サードパーティから公開範囲「公開」で投稿した場合、「ローカル公開」に変更する
|
setting_public_post_to_unlisted: サードパーティから公開範囲「公開」で投稿した場合、「ローカル公開」に変更する
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue