mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: ensures emoji helper is working with custom emojis (#7843)
This commit is contained in:
@@ -7,7 +7,10 @@ module EmojiHelper
|
||||
str = str.gsub(/:([\w\-+]*(?::t\d)?):/) do |name|
|
||||
code = $1
|
||||
|
||||
if Emoji.exists?(code)
|
||||
if code && Emoji.custom?(code)
|
||||
emoji = Emoji[code]
|
||||
"<img src=\"#{emoji.url}\" title=\"#{code}\" class=\"emoji\" alt=\"#{code}\">"
|
||||
elsif code && Emoji.exists?(code)
|
||||
"<img src=\"#{Emoji.url_for(code)}\" title=\"#{code}\" class=\"emoji\" alt=\"#{code}\">"
|
||||
else
|
||||
name
|
||||
|
||||
@@ -38,6 +38,11 @@ class Emoji
|
||||
Discourse.cache.fetch(cache_key("tonable_emojis")) { db['tonableEmojis'] }
|
||||
end
|
||||
|
||||
def self.custom?(name)
|
||||
name = name.delete_prefix(':').delete_suffix(':')
|
||||
Emoji.custom.detect { |e| e.name == name }.present?
|
||||
end
|
||||
|
||||
def self.exists?(name)
|
||||
Emoji[name].present?
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user