diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-10 13:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-10 13:27:40 +0100 |
| commit | ee7e49d1b1323618e16026bc8db8ab7f9459cc2d (patch) | |
| tree | 86d51ac7c13d2b08fae534a44524c2ef8b131315 /app/models/custom_emoji.rb | |
| parent | b2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff) | |
| parent | c4d2c729245fab1dda31d0de73be9bc03217b06a (diff) | |
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 9bf9860db..5af6aead8 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -31,6 +31,7 @@ class CustomEmoji < ApplicationRecord SCAN_RE = /(?<=[^[:alnum:]:]|\n|^) :(#{SHORTCODE_RE_FRAGMENT}): (?=[^[:alnum:]:]|$)/x + SHORTCODE_ONLY_RE = /\A#{SHORTCODE_RE_FRAGMENT}\z/ IMAGE_MIME_TYPES = %w(image/png image/gif image/webp).freeze @@ -44,7 +45,7 @@ class CustomEmoji < ApplicationRecord validates_attachment :image, content_type: { content_type: IMAGE_MIME_TYPES }, presence: true validates_attachment_size :image, less_than: LIMIT, unless: :local? validates_attachment_size :image, less_than: LOCAL_LIMIT, if: :local? - validates :shortcode, uniqueness: { scope: :domain }, format: { with: /\A#{SHORTCODE_RE_FRAGMENT}\z/ }, length: { minimum: 2 } + validates :shortcode, uniqueness: { scope: :domain }, format: { with: SHORTCODE_ONLY_RE }, length: { minimum: 2 } scope :local, -> { where(domain: nil) } scope :remote, -> { where.not(domain: nil) } |