FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

/api/v1/custom_emojis: return unlisted ones too

This commit is contained in:
Kay Faraday 2021-09-02 07:03:04 +00:00
parent f3344c4cb5
commit b1ebe7f686
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/custom_emojis_controller.rb
View File

@ -5,6 +5,6 @@ class Api::V1::CustomEmojisController < Api::BaseController
def index
expires_in 3.minutes, public: true
render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.listed.includes(:category) }
render_with_cache(each_serializer: REST::CustomEmojiSerializer) { CustomEmoji.enabled }
end
end

3
app/models/custom_emoji.rb
View File

@ -48,7 +48,8 @@ class CustomEmoji < ApplicationRecord
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) }
scope :enabled, -> { local.where(disabled: false) }
scope :listed, -> { enabled.where(visible_in_picker: true) }
remotable_attachment :image, LIMIT