diff options
author | Starfall <us@starfall.systems> | 2022-11-12 10:09:41 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2022-11-12 10:11:39 -0600 |
commit | b07b6b9f339b604f9af150eb10ac1486eca8f189 (patch) | |
tree | 512943f7488b1fdb7d7c5d87cc039ea2f1886292 /app/models/custom_emoji.rb | |
parent | b96b336a7871b5e88da8f308116e8f0ca7827132 (diff) | |
parent | 81b1d32d5b618daa4003b8de8292ae4dd3e656f6 (diff) |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'app/models/custom_emoji.rb')
-rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 5af6aead8..fc8d3aed3 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -38,7 +38,7 @@ class CustomEmoji < ApplicationRecord belongs_to :category, class_name: 'CustomEmojiCategory', optional: true has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode - has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce -strip' } }, validate_media_type: false + has_attached_file :image, styles: { static: { format: 'png', convert_options: '-coalesce +profile "!icc,*" +set modify-date +set create-date' } }, validate_media_type: false before_validation :downcase_domain |