diff --git a/app/assets/stylesheets/main.css.scss b/app/assets/stylesheets/main.css.scss
index cc7e95be..05c7078f 100644
--- 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;
-}
\ No newline at end of file
+}
diff --git a/app/decorators/base_decorator.rb b/app/decorators/base_decorator.rb
index 5439ebc8..5ec287b4 100644
--- 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 = ''
+
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", '
')
+ CGI.escapeHTML(text || '').gsub("\n", '
').gsub(@@emojiRE, @@emojiReplace)
end
def twitarr_auto_linker(text, options = {})
@@ -22,4 +25,4 @@ def twitarr_auto_linker(text, options = {})
end
end
-end
\ No newline at end of file
+end
diff --git a/public/img/emoji/large/buffet.png b/public/img/emoji/large/buffet.png
new file mode 100644
index 00000000..87ad099a
Binary files /dev/null and b/public/img/emoji/large/buffet.png differ
diff --git a/public/img/emoji/large/die-ship.png b/public/img/emoji/large/die-ship.png
new file mode 100644
index 00000000..0b29b5ad
Binary files /dev/null and b/public/img/emoji/large/die-ship.png differ
diff --git a/public/img/emoji/large/die.png b/public/img/emoji/large/die.png
new file mode 100644
index 00000000..38378966
Binary files /dev/null and b/public/img/emoji/large/die.png differ
diff --git a/public/img/emoji/large/fez.png b/public/img/emoji/large/fez.png
new file mode 100644
index 00000000..12beb72f
Binary files /dev/null and b/public/img/emoji/large/fez.png differ
diff --git a/public/img/emoji/large/hottub.png b/public/img/emoji/large/hottub.png
new file mode 100644
index 00000000..bb2560c2
Binary files /dev/null and b/public/img/emoji/large/hottub.png differ
diff --git a/public/img/emoji/large/joco.png b/public/img/emoji/large/joco.png
new file mode 100644
index 00000000..ffc14037
Binary files /dev/null and b/public/img/emoji/large/joco.png differ
diff --git a/public/img/emoji/large/pirate.png b/public/img/emoji/large/pirate.png
new file mode 100644
index 00000000..2688345f
Binary files /dev/null and b/public/img/emoji/large/pirate.png differ
diff --git a/public/img/emoji/large/ship-front.png b/public/img/emoji/large/ship-front.png
new file mode 100644
index 00000000..46bad4d6
Binary files /dev/null and b/public/img/emoji/large/ship-front.png differ
diff --git a/public/img/emoji/large/ship.png b/public/img/emoji/large/ship.png
new file mode 100644
index 00000000..a26149d6
Binary files /dev/null and b/public/img/emoji/large/ship.png differ
diff --git a/public/img/emoji/large/towel-monkey.png b/public/img/emoji/large/towel-monkey.png
new file mode 100644
index 00000000..e4033a5d
Binary files /dev/null and b/public/img/emoji/large/towel-monkey.png differ
diff --git a/public/img/emoji/large/tropical-drink.png b/public/img/emoji/large/tropical-drink.png
new file mode 100644
index 00000000..afe11370
Binary files /dev/null and b/public/img/emoji/large/tropical-drink.png differ
diff --git a/public/img/emoji/large/zombie.png b/public/img/emoji/large/zombie.png
new file mode 100644
index 00000000..9fb11c51
Binary files /dev/null and b/public/img/emoji/large/zombie.png differ
diff --git a/public/img/emoji/small/buffet.png b/public/img/emoji/small/buffet.png
new file mode 100644
index 00000000..fce6690e
Binary files /dev/null and b/public/img/emoji/small/buffet.png differ
diff --git a/public/img/emoji/small/die-ship.png b/public/img/emoji/small/die-ship.png
new file mode 100644
index 00000000..27f5d413
Binary files /dev/null and b/public/img/emoji/small/die-ship.png differ
diff --git a/public/img/emoji/small/die.png b/public/img/emoji/small/die.png
new file mode 100644
index 00000000..c3e68d64
Binary files /dev/null and b/public/img/emoji/small/die.png differ
diff --git a/public/img/emoji/small/fez.png b/public/img/emoji/small/fez.png
new file mode 100644
index 00000000..d6258bdd
Binary files /dev/null and b/public/img/emoji/small/fez.png differ
diff --git a/public/img/emoji/small/hottub.png b/public/img/emoji/small/hottub.png
new file mode 100644
index 00000000..eca8b08c
Binary files /dev/null and b/public/img/emoji/small/hottub.png differ
diff --git a/public/img/emoji/small/joco.png b/public/img/emoji/small/joco.png
new file mode 100644
index 00000000..f29b4a69
Binary files /dev/null and b/public/img/emoji/small/joco.png differ
diff --git a/public/img/emoji/small/pirate.png b/public/img/emoji/small/pirate.png
new file mode 100644
index 00000000..239a5cde
Binary files /dev/null and b/public/img/emoji/small/pirate.png differ
diff --git a/public/img/emoji/small/ship-front.png b/public/img/emoji/small/ship-front.png
new file mode 100644
index 00000000..faa8cd73
Binary files /dev/null and b/public/img/emoji/small/ship-front.png differ
diff --git a/public/img/emoji/small/ship.png b/public/img/emoji/small/ship.png
new file mode 100644
index 00000000..20b96dd3
Binary files /dev/null and b/public/img/emoji/small/ship.png differ
diff --git a/public/img/emoji/small/towel-monkey.png b/public/img/emoji/small/towel-monkey.png
new file mode 100644
index 00000000..8cb72cb1
Binary files /dev/null and b/public/img/emoji/small/towel-monkey.png differ
diff --git a/public/img/emoji/small/tropical-drink.png b/public/img/emoji/small/tropical-drink.png
new file mode 100644
index 00000000..e08f7a9e
Binary files /dev/null and b/public/img/emoji/small/tropical-drink.png differ
diff --git a/public/img/emoji/small/zombie.png b/public/img/emoji/small/zombie.png
new file mode 100644
index 00000000..99220426
Binary files /dev/null and b/public/img/emoji/small/zombie.png differ