From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 22 Feb 2022 17:06:29 +0000 (+0100)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=954e052b0727099be97552af577831a8a0f81a88;p=mastodon.git

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

Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
---

954e052b0727099be97552af577831a8a0f81a88
diff --cc app/models/media_attachment.rb
index 9eaacdc03,a3115637e..4b38d729e
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -38,6 -38,12 +38,12 @@@ class MediaAttachment < ApplicationReco
  
    MAX_DESCRIPTION_LENGTH = 1_500
  
 -  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
+ 
    IMAGE_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif).freeze
    VIDEO_FILE_EXTENSIONS = %w(.webm .mp4 .m4v .mov).freeze
    AUDIO_FILE_EXTENSIONS = %w(.ogg .oga .mp3 .wav .flac .opus .aac .m4a .3gp .wma).freeze