From bee8daf09405594ed665d36a2b510d3e1b4d1f7b Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Wed, 30 Mar 2016 13:34:12 -0400
Subject: Added slight smiling, slighting frowning, upside-down smiling,
 Canada, and Pakistan emojis

---
 webapp/utils/emoticons.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'webapp/utils/emoticons.jsx')

diff --git a/webapp/utils/emoticons.jsx b/webapp/utils/emoticons.jsx
index d3afe372a..86f7a5b7b 100644
--- a/webapp/utils/emoticons.jsx
+++ b/webapp/utils/emoticons.jsx
@@ -7,7 +7,7 @@ import Constants from './constants.jsx';
 import emojis from './emoji.json';
 
 const emoticonPatterns = {
-    smile: /(^|\s)(:-?\))(?=$|\s)/g, // :)
+    slightly_smiling_face: /(^|\s)(:-?\))(?=$|\s)/g, // :)
     wink: /(^|\s)(;-?\))(?=$|\s)/g, // ;)
     open_mouth: /(^|\s)(:o)(?=$|\s)/gi, // :o
     scream: /(^|\s)(:-o)(?=$|\s)/gi, // :-o
@@ -16,7 +16,7 @@ const emoticonPatterns = {
     stuck_out_tongue_closed_eyes: /(^|\s)(x-d)(?=$|\s)/gi, // x-d
     stuck_out_tongue: /(^|\s)(:-?p)(?=$|\s)/gi, // :p
     rage: /(^|\s)(:-?[\[@])(?=$|\s)/g, // :@
-    frowning: /(^|\s)(:-?\()(?=$|\s)/g, // :(
+    slightly_frowning_face: /(^|\s)(:-?\()(?=$|\s)/g, // :(
     cry: /(^|\s)(:['’]-?\(|:&#x27;\(|:&#39;\()(?=$|\s)/g, // :`(
     confused: /(^|\s)(:-?\/)(?=$|\s)/g, // :/
     confounded: /(^|\s)(:-?s)(?=$|\s)/gi, // :s
-- 
cgit v1.2.3-1-g7c22

