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,8 +21,7 @@ export default function suggest (data) {
   }
 }
 
-function suggestEmoji (emojis) {
+export const suggestEmoji = (emojis) => input => {
-  return input => {
   const noPrefix = input.toLowerCase().substr(1)
   return emojis
     .filter(({ displayText }) => displayText.toLowerCase().startsWith(noPrefix))
@@ -31,8 +30,8 @@ function suggestEmoji (emojis) {
       let bScore = 0
 
       // Make custom emojis a priority
-        aScore += Number(!!a.imageUrl) * 10
+      aScore += a.imageUrl ? 10 : 0
-        bScore += Number(!!b.imageUrl) * 10
+      bScore += b.imageUrl ? 10 : 0
 
       // Sort alphabetically
       const alphabetically = a.displayText > b.displayText ? 1 : -1
@@ -40,10 +39,8 @@ function suggestEmoji (emojis) {
       return bScore - aScore + alphabetically
     })
 }
-}
 
-function suggestUsers (users) {
+export const suggestUsers = (users) => input => {
-  return input => {
   const noPrefix = input.toLowerCase().substr(1)
   return users.filter(
     user =>
@@ -59,14 +56,14 @@ function suggestUsers (users) {
     let bScore = 0
 
     // Matches on screen name (i.e. user@instance) makes a priority
-      aScore += a.screen_name.toLowerCase().startsWith(noPrefix) * 2
+    aScore += a.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
-      bScore += b.screen_name.toLowerCase().startsWith(noPrefix) * 2
+    bScore += b.screen_name.toLowerCase().startsWith(noPrefix) ? 2 : 0
 
     // Matches on name takes second priority
-      aScore += a.name.toLowerCase().startsWith(noPrefix)
+    aScore += a.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
-      bScore += b.name.toLowerCase().startsWith(noPrefix)
+    bScore += b.name.toLowerCase().startsWith(noPrefix) ? 1 : 0
 
-      const diff = bScore * 10 - aScore * 10
+    const diff = (bScore - aScore) * 10
 
     // Then sort alphabetically
     const nameAlphabetically = a.name > b.name ? 1 : -1
@@ -82,4 +79,3 @@ function suggestUsers (users) {
   }))
   /* eslint-enable camelcase */
 }
-}

src/components/post_status_form/post_status_form.vue

@@ -31,7 +31,7 @@
         <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
         <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
       </p>
-      <emoji-input
+      <EmojiInput
         v-if="newStatus.spoilerText || alwaysShowSubject"
         :suggest="emojiSuggestor"
         v-model="newStatus.spoilerText"
@@ -44,8 +44,8 @@
           v-model="newStatus.spoilerText"
           class="form-post-subject"
           />
-      </emoji-input>
+      </EmojiInput>
-      <emoji-input
+      <EmojiInput
         :suggest="emojiUserSuggestor"
         v-model="newStatus.status"
         class="form-control"
@@ -65,7 +65,7 @@
           class="form-post-body"
         >
         </textarea>
-      </emoji-input>
+      </EmojiInput>
       <div class="visibility-tray">
         <div class="text-format" v-if="formattingOptionsEnabled">
           <label for="post-content-type" class="select">

src/components/user_settings/user_settings.vue

@@ -22,20 +22,20 @@
           <div class="setting-item" >
             <h2>{{$t('settings.name_bio')}}</h2>
             <p>{{$t('settings.name')}}</p>
-            <emoji-input :suggest="emojiSuggestor" v-model="newName">
+            <EmojiInput :suggest="emojiSuggestor" v-model="newName">
               <input
                 v-model="newName"
                 id="username"
                 classname="name-changer"
               />
-            </emoji-input>
+            </EmojiInput>
             <p>{{$t('settings.bio')}}</p>
-            <emoji-input :suggest="emojiUserSuggestor" v-model="newBio">
+            <EmojiInput :suggest="emojiUserSuggestor" v-model="newBio">
               <textarea
                 v-model="newBio"
                 classname="bio"
                 />
-            </emoji-input>
+            </EmojiInput>
             <p>
               <input type="checkbox" v-model="newLocked" id="account-locked">
               <label for="account-locked">{{$t('settings.lock_account_description')}}</label>