1 files changed, 44 insertions, 40 deletions
diff --git a/lib/award_emoji.rb b/lib/award_emoji.rb
index 4d99164bc33..783fcfb61ad 100644
--- a/lib/award_emoji.rb
+++ b/lib/award_emoji.rb
@@ -1,47 +1,51 @@
 class AwardEmoji
-  EMOJI_LIST = [
-    "+1", "-1", "100", "blush", "heart", "smile", "rage",
-    "beers", "disappointed", "ok_hand",
-    "helicopter", "shit", "airplane", "alarm_clock",
-    "ambulance", "anguished", "two_hearts", "wink"
-  ]
-
-  ALIASES = {
-    pout: "rage",
-    satisfied: "laughing",
-    hankey: "shit",
-    poop: "shit",
-    collision: "boom",
-    thumbsup: "+1",
-    thumbsdown: "-1",
-    punch: "facepunch",
-    raised_hand: "hand",
-    running: "runner",
-    ng_woman: "no_good",
-    shoe: "mans_shoe",
-    tshirt: "shirt",
-    honeybee: "bee",
-    flipper: "dolphin",
-    paw_prints: "feet",
-    waxing_gibbous_moon: "moon",
-    telephone: "phone",
-    knife: "hocho",
-    envelope: "email",
-    pencil: "memo",
-    open_book: "book",
-    sailboat: "boat",
-    red_car: "car",
-    lantern: "izakaya_lantern",
-    uk: "gb",
-    heavy_exclamation_mark: "exclamation",
-    squirrel: "shipit"
+  CATEGORIES = {
+    other: "Other",
+    objects: "Objects",
+    places: "Places",
+    travel_places: "Travel",
+    emoticons: "Emoticons",
+    objects_symbols: "Symbols",
+    nature: "Nature",
+    celebration: "Celebration",
+    people: "People",
+    activity: "Activity",
+    flags: "Flags",
+    food_drink: "Food"
   }.with_indifferent_access
 
-  def self.path_to_emoji_image(name)
-    "emoji/#{Emoji.emoji_filename(name)}.png"
+  def self.normilize_emoji_name(name)
+    aliases[name] || name
   end
 
-  def self.normilize_emoji_name(name)
-    ALIASES[name] || name
+  def self.emoji_by_category
+    unless @emoji_by_category
+      @emoji_by_category = {}
+
+      emojis.each do |emoji_name, data|
+        data["name"] = emoji_name
+
+        @emoji_by_category[data["category"]] ||= []
+        @emoji_by_category[data["category"]] << data
+      end
+
+      @emoji_by_category = @emoji_by_category.sort.to_h
+    end
+
+    @emoji_by_category
+  end
+
+  def self.emojis
+    @emojis ||= begin
+      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'index.json' )
+      JSON.parse(File.read(json_path))
+    end
+  end
+
+  def self.aliases
+    @aliases ||= begin
+      json_path = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json' )
+      JSON.parse(File.read(json_path))
+    end
   end
 end