Add a new preference to always hide all media

app/controllers/settings/preferences_controller.rb

@@ -40,7 +40,7 @@ def user_settings_params
  :setting_boost_modal,
  :setting_delete_modal,
  :setting_auto_play_gif,
- :setting_display_sensitive_media,
+ :setting_display_media,
  :setting_expand_spoilers,
  :setting_reduce_motion,
  :setting_system_font_ui,

app/javascript/mastodon/components/media_gallery.js

@@ -6,7 +6,7 @@ import IconButton from './icon_button';
 import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
 import { isIOS } from '../is_mobile';
 import classNames from 'classnames';
-import { autoPlayGif, displaySensitiveMedia } from '../initial_state';
+import { autoPlayGif, displayMedia } from '../initial_state';
 
 const messages = defineMessages({
  toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: 'Toggle visibility' },
@@ -197,7 +197,7 @@ class MediaGallery extends React.PureComponent {
  };
 
  state = {
- visible: !this.props.sensitive || displaySensitiveMedia,
+ visible: displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all',
  };
 
  componentWillReceiveProps (nextProps) {

app/javascript/mastodon/features/account_gallery/components/media_item.js

@@ -2,7 +2,7 @@ import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import Permalink from '../../../components/permalink';
-import { displaySensitiveMedia } from '../../../initial_state';
+import { displayMedia } from '../../../initial_state';
 
 export default class MediaItem extends ImmutablePureComponent {
 
@@ -11,7 +11,7 @@ export default class MediaItem extends ImmutablePureComponent {
  };
 
  state = {
- visible: !this.props.media.getIn(['status', 'sensitive']) || displaySensitiveMedia,
+ visible: displayMedia !== 'hide_all' && !this.props.media.getIn(['status', 'sensitive']) || displayMedia === 'show_all',
  };
 
  handleClick = () => {

app/javascript/mastodon/features/video/index.js

@@ -5,7 +5,7 @@ import { fromJS } from 'immutable';
 import { throttle } from 'lodash';
 import classNames from 'classnames';
 import { isFullscreen, requestFullscreen, exitFullscreen } from '../ui/util/fullscreen';
-import { displaySensitiveMedia } from '../../initial_state';
+import { displayMedia } from '../../initial_state';
 
 const messages = defineMessages({
  play: { id: 'video.play', defaultMessage: 'Play' },
@@ -111,7 +111,7 @@ class Video extends React.PureComponent {
  fullscreen: false,
  hovered: false,
  muted: false,
- revealed: !this.props.sensitive || displaySensitiveMedia,
+ revealed: displayMedia !== 'hide_all' && !this.props.sensitive || displayMedia === 'show_all',
  };
 
  setPlayerRef = c => {
@@ -272,7 +272,7 @@ class Video extends React.PureComponent {
  }
 
  render () {
- const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed } = this.props;
+ const { preview, src, inline, startTime, onOpenVideo, onCloseVideo, intl, alt, detailed, sensitive } = this.props;
  const { containerWidth, currentTime, duration, buffer, dragging, paused, fullscreen, hovered, muted, revealed } = this.state;
  const progress = (currentTime / duration) * 100;
  const playerStyle = {};
@@ -296,6 +296,13 @@ class Video extends React.PureComponent {
  preload = 'none';
  }
 
+ let warning;
+ if (sensitive) {
+ warning = <FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' />;
+ } else {
+ warning = <FormattedMessage id='status.media_hidden' defaultMessage='Media hidden' />;
+ }
+
  return (
  <div
  role='menuitem'
@@ -328,7 +335,7 @@ class Video extends React.PureComponent {
  />
 
  <button type='button' className={classNames('video-player__spoiler', { active: !revealed })} onClick={this.toggleReveal}>
- <span className='video-player__spoiler__title'><FormattedMessage id='status.sensitive_warning' defaultMessage='Sensitive content' /></span>
+ <span className='video-player__spoiler__title'>{warning}</span>
  <span className='video-player__spoiler__subtitle'><FormattedMessage id='status.sensitive_toggle' defaultMessage='Click to view' /></span>
  </button>
 

app/javascript/mastodon/initial_state.js

@@ -5,7 +5,7 @@ const getMeta = (prop) => initialState && initialState.meta && initialState.meta
 
 export const reduceMotion = getMeta('reduce_motion');
 export const autoPlayGif = getMeta('auto_play_gif');
-export const displaySensitiveMedia = getMeta('display_sensitive_media');
+export const displayMedia = getMeta('display_media');
 export const expandSpoilers = getMeta('expand_spoilers');
 export const unfollowModal = getMeta('unfollow_modal');
 export const boostModal = getMeta('boost_modal');

app/lib/user_settings_decorator.rb

@@ -15,22 +15,22 @@ def update(settings)
  private
 
  def process_update
- user.settings['notification_emails']  = merged_notification_emails if change?('notification_emails')
- user.settings['interactions']  = merged_interactions if change?('interactions')
- user.settings['default_privacy']  = default_privacy_preference if change?('setting_default_privacy')
- user.settings['default_sensitive']  = default_sensitive_preference if change?('setting_default_sensitive')
- user.settings['default_language']  = default_language_preference if change?('setting_default_language')
- user.settings['unfollow_modal']  = unfollow_modal_preference if change?('setting_unfollow_modal')
- user.settings['boost_modal']  = boost_modal_preference if change?('setting_boost_modal')
- user.settings['delete_modal']  = delete_modal_preference if change?('setting_delete_modal')
- user.settings['auto_play_gif']  = auto_play_gif_preference if change?('setting_auto_play_gif')
- user.settings['display_sensitive_media'] = display_sensitive_media_preference if change?('setting_display_sensitive_media')
- user.settings['expand_spoilers']  = expand_spoilers_preference if change?('setting_expand_spoilers')
- user.settings['reduce_motion']  = reduce_motion_preference if change?('setting_reduce_motion')
- user.settings['system_font_ui']  = system_font_ui_preference if change?('setting_system_font_ui')
- user.settings['noindex']  = noindex_preference if change?('setting_noindex')
- user.settings['theme']  = theme_preference if change?('setting_theme')
- user.settings['hide_network']  = hide_network_preference if change?('setting_hide_network')
+ user.settings['notification_emails'] = merged_notification_emails if change?('notification_emails')
+ user.settings['interactions'] = merged_interactions if change?('interactions')
+ user.settings['default_privacy'] = default_privacy_preference if change?('setting_default_privacy')
+ user.settings['default_sensitive'] = default_sensitive_preference if change?('setting_default_sensitive')
+ user.settings['default_language'] = default_language_preference if change?('setting_default_language')
+ user.settings['unfollow_modal'] = unfollow_modal_preference if change?('setting_unfollow_modal')
+ user.settings['boost_modal'] = boost_modal_preference if change?('setting_boost_modal')
+ user.settings['delete_modal'] = delete_modal_preference if change?('setting_delete_modal')
+ user.settings['auto_play_gif'] = auto_play_gif_preference if change?('setting_auto_play_gif')
+ user.settings['display_media']  = display_media_preference if change?('setting_display_media')
+ user.settings['expand_spoilers'] = expand_spoilers_preference if change?('setting_expand_spoilers')
+ user.settings['reduce_motion'] = reduce_motion_preference if change?('setting_reduce_motion')
+ user.settings['system_font_ui'] = system_font_ui_preference if change?('setting_system_font_ui')
+ user.settings['noindex'] = noindex_preference if change?('setting_noindex')
+ user.settings['theme'] = theme_preference if change?('setting_theme')
+ user.settings['hide_network'] = hide_network_preference if change?('setting_hide_network')
  end
 
  def merged_notification_emails
@@ -69,8 +69,8 @@ def auto_play_gif_preference
  boolean_cast_setting 'setting_auto_play_gif'
  end
 
- def display_sensitive_media_preference
- boolean_cast_setting 'setting_display_sensitive_media'
+ def display_media_preference
+ settings['setting_display_media']
  end
 
  def expand_spoilers_preference

app/models/user.rb

@@ -95,7 +95,7 @@ class User < ApplicationRecord
  has_many :session_activations, dependent: :destroy
 
  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
- :reduce_motion, :system_font_ui, :noindex, :theme, :display_sensitive_media, :hide_network,
+ :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
  :expand_spoilers, :default_language, to: :settings, prefix: :setting, allow_nil: false
 
  attr_reader :invite_code
@@ -316,6 +316,14 @@ def self.authenticate_with_pam(attributes = {})
  super
  end
 
+ def show_all_media?
+ setting_display_media == 'show_all'
+ end
+
+ def hide_all_media?
+ setting_display_media == 'hide_all'
+ end
+
  protected
 
  def send_devise_notification(notification, *args)

app/serializers/initial_state_serializer.rb

@@ -19,14 +19,14 @@ def meta
  }
 
  if object.current_account
- store[:me]  = object.current_account.id.to_s
- store[:unfollow_modal]  = object.current_account.user.setting_unfollow_modal
- store[:boost_modal]  = object.current_account.user.setting_boost_modal
- store[:delete_modal]  = object.current_account.user.setting_delete_modal
- store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
- store[:display_sensitive_media] = object.current_account.user.setting_display_sensitive_media
- store[:expand_spoilers]  = object.current_account.user.setting_expand_spoilers
- store[:reduce_motion]  = object.current_account.user.setting_reduce_motion
+ store[:me] = object.current_account.id.to_s
+ store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
+ store[:boost_modal] = object.current_account.user.setting_boost_modal
+ store[:delete_modal] = object.current_account.user.setting_delete_modal
+ store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif
+ store[:display_media] = object.current_account.user.setting_display_media
+ store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers
+ store[:reduce_motion] = object.current_account.user.setting_reduce_motion
  end
 
  store

app/views/settings/preferences/show.html.haml

@@ -47,7 +47,7 @@
 
  .fields-group
  = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
- = f.input :setting_display_sensitive_media, as: :boolean, wrapper: :with_label
+ = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_display_media_#{item}"), content_tag(:span, t("simple_form.hints.defaults.setting_display_media_#{item}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
  = f.input :setting_expand_spoilers, as: :boolean, wrapper: :with_label
  = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
  = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label

app/views/stream_entries/_detailed_status.html.haml

@@ -24,9 +24,9 @@
  - if !status.media_attachments.empty?
  - if status.media_attachments.first.video?
  - video = status.media_attachments.first
- = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 670, height: 380, detailed: true, inline: true, alt: video.description
+ = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 670, height: 380, detailed: true, inline: true, alt: video.description
  - else
- = react_component :media_gallery, height: 380, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+ = react_component :media_gallery, height: 380, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, 'reduceMotion': current_account&.user&.setting_reduce_motion, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
  - elsif status.preview_cards.first
  = react_component :card, 'maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json
 

app/views/stream_entries/_simple_status.html.haml

@@ -27,9 +27,9 @@
  - unless status.media_attachments.empty?
  - if status.media_attachments.first.video?
  - video = status.media_attachments.first
- = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, width: 610, height: 343, inline: true, alt: video.description
+ = react_component :video, src: video.file.url(:original), preview: video.file.url(:small), sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, width: 610, height: 343, inline: true, alt: video.description
  - else
- = react_component :media_gallery, height: 343, sensitive: status.sensitive? && !current_account&.user&.setting_display_sensitive_media, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
+ = react_component :media_gallery, height: 343, sensitive: !current_account&.user&.show_all_media? && status.sensitive? || current_account&.user&.hide_all_media?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif || autoplay, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }
 
  .status__action-bar
  .status__action-bar__counter

config/locales/simple_form.en.yml

@@ -25,6 +25,9 @@ en:
  phrase: Will be matched regardless of casing in text or content warning of a toot
  scopes: Which APIs the application will be allowed to access. If you select a top-level scope, you don't need to select individual ones.
  setting_default_language: The language of your toots can be detected automatically, but it's not always accurate
+ setting_display_media_default: Hide media marked as sensitive
+ setting_display_media_hide_all: Always hide all media
+ setting_display_media_show_all: Always show media marked as sensitive
  setting_hide_network: Who you follow and who follows you will not be shown on your profile
  setting_noindex: Affects your public profile and status pages
  setting_theme: Affects how Mastodon looks when you're logged in from any device.
@@ -72,7 +75,10 @@ en:
  setting_default_privacy: Post privacy
  setting_default_sensitive: Always mark media as sensitive
  setting_delete_modal: Show confirmation dialog before deleting a toot
- setting_display_sensitive_media: Always show media marked as sensitive
+ setting_display_media: Media display
+ setting_display_media_default: Default
+ setting_display_media_hide_all: Hide all
+ setting_display_media_show_all: Show all
  setting_expand_spoilers: Always expand toots marked with content warnings
  setting_hide_network: Hide your network
  setting_noindex: Opt-out of search engine indexing

config/locales/simple_form.ja.yml

@@ -19,6 +19,9 @@ ja:
  phrase: トゥートの大文字小文字や閲覧注意に関係なく一致
  scopes: アプリの API に許可するアクセス権を選択してください。最上位のスコープを選択する場合、個々のスコープを選択する必要はありません。
  setting_default_language: トゥートの言語は自動的に検出されますが、必ずしも正確とは限りません
+ setting_display_media_default: 閲覧注意としてマークされたメディアは隠す
+ setting_display_media_hide_all: 全てのメディアを常に隠す
+ setting_display_media_show_all: 閲覧注意としてマークされたメディアも常に表示する
  setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします
  setting_noindex: 公開プロフィールおよび各投稿ページに影響します
  setting_theme: ログインしている全てのデバイスで適用されるデザインです。
@@ -65,7 +68,10 @@ ja:
  setting_default_privacy: 投稿の公開範囲
  setting_default_sensitive: メディアを常に閲覧注意としてマークする
  setting_delete_modal: トゥートを削除する前に確認ダイアログを表示する
- setting_display_sensitive_media: 閲覧注意としてマークされたメディアも常に表示する
+ setting_display_media: メディアの表示
+ setting_display_media_default: 標準
+ setting_display_media_hide_all: 非表示
+ setting_display_media_show_all: 表示
  setting_hide_network: 繋がりを隠す
  setting_noindex: 検索エンジンによるインデックスを拒否する
  setting_reduce_motion: アニメーションの動きを減らす

config/settings.yml

@@ -26,7 +26,7 @@ defaults: &defaults
  boost_modal: false
  delete_modal: true
  auto_play_gif: false
- display_sensitive_media: false
+ display_media: 'default'
  expand_spoilers: false
  preview_sensitive_media: false
  reduce_motion: false