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/images/emoji/1f1e8-1f1e6.png | Bin 0 -> 4339 bytes
 webapp/images/emoji/1f1f5-1f1f0.png | Bin 0 -> 4604 bytes
 webapp/images/emoji/1f641.png       | Bin 0 -> 6388 bytes
 webapp/images/emoji/1f642.png       | Bin 0 -> 6362 bytes
 webapp/images/emoji/1f643.png       | Bin 0 -> 6519 bytes
 webapp/utils/emoji.json             |  48 ++++++++++++++++++++++++++++++++++++
 webapp/utils/emoticons.jsx          |   4 +--
 7 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 webapp/images/emoji/1f1e8-1f1e6.png
 create mode 100644 webapp/images/emoji/1f1f5-1f1f0.png
 create mode 100644 webapp/images/emoji/1f641.png
 create mode 100644 webapp/images/emoji/1f642.png
 create mode 100644 webapp/images/emoji/1f643.png

diff --git a/webapp/images/emoji/1f1e8-1f1e6.png b/webapp/images/emoji/1f1e8-1f1e6.png
new file mode 100644
index 000000000..57f487c22
Binary files /dev/null and b/webapp/images/emoji/1f1e8-1f1e6.png differ
diff --git a/webapp/images/emoji/1f1f5-1f1f0.png b/webapp/images/emoji/1f1f5-1f1f0.png
new file mode 100644
index 000000000..17c4f6db5
Binary files /dev/null and b/webapp/images/emoji/1f1f5-1f1f0.png differ
diff --git a/webapp/images/emoji/1f641.png b/webapp/images/emoji/1f641.png
new file mode 100644
index 000000000..7041b0804
Binary files /dev/null and b/webapp/images/emoji/1f641.png differ
diff --git a/webapp/images/emoji/1f642.png b/webapp/images/emoji/1f642.png
new file mode 100644
index 000000000..abd534797
Binary files /dev/null and b/webapp/images/emoji/1f642.png differ
diff --git a/webapp/images/emoji/1f643.png b/webapp/images/emoji/1f643.png
new file mode 100644
index 000000000..3cb9f962f
Binary files /dev/null and b/webapp/images/emoji/1f643.png differ
diff --git a/webapp/utils/emoji.json b/webapp/utils/emoji.json
index 1ccb129f2..cdce89325 100644
--- a/webapp/utils/emoji.json
+++ b/webapp/utils/emoji.json
@@ -8123,6 +8123,54 @@
   , "tags": [
     ]
   }
+, {
+    "emoji": "🇨🇦"
+  , "description": "regional indicator symbol letter c + regional indicator symbol letter a"
+  , "aliases": [
+      "ca",
+      "eh"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  }
+, {
+    "emoji": "🇵🇰"
+  , "description": "regional indicator symbol letter p + regional indicator symbol letter k"
+  , "aliases": [
+      "pk"
+    ]
+  , "tags": [
+      "pakistan"
+    ]
+  }
+, {
+    "emoji": "🙂"
+  , "description": "slightly smiling face"
+  , "aliases": [
+      "slightly_smiling_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙁"
+  , "description": "slightly frowning face"
+  , "aliases": [
+      "slightly_frowning_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙃"
+  , "description": "upside-down face"
+  , "aliases": [
+      "upside_down_face"
+    ]
+  , "tags": [
+    ]
+  }
 , {
     "aliases": [
       "basecamp"
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