codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 09:36:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Allow 👍 and 👎 to work even though not in emoji.json

Browse source
This commit is contained in:
Robin Ward 2016-04-27 14:56:04 -04:00
parent 2f911d9435
commit 55ba81494f
No known key found for this signature in database
GPG key ID: 0E091E2B4ED1B83D
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/models/emoji.rb
View file

@ -56,7 +56,7 @@ class Emoji
def self.create_from_db_item(emoji)
name = emoji["name"]
filename = "#{name}.png"
filename = "#{emoji['filename'] || name}.png"
Emoji.new.tap do |e|
e.name = name
e.url = "/images/emoji/#{SiteSetting.emoji_set}/#{filename}"
@ -90,7 +90,14 @@ class Emoji
end
def self.db
@db ||= File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) }
return @db if @db
@db = File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) }
# Small tweak to `emoji.json` from Emoji one
@db['emojis'] << {"code" => "1f44d", "name" => "+1", "filename" => "thumbsup"}
@db['emojis'] << {"code" => "1f44e", "name" => "-1", "filename" => "thumbsdown"}
@db
end
def self.load_standard