From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 30 Jun 2020 21:00:20 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9c3b9d5ab91874f5bd9b7225c402816676065f00;p=mastodon.git

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.
---

9c3b9d5ab91874f5bd9b7225c402816676065f00
diff --cc app/models/media_attachment.rb
index 3fe35ceaa,f67566a18..61581138e
--- a/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 package.json
index 583524c2e,527b0abb7..e1c289388
--- a/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",