diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-01 15:29:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 15:29:35 +0200 |
| commit | 20e75666b2c52be6bbc7fe3f6fbe4278f35dde15 (patch) | |
| tree | ea47c70306d15e6b187ce0d37f9dd2936ee9b29d /app/models/concerns | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | a0d01119794655dc789eda94905304679de070e8 (diff) | |
Merge pull request #619 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/concerns')
| -rw-r--r-- | app/models/concerns/account_header.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/concerns/account_header.rb b/app/models/concerns/account_header.rb index ef40b8126..067e166eb 100644 --- a/app/models/concerns/account_header.rb +++ b/app/models/concerns/account_header.rb @@ -5,11 +5,12 @@ module AccountHeader IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze LIMIT = 2.megabytes + MAX_PIXELS = 750_000 # 1500x500px class_methods do def header_styles(file) - styles = { original: { geometry: '700x335#', file_geometry_parser: FastGeometryParser } } - styles[:static] = { geometry: '700x335#', format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' + styles = { original: { pixels: MAX_PIXELS, file_geometry_parser: FastGeometryParser } } + styles[:static] = { format: 'png', convert_options: '-coalesce', file_geometry_parser: FastGeometryParser } if file.content_type == 'image/gif' styles end |