diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-09-13 16:01:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 16:01:09 +0200 |
| commit | 59da5ccb8e9e06e0c91ebd548e899786c632f1de (patch) | |
| tree | 15e40767f5322abafd159aa93fb4c6793a9ae00a | |
| parent | 45f44ef4d35c5f77ea4b264cf848ad1c67f8647d (diff) | |
Change unlisted custom emoji to not appear in autosuggestions (#11818)
Fix #11669
| -rw-r--r-- | app/controllers/api/v1/custom_emojis_controller.rb | 2 | ||||
| -rw-r--r-- | app/models/custom_emoji.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/api/v1/custom_emojis_controller.rb b/app/controllers/api/v1/custom_emojis_controller.rb index 252f667dd..4e6d5d7c6 100644 --- a/app/controllers/api/v1/custom_emojis_controller.rb +++ b/app/controllers/api/v1/custom_emojis_controller.rb @@ -7,6 +7,6 @@ class Api::V1::CustomEmojisController < Api::BaseController def index expires_in 3.minutes, public: true - render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.local.where(disabled: false).includes(:category) } + render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) } end end diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 0a4201a14..edb1bec75 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -40,10 +40,11 @@ class CustomEmoji < ApplicationRecord 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) } - scope :remote, -> { where.not(domain: nil) } + scope :local, -> { where(domain: nil) } + scope :remote, -> { where.not(domain: nil) } scope :alphabetic, -> { order(domain: :asc, shortcode: :asc) } scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) } + scope :listed, -> { local.where(disabled: false).where(visible_in_picker: true) } remotable_attachment :image, LIMIT |