Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
	app/lib/user_settings_decorator.rb
	app/models/user.rb
	app/serializers/initial_state_serializer.rb
	app/views/stream_entries/_simple_status.html.haml
	config/locales/simple_form.en.yml
	config/locales/simple_form.ja.yml
	config/locales/simple_form.pl.yml
	config/routes.rb

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index e4e1c69df5475f4d776787a4349b410ab7dad183,0e486cb07f3c18dc2d1c6e191f27c007fcc86415..44fa27fe2f59125878ada2f4949411fb0fa3ca69
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -252,10 -255,8 +255,10 @@@ GE
      heapy (0.1.3)
      highline (1.7.10)
      hiredis (0.6.1)
-     hitimes (1.2.6)
+     hitimes (1.3.0)
      hkdf (0.3.0)
 +    html2text (0.2.1)
 +      nokogiri (~> 1.6)
      htmlentities (4.3.4)
      http (3.2.0)
        addressable (~> 2.3)

diff --cc app/controllers/api/v1/notifications_controller.rb
Simple merge

diff --cc app/controllers/settings/preferences_controller.rb
index d60e6a89f9c38755c0177438b812390b51e78890,b83900f07d4110e6de5e76450a2e84ab52ee8696..5c5f31d2bbf72497e6da6a279cb680cfea3e1438
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -34,10 -38,10 +34,11 @@@ class Settings::PreferencesController 
        :setting_default_language,
        :setting_unfollow_modal,
        :setting_boost_modal,
 +      :setting_favourite_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,
        :setting_noindex,

diff --cc app/helpers/application_helper.rb
Simple merge

diff --cc app/javascript/mastodon/initial_state.js
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/lib/user_settings_decorator.rb
index 4bedfd680598d6043930d5ff8ed8ba5830eb4bf0,40973c7079c83cc412f6b778329e5f462f6dfbbe..e5b1685027fd85416f4bb217d2cafd85ecfcbc12
--- 1/app/lib/user_settings_decorator.rb
--- 2/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@@ -15,23 -15,22 +15,24 @@@ class UserSettingsDecorato
    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['favourite_modal']         = favourite_modal_preference if change?('setting_favourite_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['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['flavour']                 = flavour_preference if change?('setting_flavour')
-     user.settings['skin']                    = skin_preference if change?('setting_skin')
-     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['favourite_modal']     = favourite_modal_preference if change?('setting_favourite_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['flavour']             = flavour_preference if change?('setting_flavour')
++    user.settings['skin']                = skin_preference if change?('setting_skin')
+     user.settings['hide_network']        = hide_network_preference if change?('setting_hide_network')
    end
  
    def merged_notification_emails
@@@ -57,11 -56,7 +58,11 @@@
    def boost_modal_preference
      boolean_cast_setting 'setting_boost_modal'
    end
-   
+ 
 +  def favourite_modal_preference
 +    boolean_cast_setting 'setting_favourite_modal'
 +  end
 +
    def delete_modal_preference
      boolean_cast_setting 'setting_delete_modal'
    end

diff --cc app/models/user.rb
index 6022a5eb0c16fe8c22f0ce6716d93bf9116bf6d1,69fa0688a301baf0d51cc85ae82d927f2793e44f..b9e18eecd1896af01514559acb233690af5e7e8a
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -94,9 -94,9 +94,9 @@@ class User < ApplicationRecor
  
    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_media, :hide_network,
 +  delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :favourite_modal, :delete_modal,
-            :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_sensitive_media, :hide_network,
-            :default_language, to: :settings, prefix: :setting, allow_nil: false
++           :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network,
+            :expand_spoilers, :default_language, to: :settings, prefix: :setting, allow_nil: false
  
    attr_reader :invite_code
  

diff --cc app/serializers/initial_state_serializer.rb
index 0845d0210531306eb12ff3c042da4dd4c7dff689,cdc47083122ac8543fd25097afe673e0205d8dc3..ac08a3f1e7831346e9beaa29b56d764fefae9a2c
--- 1/app/serializers/initial_state_serializer.rb
--- 2/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@@ -24,15 -19,14 +24,16 @@@ class InitialStateSerializer < ActiveMo
      }
  
      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[:favourite_modal]         = object.current_account.user.setting_favourite_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[:reduce_motion]           = object.current_account.user.setting_reduce_motion
-       store[:is_staff]                = object.current_account.user.staff?
+       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[:favourite_modal] = object.current_account.user.setting_favourite_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
++      store[:is_staff]        = object.current_account.user.staff?
      end
  
      store

diff --cc app/views/settings/preferences/show.html.haml
Simple merge

diff --cc app/views/stream_entries/_simple_status.html.haml
index 4484a7e6204f5f722d70863365290fabea9139da,7401f82c2a29eb78b5c97f67859fd83cf9329723..5d7e2ad8233d3151359b70327db86f7dc8b1c65c
--- 1/app/views/stream_entries/_simple_status.html.haml
--- 2/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@@ -19,11 -19,10 +19,11 @@@
            = fa_icon('lock') if status.account.locked?
    .status__content.emojify<
      - if status.spoiler_text?
-       %p{ style: 'margin-bottom: 0' }<
+       %p{ :style => ('margin-bottom: 0' unless current_account&.user&.setting_expand_spoilers) }<
          %span.p-summary> #{Formatter.instance.format_spoiler(status, autoplay: autoplay)}&nbsp;
          %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more')
-     .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
 -    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
++    .e-content{ lang: status.language, style: "display: #{!current_account&.user&.setting_expand_spoilers && status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }<
 +      = Formatter.instance.format(status, custom_emojify: true, autoplay: autoplay)
  
    - unless status.media_attachments.empty?
      - if status.media_attachments.first.video?

diff --cc config/locales/es.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/simple_form.en.yml
index 3ef992ef07afcbe5863d4028785ff8bf6f661e52,e3d84dd0733d7b13e96a756dffd107e0fcd6931f..b25ff26f48c649c8dbd91216aa184292538de42e
--- 1/config/locales/simple_form.en.yml
--- 2/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@@ -25,9 -25,12 +25,12 @@@ 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.
 +        setting_skin: Reskins the selected Mastodon flavour
          username: Your username will be unique on %{domain}
          whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
        imports:
@@@ -72,8 -75,11 +75,12 @@@
          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_favourite_modal: Show confirmation dialog before favouriting (applies to Glitch flavour only)
          setting_hide_network: Hide your network
          setting_noindex: Opt-out of search engine indexing
          setting_reduce_motion: Reduce motion in animations

diff --cc config/locales/simple_form.ja.yml
index d79dd75d152de31733e4706bb5a86c9fe108b5af,3d9c507590725ed8ee48237a66385a01492fd526..71e2f935e0533d3780fb1943b2966a9f7f0a99cb
--- 1/config/locales/simple_form.ja.yml
--- 2/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@@ -65,8 -68,10 +68,11 @@@ 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_favourite_modal: お気に入りをする前に確認ダイアログを表示する
          setting_hide_network: 繋がりを隠す
          setting_noindex: 検索エンジンによるインデックスを拒否する
          setting_reduce_motion: アニメーションの動きを減らす

diff --cc config/locales/simple_form.pl.yml
index 2fb99ccd747997c5a8720b02098f4d6e53671abf,250e98c56e19644e8186885031fc1bb7208e557c..d994eb6f57509ad8756db3da87ae097ad7941eb6
--- 1/config/locales/simple_form.pl.yml
--- 2/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@@ -74,8 -74,6 +74,7 @@@ pl
          setting_default_privacy: Widoczność wpisów
          setting_default_sensitive: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
          setting_delete_modal: Pytaj o potwierdzenie przed usunięciem wpisu
-         setting_display_sensitive_media: Zawsze oznaczaj zawartość multimedialną jako wrażliwą
 +        setting_favourite_modal: Pytaj o potwierdzenie przed dodaniem do ulubionych
          setting_hide_network: Ukryj swoją sieć
          setting_noindex: Nie indeksuj mojego profilu w wyszukiwarkach internetowych
          setting_reduce_motion: Ogranicz ruch w animacjach

diff --cc config/locales/sk.yml
Simple merge

diff --cc config/routes.rb
index 90333daabfd26496133475a4c012d8c924b7cb11,d5a9e734c95f042a1b41198e45038931c3c1c491..db79fc32303d1b99899962aaa40d89da028db380
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -272,14 -267,9 +273,14 @@@ Rails.application.routes.draw d
        resources :follows,      only: [:create]
        resources :media,        only: [:create, :update]
        resources :blocks,       only: [:index]
 -      resources :mutes,        only: [:index]
 +      resources :mutes,        only: [:index] do
 +        collection do
 +          get 'details'
 +        end
 +      end
        resources :favourites,   only: [:index]
-       resources :reports,      only: [:index, :create]
 +      resources :bookmarks,    only: [:index]
+       resources :reports,      only: [:create]
        resources :filters,      only: [:index, :create, :show, :update, :destroy]
        resources :endorsements, only: [:index]
  

diff --cc config/settings.yml
index 304271910ee2a9e4da90d6732aa7d7460090592f,2bc9fe289d581b9352d80621ae285654824a6286..48639e9a8b7fd403083d70b0e2cf2a22526f535d
--- 1/config/settings.yml
--- 2/config/settings.yml
+++ b/config/settings.yml
@@@ -24,10 -24,10 +24,11 @@@ defaults: &default
    hide_network: false
    unfollow_modal: false
    boost_modal: false
 +  favourite_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
    system_font_ui: false