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

Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
Simple merge

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

diff --cc app/models/media_attachment.rb
index 3fe35ceaa86efb542dd22c19074b4cc6534d56e4,f67566a18733d282d36390ead7de80d5c3212c1c..61581138e53f283ea4eb1393f212398a0383ed18
--- 1/app/models/media_attachment.rb
--- 2/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -127,12 -131,20 +131,20 @@@ class MediaAttachment < ApplicationReco
    }.freeze
  
    VIDEO_CONVERTED_STYLES = {
-     small: VIDEO_STYLES[:small],
-     original: VIDEO_FORMAT,
+     small: VIDEO_STYLES[:small].freeze,
+     original: VIDEO_FORMAT.freeze,
+   }.freeze
+ 
+   THUMBNAIL_STYLES = {
+     original: IMAGE_STYLES[:small].freeze,
+   }.freeze
+ 
+   GLOBAL_CONVERT_OPTIONS = {
+     all: '-quality 90 -strip +set modify-date +set create-date',
    }.freeze
  
 -  IMAGE_LIMIT = 10.megabytes
 -  VIDEO_LIMIT = 40.megabytes
 +  IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 10.megabytes).to_i
 +  VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i
  
    MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
    MAX_VIDEO_FRAME_RATE   = 60

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

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

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
Simple merge

diff --cc package.json
index 583524c2e57c4267d84a2231afb3a495d787d62c,527b0abb72e3808efcb79157cee881e93e49e98a..e1c2893885384b4a6636df693eac1838bf209efc
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -163,8 -160,7 +163,8 @@@
      "tesseract.js": "^2.1.1",
      "throng": "^4.0.0",
      "tiny-queue": "^0.2.1",
-     "uuid": "^8.1.0",
+     "uuid": "^8.2.0",
 +    "wavesurfer.js": "^3.3.3",
      "webpack": "^4.43.0",
      "webpack-assets-manifest": "^3.1.1",
      "webpack-bundle-analyzer": "^3.8.0",

diff --cc yarn.lock
Simple merge