github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 03:45:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: do not include group less emojis in standard list (#18659)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2022-10-19 09:53:56 +02:00
committed by GitHub
parent 437de6338e
commit a705e4815f
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/emoji.rb
View File

@ -88,13 +88,14 @@ class Emoji
def self.create_from_db_item(emoji)
name = emoji["name"]
return unless group = groups[name]
filename = emoji['filename'] || name
Emoji.new.tap do |e|
e.name = name
e.tonable = Emoji.tonable_emojis.include?(name)
e.url = Emoji.url_for(filename)
e.group = groups[name] || DEFAULT_GROUP
e.group = group
e.search_aliases = search_aliases[name] || []
end
end
@ -151,7 +152,7 @@ class Emoji
end
def self.load_standard
db['emojis'].map { |e| Emoji.create_from_db_item(e) }
db['emojis'].map { |e| Emoji.create_from_db_item(e) }.compact
end
def self.load_custom