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

Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/admin/dashboard_controller.rb
index 4f4341918bb329196aea7c19a873bc1b06572445,ab56065e035f02f2bb1bc6c73cca9e4a953940ca..92bf7fbb90b9e3c0a3a128768ede54f0c63724e1
--- 1/app/controllers/admin/dashboard_controller.rb
--- 2/app/controllers/admin/dashboard_controller.rb
+++ b/app/controllers/admin/dashboard_controller.rb
@@@ -28,10 -28,12 +28,13 @@@ module Admi
        @pam_enabled           = ENV['PAM_ENABLED'] == 'true'
        @hidden_service        = ENV['ALLOW_ACCESS_TO_HIDDEN_SERVICE'] == 'true'
        @trending_hashtags     = TrendingTags.get(10, filtered: false)
+       @authorized_fetch      = authorized_fetch_mode?
+       @whitelist_enabled     = whitelist_mode?
        @profile_directory     = Setting.profile_directory
        @timeline_preview      = Setting.timeline_preview
 +      @keybase_integration   = Setting.enable_keybase
        @spam_check_enabled    = Setting.spam_check_enabled
+       @trends_enabled        = Setting.trends
      end
  
      private

diff --cc app/controllers/directories_controller.rb
Simple merge

diff --cc app/controllers/settings/preferences_controller.rb
index ea4491d1e2d3d3e475833805e53c90d5120caab9,edf29947bb046761c86ce3f9b7453aecea30a719..418ea5d7ac65c2c9373db5b4f83949388dc179da
--- 1/app/controllers/settings/preferences_controller.rb
--- 2/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@@ -55,9 -54,9 +55,10 @@@ class Settings::PreferencesController 
        :setting_aggregate_reblogs,
        :setting_show_application,
        :setting_advanced_layout,
 +      :setting_default_content_type,
        :setting_use_blurhash,
        :setting_use_pending_items,
+       :setting_trends,
        notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
        interactions: %i(must_be_follower must_be_following must_be_following_dm)
      )

diff --cc app/controllers/tags_controller.rb
Simple merge

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

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

diff --cc app/lib/formatter.rb
Simple merge

diff --cc app/lib/user_settings_decorator.rb
index 51d8c0970f0035994845f33d1e1fc1b2d6c07f48,3568a3e1167a20bbf03357c57a4d0cd6a359f535..a52172707b7eb6743d1ab43e97692549e22bf1bb
--- 1/app/lib/user_settings_decorator.rb
--- 2/app/lib/user_settings_decorator.rb
+++ b/app/lib/user_settings_decorator.rb
@@@ -37,9 -34,9 +37,10 @@@ class UserSettingsDecorato
      user.settings['aggregate_reblogs']   = aggregate_reblogs_preference if change?('setting_aggregate_reblogs')
      user.settings['show_application']    = show_application_preference if change?('setting_show_application')
      user.settings['advanced_layout']     = advanced_layout_preference if change?('setting_advanced_layout')
 +    user.settings['default_content_type']= default_content_type_preference if change?('setting_default_content_type')
      user.settings['use_blurhash']        = use_blurhash_preference if change?('setting_use_blurhash')
      user.settings['use_pending_items']   = use_pending_items_preference if change?('setting_use_pending_items')
+     user.settings['trends']              = trends_preference if change?('setting_trends')
    end
  
    def merged_notification_emails

diff --cc app/models/account.rb
Simple merge

diff --cc app/models/form/admin_settings.rb
index ecaed44f60be59150a02991e1089ba727025f474,051268375e6858a6211d04f7a6da8f94cbfedd5f..2c3a7f13b955ca78c7c67a8c2436d0290cfb10cf
--- 1/app/models/form/admin_settings.rb
--- 2/app/models/form/admin_settings.rb
+++ b/app/models/form/admin_settings.rb
@@@ -32,9 -28,8 +32,10 @@@ class Form::AdminSetting
      thumbnail
      hero
      mascot
 +    show_reblogs_in_public_timelines
 +    show_replies_in_public_timelines
      spam_check_enabled
+     trends
    ).freeze
  
    BOOLEAN_KEYS = %i(
@@@ -46,11 -41,8 +47,12 @@@
      show_known_fediverse_at_about_page
      preview_sensitive_media
      profile_directory
 +    hide_followers_count
 +    enable_keybase
 +    show_reblogs_in_public_timelines
 +    show_replies_in_public_timelines
      spam_check_enabled
+     trends
    ).freeze
  
    UPLOAD_KEYS = %i(

diff --cc app/models/user.rb
index 67cf92307e84260d723be9116f95e0686faf4192,a4a20d97512707f070910d48dd718c96eb2fb96f..45a4b89890b71e88976d4ad357528aa7ea7238b7
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -104,10 -104,11 +104,12 @@@ 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_media, :hide_network, :hide_followers_count,
             :expand_spoilers, :default_language, :aggregate_reblogs, :show_application,
-            :advanced_layout, :default_content_type, :use_blurhash, :use_pending_items, :use_pending_items, to: :settings, prefix: :setting, allow_nil: false
+            :advanced_layout, :use_blurhash, :use_pending_items, :trends,
++           :default_content_type,
+            to: :settings, prefix: :setting, allow_nil: false
  
    attr_reader :invite_code
    attr_writer :external

diff --cc app/serializers/initial_state_serializer.rb
index e2205918231001b5a3b4feb12006f74619709995,c92c5e606b6953dcc0ca1af91298b88e65d7b7ab..c8da6e725cd2e38b6cc315db23558c60591d125b
--- 1/app/serializers/initial_state_serializer.rb
--- 2/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@@ -50,7 -36,7 +51,8 @@@ class InitialStateSerializer < ActiveMo
        store[:use_blurhash]      = object.current_account.user.setting_use_blurhash
        store[:use_pending_items] = object.current_account.user.setting_use_pending_items
        store[:is_staff]          = object.current_account.user.staff?
+       store[:trends]            = Setting.trends && object.current_account.user.setting_trends
 +      store[:default_content_type] = object.current_account.user.setting_default_content_type
      end
  
      store

diff --cc app/services/batched_remove_status_service.rb
Simple merge

diff --cc app/services/fan_out_on_write_service.rb
Simple merge

diff --cc app/services/remove_status_service.rb
Simple merge

diff --cc app/views/admin/dashboard/index.html.haml
index d3ac3ff42506c858afa0e522b3464ff673a24cfe,f567b81e8da73179074a348c4411e72d7ed4840a..3c98da35f34c58381f236e367d7c73ebbea230b5
--- 1/app/views/admin/dashboard/index.html.haml
--- 2/app/views/admin/dashboard/index.html.haml
+++ b/app/views/admin/dashboard/index.html.haml
@@@ -49,8 -49,8 +49,10 @@@
            = feature_hint(link_to(t('admin.dashboard.feature_profile_directory'), edit_admin_settings_path), @profile_directory)
          %li
            = feature_hint(link_to(t('admin.dashboard.feature_timeline_preview'), edit_admin_settings_path), @timeline_preview)
 +        %li
 +          = feature_hint(link_to(t('admin.dashboard.keybase'), edit_admin_settings_path), @keybase_integration)
+         %li
+           = feature_hint(link_to(t('admin.dashboard.trends'), edit_admin_settings_path), @trends_enabled)
          %li
            = feature_hint(link_to(t('admin.dashboard.feature_relay'), admin_relays_path), @relay_enabled)
          %li

diff --cc app/views/admin/settings/edit.html.haml
index efe6ea56bda5c6760a4903da70bd071b1fb1b326,28c0ece15be677f5f4a6db4bca17b99376e3bd87..b0ab394d6bb2ec1e4fee56231f800e598a40719c
--- 1/app/views/admin/settings/edit.html.haml
--- 2/app/views/admin/settings/edit.html.haml
+++ b/app/views/admin/settings/edit.html.haml
@@@ -68,18 -68,9 +68,21 @@@
      .fields-group
        = f.input :profile_directory, as: :boolean, wrapper: :with_label, label: t('admin.settings.profile_directory.title'), hint: t('admin.settings.profile_directory.desc_html')
  
+     .fields-group
+       = f.input :trends, as: :boolean, wrapper: :with_label, label: t('admin.settings.trends.title'), hint: t('admin.settings.trends.desc_html')
+ 
 +  .fields-group
 +    = f.input :hide_followers_count, as: :boolean, wrapper: :with_label, label: t('admin.settings.hide_followers_count.title'), hint: t('admin.settings.hide_followers_count.desc_html')
 +
 +  .fields-group
 +    = f.input :enable_keybase, as: :boolean, wrapper: :with_label, label: t('admin.settings.enable_keybase.title'), hint: t('admin.settings.enable_keybase.desc_html')
 +
 +  .fields-group
 +    = f.input :show_reblogs_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_reblogs_in_public_timelines.title'), hint: t('admin.settings.show_reblogs_in_public_timelines.desc_html')
 +
 +  .fields-group
 +    = f.input :show_replies_in_public_timelines, as: :boolean, wrapper: :with_label, label: t('admin.settings.show_replies_in_public_timelines.title'), hint: t('admin.settings.show_replies_in_public_timelines.desc_html')
 +
    .fields-group
      = f.input :spam_check_enabled, as: :boolean, wrapper: :with_label, label: t('admin.settings.spam_check_enabled.title'), hint: t('admin.settings.spam_check_enabled.desc_html')
  

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

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

diff --cc config/locales/simple_form.en.yml
index 82e12958154fad4708c5420a5fe0c3f2c1b8e6a1,e15d5904fd7aa012f9f14cd4856fd24596042785..5da0cc45df36f307dab3d1c2029fafa03593180f
--- 1/config/locales/simple_form.en.yml
--- 2/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@@ -123,8 -112,9 +123,10 @@@ en
          setting_noindex: Opt-out of search engine indexing
          setting_reduce_motion: Reduce motion in animations
          setting_show_application: Disclose application used to send toots
 +        setting_skin: Skin
          setting_system_font_ui: Use system's default font
+         setting_theme: Site theme
+         setting_trends: Show today's trends
          setting_unfollow_modal: Show confirmation dialog before unfollowing someone
          setting_use_blurhash: Show colorful gradients for hidden media
          setting_use_pending_items: Slow mode

diff --cc config/settings.yml
Simple merge