Merge pull request #28 from matteoauger/feature/emoji-multiple-words

Feature/emoji multiple words
start-again · Oct 4, 2020 · 3b59516 · 3b59516
2 parents afbf047 + 7801a1a
commit 3b59516
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lang/en.js b/lang/en.js
@@ -15,7 +15,7 @@ module.exports = {
       emoji: '👻',
     },
     {
-      name: 'halloween',
+      name: ['halloween', 'pumpkin'],
       emoji: '🎃',
     },
     {

diff --git a/utils/reactMessage.js b/utils/reactMessage.js
@@ -1,7 +1,15 @@
 const { getGuild } = require('../models/servers')
 
-String.prototype.contains = function(toCheck) {
-  return this.indexOf(toCheck) >= 0;
+String.prototype.contains = function (toCheck) {
+  return this.indexOf(toCheck) >= 0
+}
+
+const translationNameContainsWord = (translationName, fullMessage) => {
+  if (translationName instanceof Array) {
+    return translationName.map((n) => fullMessage.contains(n)).reduce((a, b) => a || b)
+  } else {
+    return fullMessage.contains(translationName)
+  }
 }
 
 module.exports = async (guildId, message) => {
@@ -10,6 +18,6 @@ module.exports = async (guildId, message) => {
   const fullMessage = message.content.toLowerCase()
 
   translation.words.forEach((w) => {
-    if (fullMessage.contains(w.name)) message.react(w.emoji)
+    if (translationNameContainsWord(w.name, fullMessage)) message.react(w.emoji)
   })
 }