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

diff --cc Gemfile.lock
Simple merge

diff --cc app/lib/activitypub/activity/create.rb
Simple merge

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

diff --cc app/serializers/activitypub/note_serializer.rb
Simple merge

diff --cc app/serializers/rest/status_serializer.rb
Simple merge

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

diff --cc app/views/layouts/_theme.html.haml
index 066d9de42fe1fadfdaf440d99c125673d70ea526,0000000000000000000000000000000000000000..92de64b0d02155c82f3593ad36c31003ab1c8cbd
mode 100644,000000..100644
--- 1/app/views/layouts/_theme.html.haml
--- /dev/null
+++ b/app/views/layouts/_theme.html.haml
@@@ -1,13 -1,0 +1,13 @@@
-     = javascript_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, crossorigin: 'anonymous'
 +- if theme
 +  - if theme[:pack] != 'common' && theme[:common]
 +    = render partial: 'layouts/theme', object: theme[:common]
 +  - if theme[:pack]
-         = stylesheet_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", integrity: true, media: 'all'
++    = javascript_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", crossorigin: 'anonymous'
 +    - if theme[:skin]
 +      - if !theme[:flavour] || theme[:skin] == 'default'
-         = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}"
++        = stylesheet_pack_tag theme[:flavour] ? "flavours/#{theme[:flavour]}/#{theme[:pack]}" : "core/#{theme[:pack]}", media: 'all', crossorigin: 'anonymous'
 +      - else
++        = stylesheet_pack_tag "skins/#{theme[:flavour]}/#{theme[:skin]}/#{theme[:pack]}", crossorigin: 'anonymous'
 +    - if theme[:preload]
 +      - theme[:preload].each do |link|
 +        %link{ href: asset_pack_path("#{link}.js"), crossorigin: 'anonymous', rel: 'preload', as: 'script' }/

diff --cc app/views/layouts/application.html.haml
index 1481f697344153925a87ffc7f7fa235cff478b20,9501207e0818b373e699ec1e588b3a67ff27ae3d..32681773f8895f69c77b8da9383058af544bc607
--- 1/app/views/layouts/application.html.haml
--- 2/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@@ -21,12 -21,10 +21,12 @@@
  
      %title= content_for?(:page_title) ? safe_join([yield(:page_title).chomp.html_safe, title], ' - ') : title
  
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag current_theme, media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    - if @theme
 +      - if @theme[:supported_locales].include? I18n.locale.to_s
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +      - elsif @theme[:supported_locales].include? 'en'
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
      = csrf_meta_tags
      %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }
  

diff --cc app/views/layouts/embedded.html.haml
index 69b206f69590dd83060d318e31c941897b7ee34d,e4311d342c82ab999922489e6b439f20feb1e404..431bd260cafeb359b8b5e00c4d9844863ff476d5
--- 1/app/views/layouts/embedded.html.haml
--- 2/app/views/layouts/embedded.html.haml
+++ b/app/views/layouts/embedded.html.haml
@@@ -11,16 -11,12 +11,16 @@@
      - if storage_host?
        %link{ rel: 'dns-prefetch', href: storage_host }/
  
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag "locale_#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
      = render_initial_state
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = javascript_pack_tag 'public', integrity: true, crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    - if @theme
 +      - if @theme[:supported_locales].include? I18n.locale.to_s
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +      - elsif @theme[:supported_locales].include? 'en'
-         = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++        = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
 +    = render partial: 'layouts/theme', object: @core
 +    = render partial: 'layouts/theme', object: @theme
 +
    %body.embed
      = yield
  

diff --cc app/views/layouts/error.html.haml
index f8315afb56e512786a26d98561cebba7ed444b83,852a0c69b6069f0224567ae750692d0b3da070d7..55da5de3f3560dd177dd2808248ec31d7db1ac0b
--- 1/app/views/layouts/error.html.haml
--- 2/app/views/layouts/error.html.haml
+++ b/app/views/layouts/error.html.haml
@@@ -5,9 -5,10 +5,9 @@@
      %meta{ charset: 'utf-8' }/
      %title= safe_join([yield(:page_title), Setting.default_settings['site_title']], ' - ')
      %meta{ content: 'width=device-width,initial-scale=1', name: 'viewport' }/
-     = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -    = stylesheet_pack_tag 'common', media: 'all', crossorigin: 'anonymous'
 -    = stylesheet_pack_tag Setting.default_settings['theme'], media: 'all', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'common', crossorigin: 'anonymous'
 -    = javascript_pack_tag 'error', crossorigin: 'anonymous'
++    = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +    = render partial: 'layouts/theme', object: (@core || { pack: 'common' })
 +    = render partial: 'layouts/theme', object: (@theme || { pack: 'error', flavour: 'glitch', common: { pack: 'common', flavour: 'glitch', skin: 'default' } })
    %body.error
      .dialog
        .dialog__illustration

diff --cc app/views/media/player.html.haml
index bd5610a0b636ffb0f3f10e81d79fb0fbad2badba,92428ca94acf333679956004427319f364e72330..7369628a4ecf7da7f61a43e89208efae9d88683a
--- 1/app/views/media/player.html.haml
--- 2/app/views/media/player.html.haml
+++ b/app/views/media/player.html.haml
@@@ -1,13 -1,6 +1,13 @@@
  - content_for :header_tags do
    = render_initial_state
-   = javascript_pack_tag "locales", integrity: true, crossorigin: 'anonymous'
 -  = javascript_pack_tag 'public', crossorigin: 'anonymous'
++  = javascript_pack_tag "locales", crossorigin: 'anonymous'
 +  - if @theme
 +    - if @theme[:supported_locales].include? I18n.locale.to_s
-       = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", integrity: true, crossorigin: 'anonymous'
++      = javascript_pack_tag "locales/#{@theme[:flavour]}/#{I18n.locale}", crossorigin: 'anonymous'
 +    - elsif @theme[:supported_locales].include? 'en'
-       = javascript_pack_tag "locales/#{@theme[:flavour]}/en", integrity: true, crossorigin: 'anonymous'
++      = javascript_pack_tag "locales/#{@theme[:flavour]}/en", crossorigin: 'anonymous'
 +  = render partial: 'layouts/theme', object: @core
 +  = render partial: 'layouts/theme', object: @theme
  
  - if @media_attachment.video?
    = react_component :video, src: @media_attachment.file.url(:original), preview: @media_attachment.thumbnail.present? ? @media_attachment.thumbnail.url : @media_attachment.file.url(:small), blurhash: @media_attachment.blurhash, width: 670, height: 380, editable: true, detailed: true, inline: true, alt: @media_attachment.description do

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

diff --cc config/routes.rb
Simple merge

diff --cc config/webpack/shared.js
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 15f6b39f9b4008dcdfb8f99678033031d243dab2,b51863c717252997e1ce3e9bfc162ce0d7106599..b125f8cb63394a6123bc02892cd87eb321473560
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -96,8 -94,7 +96,8 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
-     "file-loader": "^6.1.1",
 +    "favico.js": "^0.3.10",
+     "file-loader": "^6.2.0",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.6",
      "history": "^4.10.1",

diff --cc yarn.lock
Simple merge