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

Add more server side unicode replacements for emoji

Browse Source
This commit is contained in:
Robin Ward
2015-12-30 14:46:52 -05:00
parent b17e5c99cc
commit 74780c1688
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/models/emoji.rb
View File

@ -119,7 +119,16 @@ class Emoji
end end
def self.unicode_replacements def self.unicode_replacements
@unicode_replacements ||= Hash[db.map {|e| [e['emoji'], e['aliases'][0]] }] return @unicode_replacements if @unicode_replacements
@unicode_replacements = Hash[db.map {|e| [e['emoji'], e['aliases'][0]] }]
@unicode_replacements["\u{2639}"] = 'frowning'
@unicode_replacements["\u{263A}"] = 'slightly_smiling'
@unicode_replacements["\u{263B}"] = 'slightly_smiling'
@unicode_replacements["\u{2661}"] = 'heart'
@unicode_replacements["\u{2665}"] = 'heart'
@unicode_replacements
end end
def self.unicode_regexp def self.unicode_regexp

4
spec/components/pretty_text_spec.rb
View File

@ -385,6 +385,10 @@ HTML
expect(PrettyText.cook("💣")).to match(/\:bomb\:/) expect(PrettyText.cook("💣")).to match(/\:bomb\:/)
end end
it "replaces some glyphs that are not in the emoji range" do
expect(PrettyText.cook("☺")).to match(/\:slightly_smiling\:/)
end
it "doesn't replace unicode emoji if emoji is disabled" do it "doesn't replace unicode emoji if emoji is disabled" do
SiteSetting.enable_emoji = false SiteSetting.enable_emoji = false
expect(PrettyText.cook("💣")).not_to match(/\:bomb\:/) expect(PrettyText.cook("💣")).not_to match(/\:bomb\:/)