✨ Make fuzzy gitmoji search

carloscuesta · Dec 27, 2019 · 1669034 · 1669034
1 parent 03d06ee
commit 1669034
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 15 deletions.
diff --git a/src/commands/commit/prompts.js b/src/commands/commit/prompts.js
@@ -2,6 +2,7 @@
 import inquirer from 'inquirer'
 
 import configurationVault from '../../utils/configurationVault'
+import filterGitmojis from '../../utils/filterGitmojis'
 import guard from './guard'
 
 const TITLE_MAX_LENGTH_COUNT: number = 48
@@ -29,15 +30,10 @@ export default (gitmojis: Array<Gitmoji>): Array<Object> => [
     type: 'autocomplete',
     source: (answersSoFor: any, input: string) => {
       return Promise.resolve(
-        gitmojis
-          .filter((gitmoji) => {
-            const emoji = gitmoji.name.concat(gitmoji.description).toLowerCase()
-            return !input || emoji.indexOf(input.toLowerCase()) !== -1
-          })
-          .map((gitmoji) => ({
-            name: `${gitmoji.emoji}  - ${gitmoji.description}`,
-            value: gitmoji[configurationVault.getEmojiFormat()]
-          }))
+        filterGitmojis(input, gitmojis).map((gitmoji) => ({
+          name: `${gitmoji.emoji}  - ${gitmoji.description}`,
+          value: gitmoji[configurationVault.getEmojiFormat()]
+        }))
       )
     }
   },

diff --git a/src/commands/search/index.js b/src/commands/search/index.js
@@ -1,16 +1,12 @@
 // @flow
+import filterGitmojis from '../../utils/filterGitmojis'
 import getEmojis from '../../utils/getEmojis'
 import printEmojis from '../../utils/printEmojis'
 
 const search = (query: string) => {
   console.log('query', query)
   return getEmojis()
-    .then((gitmojis) => {
-      return gitmojis.filter((gitmoji) => {
-        const emoji = gitmoji.name.concat(gitmoji.description).toLowerCase()
-        return emoji.indexOf(query.toLowerCase()) !== -1
-      })
-    })
+    .then((gitmojis) => filterGitmojis(query, gitmojis))
     .then((gitmojisFiltered) => printEmojis(gitmojisFiltered))
     .catch((err) => console.error(err))
 }