emoji display support

walkeriniraq · Jan 26, 2016 · 9af35a4 · 9af35a4
1 parent 75d12a1
commit 9af35a4
Show file tree

Hide file tree

Showing 26 changed files with 12 additions and 4 deletions.
diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
@@ -79,6 +79,11 @@
   }
 }
 
+img.emoji {
+  height: 18px;
+  width: 18px;
+}
+
 .input {
   width: 100%;
   border: 1px solid #ccc;
@@ -672,4 +677,4 @@ img.photo {
 
 .right {
   float: right !important;
-}
+}
diff --git a/app/decorators/base_decorator.rb b/app/decorators/base_decorator.rb
@@ -3,12 +3,15 @@ class BaseDecorator < Draper::Decorator
   include Twitter::Autolink
   include CruiseMonkeyHelper
 
+  @@emojiRE = Regexp.new('\:(buffet|die-ship|die|fez|hottub|joco|pirate|ship-front|ship|towel-monkey|tropical-drink|zombie)\:')
+  @@emojiReplace = '<img src="/img/emoji/small/\1.png" class="emoji">'
+
   def clean_text(text)
-    CGI.escapeHTML(text)
+    CGI.escapeHTML(text).gsub(@@emojiRE, @@emojiReplace)
   end
 
   def clean_text_with_cr(text)
-    CGI.escapeHTML(text || '').gsub("\n", '<br />')
+    CGI.escapeHTML(text || '').gsub("\n", '<br />').gsub(@@emojiRE, @@emojiReplace)
   end
 
   def twitarr_auto_linker(text, options = {})
@@ -22,4 +25,4 @@ def twitarr_auto_linker(text, options = {})
     end
   end
 
-end
+end
diff --git a/public/img/emoji/large/buffet.png b/public/img/emoji/large/buffet.png
diff --git a/public/img/emoji/large/die-ship.png b/public/img/emoji/large/die-ship.png
diff --git a/public/img/emoji/large/die.png b/public/img/emoji/large/die.png
diff --git a/public/img/emoji/large/fez.png b/public/img/emoji/large/fez.png
diff --git a/public/img/emoji/large/hottub.png b/public/img/emoji/large/hottub.png
diff --git a/public/img/emoji/large/joco.png b/public/img/emoji/large/joco.png
diff --git a/public/img/emoji/large/pirate.png b/public/img/emoji/large/pirate.png
diff --git a/public/img/emoji/large/ship-front.png b/public/img/emoji/large/ship-front.png
diff --git a/public/img/emoji/large/ship.png b/public/img/emoji/large/ship.png
diff --git a/public/img/emoji/large/towel-monkey.png b/public/img/emoji/large/towel-monkey.png
diff --git a/public/img/emoji/large/tropical-drink.png b/public/img/emoji/large/tropical-drink.png
diff --git a/public/img/emoji/large/zombie.png b/public/img/emoji/large/zombie.png
diff --git a/public/img/emoji/small/buffet.png b/public/img/emoji/small/buffet.png
diff --git a/public/img/emoji/small/die-ship.png b/public/img/emoji/small/die-ship.png
diff --git a/public/img/emoji/small/die.png b/public/img/emoji/small/die.png
diff --git a/public/img/emoji/small/fez.png b/public/img/emoji/small/fez.png
diff --git a/public/img/emoji/small/hottub.png b/public/img/emoji/small/hottub.png
diff --git a/public/img/emoji/small/joco.png b/public/img/emoji/small/joco.png
diff --git a/public/img/emoji/small/pirate.png b/public/img/emoji/small/pirate.png
diff --git a/public/img/emoji/small/ship-front.png b/public/img/emoji/small/ship-front.png
diff --git a/public/img/emoji/small/ship.png b/public/img/emoji/small/ship.png
diff --git a/public/img/emoji/small/towel-monkey.png b/public/img/emoji/small/towel-monkey.png
diff --git a/public/img/emoji/small/tropical-drink.png b/public/img/emoji/small/tropical-drink.png
diff --git a/public/img/emoji/small/zombie.png b/public/img/emoji/small/zombie.png