review

src/components/emoji-input/emoji-input.js

@@ -8,7 +8,7 @@ import { take } from 'lodash'
  * Intended usage is:
  * <emoji-input v-model="something">
  *   <input v-model="something"/>
- * </emoji-input>
+ * </EmojiInput>
  *
  * Works only with <input> and <textarea>. Intended to use with only one nested
  * input. It will find first input or textarea and work with that, multiple

src/components/emoji-input/suggestor.js

@@ -21,65 +21,61 @@ export default function suggest (data) {
   }
 }
 
-function suggestEmoji (emojis) {
-  return input => {
-    const noPrefix = input.toLowerCase().substr(1)
-    return emojis
-      .filter(({ displayText }) => displayText.toLowerCase().startsWith(noPrefix))
-      .sort((a, b) => {
-        let aScore = 0
-        let bScore = 0
-
-        // Make custom emojis a priority
-        aScore += Number(!!a.imageUrl) * 10
-        bScore += Number(!!b.imageUrl) * 10
-
-        // Sort alphabetically
-        const alphabetically = a.displayText > b.displayText ? 1 : -1
-
-        return bScore - aScore + alphabetically
-      })
-  }
-}
-
-function suggestUsers (users) {
-  return input => {
-    const noPrefix = input.toLowerCase().substr(1)
-    return users.filter(
-      user =>
-        user.screen_name.toLowerCase().startsWith(noPrefix) ||
-        user.name.toLowerCase().startsWith(noPrefix)
-
-      /* taking only 20 results so that sorting is a bit cheaper, we display
-       * only 5 anyway. could be inaccurate, but we ideally we should query
-       * backend anyway
-       */
-    ).slice(0, 20).sort((a, b) => {
+export const suggestEmoji = (emojis) => input => {
+  const noPrefix = input.toLowerCase().substr(1)
+  return emojis
+    .filter(({ displayText }) => displayText.toLowerCase().startsWith(noPrefix))
+    .sort((a, b) => {
       let aScore = 0
       let bScore = 0
 
-      // Matches on screen name (i.e. user@instance) makes a priority
-      aScore += a.screen_name.toLowerCase().startsWith(noPrefix) * 2
-      bScore += b.screen_name.toLowerCase().startsWith(noPrefix) * 2
+      // Make custom emojis a priority
+      aScore += a.imageUrl ? 10 : 0
+      bScore += b.imageUrl ? 10 : 0
 
-      // Matches on name takes second priority
-      aScore += a.name.toLowerCase().startsWith(noPrefix)
-      bScore += b.name.toLowerCase().startsWith(noPrefix)
+      // Sort alphabetically
+      const alphabetically = a.displayText > b.displayText ? 1 : -1
 
-      const diff = bScore * 10 - aScore * 10
-
-      // Then sort alphabetically
-      const nameAlphabetically = a.name > b.name ? 1 : -1
-      const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
-
-      return diff + nameAlphabetically + screenNameAlphabetically
-      /* eslint-disable camelcase */
-    }).map(({ screen_name, name, profile_image_url_original }) => ({
-      displayText: screen_name,
-      detailText: name,
-      imageUrl: profile_image_url_original,
-      replacement: '@' + screen_name + ' '
-    }))
-    /* eslint-enable camelcase */
-  }
+      return bScore - aScore + alphabetically
+    })
+}
+
+export const suggestUsers = (users) => input => {
+  const noPrefix = input.toLowerCase().substr(1)
+  return users.filter(
+    user =>
+      user.screen_name.toLowerCase().startsWith(noPrefix) ||
+      user.name.toLowerCase().startsWith(noPrefix)
+
+    /* taking only 20 results so that sorting is a bit cheaper, we display
+     * only 5 anyway. could be inaccurate, but we ideally we should query
+     * backend anyway
+     */
+  ).slice(0, 20).sort((a, b) => {
+    let aScore = 0
+    let bScore = 0
+
+    // Matches on screen name (i.e. user@instance) makes a priority
+    aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
+    bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
+
+    // Matches on name takes second priority
+    aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
+    bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
+
+    const diff = (bScore - aScore) * 10
+
+    // Then sort alphabetically
+    const nameAlphabetically = a.name > b.name ? 1 : -1
+    const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
+
+    return diff + nameAlphabetically + screenNameAlphabetically
+    /* eslint-disable camelcase */
+  }).map(({ screen_name, name, profile_image_url_original }) => ({
+    displayText: screen_name,
+    detailText: name,
+    imageUrl: profile_image_url_original,
+    replacement: '@' + screen_name + ' '
+  }))
+  /* eslint-enable camelcase */
 }