Add admin setting to enable OG previews for sensitive media (#7962)

master
Eugen Rochko 7 years ago committed by GitHub
parent 404c7702ec
commit f89c595ea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      app/controllers/admin/settings_controller.rb
  2. 2
      app/models/form/admin_settings.rb
  3. 6
      app/views/admin/settings/edit.html.haml
  4. 2
      app/views/stream_entries/_og_image.html.haml
  5. 3
      config/locales/en.yml
  6. 1
      config/settings.yml

@ -21,6 +21,7 @@ module Admin
activity_api_enabled activity_api_enabled
peers_api_enabled peers_api_enabled
show_known_fediverse_at_about_page show_known_fediverse_at_about_page
preview_sensitive_media
).freeze ).freeze
BOOLEAN_SETTINGS = %w( BOOLEAN_SETTINGS = %w(
@ -31,6 +32,7 @@ module Admin
activity_api_enabled activity_api_enabled
peers_api_enabled peers_api_enabled
show_known_fediverse_at_about_page show_known_fediverse_at_about_page
preview_sensitive_media
).freeze ).freeze
UPLOAD_SETTINGS = %w( UPLOAD_SETTINGS = %w(

@ -36,6 +36,8 @@ class Form::AdminSettings
:peers_api_enabled=, :peers_api_enabled=,
:show_known_fediverse_at_about_page, :show_known_fediverse_at_about_page,
:show_known_fediverse_at_about_page=, :show_known_fediverse_at_about_page=,
:preview_sensitive_media,
:preview_sensitive_media=,
to: Setting to: Setting
) )
end end

@ -2,6 +2,9 @@
= t('admin.settings.title') = t('admin.settings.title')
= simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f| = simple_form_for @admin_settings, url: admin_settings_path, html: { method: :patch } do |f|
.actions.actions--top
= f.button :button, t('generic.save_changes'), type: :submit
.fields-group .fields-group
= f.input :site_title, placeholder: t('admin.settings.site_title') = f.input :site_title, placeholder: t('admin.settings.site_title')
= f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 } = f.input :site_description, wrapper: :with_block_label, as: :text, label: t('admin.settings.site_description.title'), hint: t('admin.settings.site_description.desc_html'), input_html: { rows: 8 }
@ -58,5 +61,8 @@
.fields-group .fields-group
= f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html') = f.input :peers_api_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.peers_api_enabled.title'), hint: t('admin.settings.peers_api_enabled.desc_html')
.fields-group
= f.input :preview_sensitive_media, as: :boolean, wrapper: :with_label, label: t('admin.settings.preview_sensitive_media.title'), hint: t('admin.settings.preview_sensitive_media.desc_html')
.actions .actions
= f.button :button, t('generic.save_changes'), type: :submit = f.button :button, t('generic.save_changes'), type: :submit

@ -1,4 +1,4 @@
- if activity.is_a?(Status) && activity.non_sensitive_with_media? - if activity.is_a?(Status) && (activity.non_sensitive_with_media? || (activity.with_media? && Setting.preview_sensitive_media))
- player_card = false - player_card = false
- activity.media_attachments.each do |media| - activity.media_attachments.each do |media|
- if media.image? - if media.image?

@ -316,6 +316,9 @@ en:
peers_api_enabled: peers_api_enabled:
desc_html: Domain names this instance has encountered in the fediverse desc_html: Domain names this instance has encountered in the fediverse
title: Publish list of discovered instances title: Publish list of discovered instances
preview_sensitive_media:
desc_html: Link previews on other websites will display a thumbnail even if the media is marked as sensitive
title: Show sensitive media in OpenGraph previews
registrations: registrations:
closed_message: closed_message:
desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags desc_html: Displayed on frontpage when registrations are closed. You can use HTML tags

@ -26,6 +26,7 @@ defaults: &defaults
delete_modal: true delete_modal: true
auto_play_gif: false auto_play_gif: false
display_sensitive_media: false display_sensitive_media: false
preview_sensitive_media: false
reduce_motion: false reduce_motion: false
system_font_ui: false system_font_ui: false
noindex: false noindex: false

Loading…
Cancel
Save