From 73e345fe8f81fca5c7fbfcbeda3ca08627e06612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Thu, 15 Oct 2015 09:59:29 +0200
Subject: [PATCH] FIX: unescape emojis in digests

---
 app/helpers/application_helper.rb            | 4 ++++
 app/views/user_notifications/digest.html.erb | 4 ++--
 lib/pretty_text.rb                           | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 07431083543..aa56543de5e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -74,6 +74,10 @@ module ApplicationHelper
     end
   end
 
+  def unescape_emoji(title)
+    PrettyText.unescape_emoji(title)
+  end
+
   def with_format(format, &block)
     old_formats = formats
     self.formats = [format]
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 61862b0613b..959562b2ea4 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -20,7 +20,7 @@
 
       <%- @featured_topics.each_with_index do |t, i| %>
         <div class='featured-topic'>
-          <%= link_to t.title, "#{Discourse.base_url}#{t.relative_url}" %>
+          <a href='<%= Discourse.base_url + t.relative_url %>'><%= raw unescape_emoji(t.title) %></a>
           <br/>
           <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
         </div>
@@ -43,7 +43,7 @@
       <%- @new_topics.each do |t| %>
         <ul>
           <li>
-            <%= link_to t.title, "#{Discourse.base_url}#{t.relative_url}" %>
+            <a href='<%= Discourse.base_url + t.relative_url %>'><%= raw unescape_emoji(t.title) %></a>
             <span class='post-count'><%= t.posts_count %></span>
             <%= category_badge(t.category, inline_style: true, absolute_url: true) %>
           </li>
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 0881296e8ba..f6e2d523b5b 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -226,6 +226,14 @@ module PrettyText
     end
   end
 
+  def self.unescape_emoji(title)
+    protect do
+      v8["title"] = title
+      decorate_context(v8)
+      v8.eval("Discourse.Emoji.unescape(title)")
+    end
+  end
+
   def self.cook(text, opts={})
     options = opts.dup