diff options
author | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-12 23:01:19 +0200 |
commit | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (patch) | |
tree | 4d1f3b2c9bdcadcf0fe53372a75ba54c0c06875a /app/models/custom_emoji.rb | |
parent | aa485d6f055b93fd7a9df8b47ed96122b38af39e (diff) | |
parent | cfca28bc874125e63e7e1a3c96d94bd5a7eca108 (diff) |
Merge pull request #1196 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
-rw-r--r-- | app/models/custom_emoji.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 514cf4845..643a7e46a 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -28,6 +28,8 @@ class CustomEmoji < ApplicationRecord :(#{SHORTCODE_RE_FRAGMENT}): (?=[^[:alnum:]:]|$)/x + IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze + belongs_to :category, class_name: 'CustomEmojiCategory', optional: true has_one :local_counterpart, -> { where(domain: nil) }, class_name: 'CustomEmoji', primary_key: :shortcode, foreign_key: :shortcode @@ -35,7 +37,7 @@ class CustomEmoji < ApplicationRecord before_validation :downcase_domain - validates_attachment :image, content_type: { content_type: 'image/png' }, presence: true, size: { less_than: LIMIT } + validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true, size: { less_than: LIMIT } validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 } scope :local, -> { where(domain: nil) } |