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

Conflicts:
- README.md
- app/helpers/statuses_helper.rb
  Upstream moved account helpers to their own file, we had extra
  helpers there, moved too.
- app/lib/sanitize_config.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- config/locales/simple_form.en.yml
- spec/lib/sanitize_config_spec.rb

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/settings/preferences_controller.rb
Simple merge

diff --cc app/helpers/accounts_helper.rb
index 0000000000000000000000000000000000000000,5b060a18170b01bd9aaafbce8afd61828cce9dc4..e07276f0c69d6303af04c38c559e0be600be5f1a
mode 000000,100644..100644
--- /dev/null
--- 2/app/helpers/accounts_helper.rb
+++ b/app/helpers/accounts_helper.rb
@@@ -1,0 -1,106 +1,112 @@@
 -    prepend_str = [
+ # frozen_string_literal: true
+ 
+ module AccountsHelper
+   def display_name(account, **options)
+     if options[:custom_emojify]
+       Formatter.instance.format_display_name(account, options)
+     else
+       account.display_name.presence || account.username
+     end
+   end
+ 
+   def acct(account)
+     if account.local?
+       "@#{account.acct}@#{Rails.configuration.x.local_domain}"
+     else
+       "@#{account.acct}"
+     end
+   end
+ 
+   def account_action_button(account)
+     if user_signed_in?
+       if account.id == current_user.account_id
+         link_to settings_profile_url, class: 'button logo-button' do
+           safe_join([svg_logo, t('settings.edit_profile')])
+         end
+       elsif current_account.following?(account) || current_account.requested?(account)
+         link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do
+           safe_join([svg_logo, t('accounts.unfollow')])
+         end
+       elsif !(account.memorial? || account.moved?)
+         link_to account_follow_path(account), class: "button logo-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post } do
+           safe_join([svg_logo, t('accounts.follow')])
+         end
+       end
+     elsif !(account.memorial? || account.moved?)
+       link_to account_remote_follow_path(account), class: 'button logo-button modal-button', target: '_new' do
+         safe_join([svg_logo, t('accounts.follow')])
+       end
+     end
+   end
+ 
+   def minimal_account_action_button(account)
+     if user_signed_in?
+       return if account.id == current_user.account_id
+ 
+       if current_account.following?(account) || current_account.requested?(account)
+         link_to account_unfollow_path(account), class: 'icon-button active', data: { method: :post }, title: t('accounts.unfollow') do
+           fa_icon('user-times fw')
+         end
+       elsif !(account.memorial? || account.moved?)
+         link_to account_follow_path(account), class: "icon-button#{account.blocking?(current_account) ? ' disabled' : ''}", data: { method: :post }, title: t('accounts.follow') do
+           fa_icon('user-plus fw')
+         end
+       end
+     elsif !(account.memorial? || account.moved?)
+       link_to account_remote_follow_path(account), class: 'icon-button modal-button', target: '_new', title: t('accounts.follow') do
+         fa_icon('user-plus fw')
+       end
+     end
+   end
+ 
+   def account_badge(account, all: false)
+     if account.bot?
+       content_tag(:div, content_tag(:div, t('accounts.roles.bot'), class: 'account-role bot'), class: 'roles')
+     elsif (Setting.show_staff_badge && account.user_staff?) || all
+       content_tag(:div, class: 'roles') do
+         if all && !account.user_staff?
+           content_tag(:div, t('admin.accounts.roles.user'), class: 'account-role')
+         elsif account.user_admin?
+           content_tag(:div, t('accounts.roles.admin'), class: 'account-role admin')
+         elsif account.user_moderator?
+           content_tag(:div, t('accounts.roles.moderator'), class: 'account-role moderator')
+         end
+       end
+     end
+   end
+ 
++  def hide_followers_count?(account)
++    Setting.hide_followers_count || account.user&.setting_hide_followers_count
++  end
++
+   def account_description(account)
 -      [
++    prepend_stats = [
+       [
+         number_to_human(account.statuses_count, strip_insignificant_zeros: true),
+         I18n.t('accounts.posts', count: account.statuses_count),
+       ].join(' '),
+ 
+       [
+         number_to_human(account.following_count, strip_insignificant_zeros: true),
+         I18n.t('accounts.following', count: account.following_count),
+       ].join(' '),
++    ]
+ 
 -      ].join(' '),
 -    ].join(', ')
++    unless hide_followers_count?(account)
++      prepend_stats << [
+         number_to_human(account.followers_count, strip_insignificant_zeros: true),
+         I18n.t('accounts.followers', count: account.followers_count),
 -    [prepend_str, account.note].join(' · ')
++      ].join(' ')
++    end
+ 
++    [prepend_stats.join(', '), account.note].join(' · ')
+   end
+ 
+   def svg_logo
+     content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo'), 'viewBox' => '0 0 216.4144 232.00976')
+   end
+ 
+   def svg_logo_full
+     content_tag(:svg, tag(:use, 'xlink:href' => '#mastodon-svg-logo-full'), 'viewBox' => '0 0 713.35878 175.8678')
+   end
+ end

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

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

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

diff --cc app/lib/formatter.rb
index 4fa05374494a241996acc3c616af0b98b9e3c187,6ba3276141a54bd9d4505bb2aa3d8571e7087f70..9159db2a158db9bad204a0c056e90461cc938902
--- 1/app/lib/formatter.rb
--- 2/app/lib/formatter.rb
+++ b/app/lib/formatter.rb
@@@ -312,32 -249,9 +312,32 @@@ class Formatte
      Extractor.remove_overlapping_entities(special + standard)
    end
  
 +  def html_friendly_extractor(html, options = {})
 +    gaps = []
 +    total_offset = 0
 +
 +    escaped = html.gsub(/<[^>]*>|&#[0-9]+;/) do |match|
 +      total_offset += match.length - 1
 +      end_offset = Regexp.last_match.end(0)
 +      gaps << [end_offset - total_offset, total_offset]
 +      "\u200b"
 +    end
 +
 +    entities = Extractor.extract_hashtags_with_indices(escaped, :check_url_overlap => false) +
 +               Extractor.extract_mentions_or_lists_with_indices(escaped)
 +    Extractor.remove_overlapping_entities(entities).map do |extract|
 +      pos = extract[:indices].first
 +      offset_idx = gaps.rindex { |gap| gap.first <= pos }
 +      offset = offset_idx.nil? ? 0 : gaps[offset_idx].last
 +      next extract.merge(
 +        :indices => [extract[:indices].first + offset, extract[:indices].last + offset]
 +      )
 +    end
 +  end
 +
    def link_to_url(entity, options = {})
      url        = Addressable::URI.parse(entity[:url])
-     html_attrs = { target: '_blank', rel: 'nofollow noopener' }
+     html_attrs = { target: '_blank', rel: 'nofollow noopener noreferrer' }
  
      html_attrs[:rel] = "me #{html_attrs[:rel]}" if options[:me]
  

diff --cc app/lib/sanitize_config.rb
index 956c464f768906b97a102de18606988f8263203a,77045155e03149a256f1521584533894b57901de..9f5bf012527f59deb6fe5ca56fa35033d1890b4c
--- 1/app/lib/sanitize_config.rb
--- 2/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@@ -50,7 -45,7 +50,7 @@@ class Sanitiz
  
        add_attributes: {
          'a' => {
-           'rel' => 'nofollow noopener tag',
 -          'rel' => 'nofollow noopener noreferrer',
++          'rel' => 'nofollow noopener tag noreferrer',
            'target' => '_blank',
          },
        },

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

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

diff --cc app/models/user.rb
index 1556f677d5ea1a0c0292855a5cb8b3ac5d52ad2d,7147a9a319f53e3c060fce05c070c2602fa5f17e..e33610d549260eb3ab4e97f47860f35bc1b2c76c
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -105,11 -105,10 +105,11 @@@ 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, :use_blurhash, :use_pending_items, :trends,
+            :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images,
 +           :default_content_type, :system_emoji_font,
             to: :settings, prefix: :setting, allow_nil: false
  
    attr_reader :invite_code

diff --cc app/serializers/initial_state_serializer.rb
index d40fe3380601c3c543727faa481997bca049690d,392fc891af4ca411d144302cdf82e1ba5af9bfd3..e5e88c200d77c5fa80fa91ceea539d73158b1a33
--- 1/app/serializers/initial_state_serializer.rb
--- 2/app/serializers/initial_state_serializer.rb
+++ b/app/serializers/initial_state_serializer.rb
@@@ -53,8 -38,7 +53,9 @@@ class InitialStateSerializer < ActiveMo
        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
 +      store[:system_emoji_font] = object.current_account.user.setting_system_emoji_font
+       store[:crop_images]       = object.current_account.user.setting_crop_images
      else
        store[:auto_play_gif] = Setting.auto_play_gif
        store[:display_media] = Setting.display_media

diff --cc app/views/admin/tags/index.html.haml
Simple merge

diff --cc app/views/settings/preferences/appearance/show.html.haml
index 900a7c6fb69ad8e14c295d8348c79d4efb9c1f01,9ed83fb930bb292a22e1df3b9fadeb4de1426cb7..f1e3d2e97ef640cbd3e26dcf776018c0a0546961
--- 1/app/views/settings/preferences/appearance/show.html.haml
--- 2/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@@ -21,8 -24,12 +21,13 @@@
      = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
      = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
      = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
 +    = f.input :setting_system_emoji_font, as: :boolean, wrapper: :with_label
  
+   %h4= t 'appearance.toot_layout'
+ 
+   .fields-group
+     = f.input :setting_crop_images, as: :boolean, wrapper: :with_label
+ 
    %h4= t 'appearance.discovery'
  
    .fields-group

diff --cc app/views/statuses/_simple_status.html.haml
Simple merge

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

diff --cc config/locales/simple_form.en.yml
index 93312a9b1fa524c24466140279ba7fb6b146392d,65951b73bafb5ab30119417aab6c62da9349aca8..9b467f84e31ddfc29f33a169fe6c0f95e62f525c
--- 1/config/locales/simple_form.en.yml
--- 2/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@@ -118,10 -113,7 +118,11 @@@ en
          setting_aggregate_reblogs: Group boosts in timelines
          setting_auto_play_gif: Auto-play animated GIFs
          setting_boost_modal: Show confirmation dialog before boosting
+         setting_crop_images: Crop images in non-expanded toots to 16x9
 +        setting_default_content_type: Default format for toots
 +        setting_default_content_type_html: HTML
 +        setting_default_content_type_markdown: Markdown
 +        setting_default_content_type_plain: Plain text
          setting_default_language: Posting language
          setting_default_privacy: Posting privacy
          setting_default_sensitive: Always mark media as sensitive

diff --cc config/settings.yml
Simple merge

diff --cc package.json
index 6baaeae58f8d90282f059999b89514e7d630d375,22e126c713abcb69e522f9636f09e2b8f0e407d6..8a603a01e61f735d490a89131340be8611abfade
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -72,9 -71,8 +72,9 @@@
      "@babel/preset-env": "^7.6.0",
      "@babel/preset-react": "^7.0.0",
      "@babel/runtime": "^7.5.4",
-     "@clusterws/cws": "^0.15.0",
+     "@clusterws/cws": "^0.15.2",
      "array-includes": "^3.0.3",
 +    "atrament": "^0.2.3",
      "autoprefixer": "^9.6.1",
      "axios": "^0.19.0",
      "babel-loader": "^8.0.6",

diff --cc yarn.lock
Simple merge