|
|
|
@ -1,4 +1,3 @@ |
|
|
|
|
import { debounce } from 'lodash' |
|
|
|
|
/** |
|
|
|
|
* suggest - generates a suggestor function to be used by emoji-input |
|
|
|
|
* data: object providing source information for specific types of suggestions: |
|
|
|
@ -11,19 +10,19 @@ import { debounce } from 'lodash' |
|
|
|
|
* doesn't support user linking you can just provide only emoji. |
|
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
const debounceUserSearch = debounce((data, input) => { |
|
|
|
|
data.updateUsersList(input) |
|
|
|
|
}, 500) |
|
|
|
|
|
|
|
|
|
export default data => input => { |
|
|
|
|
const firstChar = input[0] |
|
|
|
|
if (firstChar === ':' && data.emoji) { |
|
|
|
|
return suggestEmoji(data.emoji)(input) |
|
|
|
|
} |
|
|
|
|
if (firstChar === '@' && data.users) { |
|
|
|
|
return suggestUsers(data)(input) |
|
|
|
|
export default data => { |
|
|
|
|
const emojiCurry = suggestEmoji(data.emoji) |
|
|
|
|
const usersCurry = data.store && suggestUsers(data.store) |
|
|
|
|
return input => { |
|
|
|
|
const firstChar = input[0] |
|
|
|
|
if (firstChar === ':' && data.emoji) { |
|
|
|
|
return emojiCurry(input) |
|
|
|
|
} |
|
|
|
|
if (firstChar === '@' && usersCurry) { |
|
|
|
|
return usersCurry(input) |
|
|
|
|
} |
|
|
|
|
return [] |
|
|
|
|
} |
|
|
|
|
return [] |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
export const suggestEmoji = emojis => input => { |
|
|
|
@ -57,50 +56,75 @@ export const suggestEmoji = emojis => input => { |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
export const suggestUsers = data => input => { |
|
|
|
|
const noPrefix = input.toLowerCase().substr(1) |
|
|
|
|
const users = data.users |
|
|
|
|
|
|
|
|
|
const newUsers = 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 + ' ' |
|
|
|
|
})) |
|
|
|
|
|
|
|
|
|
// BE search users to get more comprehensive results
|
|
|
|
|
if (data.updateUsersList) { |
|
|
|
|
debounceUserSearch(data, noPrefix) |
|
|
|
|
export const suggestUsers = ({ dispatch, state }) => { |
|
|
|
|
// Keep some persistent values in closure, most importantly for the
|
|
|
|
|
// custom debounce to work. Lodash debounce does not return a promise.
|
|
|
|
|
let suggestions = [] |
|
|
|
|
let previousQuery = '' |
|
|
|
|
let timeout = null |
|
|
|
|
let cancelUserSearch = null |
|
|
|
|
|
|
|
|
|
const userSearch = (query) => dispatch('searchUsers', { query }) |
|
|
|
|
const debounceUserSearch = (query) => { |
|
|
|
|
cancelUserSearch && cancelUserSearch() |
|
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
|
timeout = setTimeout(() => { |
|
|
|
|
userSearch(query).then(resolve).catch(reject) |
|
|
|
|
}, 300) |
|
|
|
|
cancelUserSearch = () => { |
|
|
|
|
clearTimeout(timeout) |
|
|
|
|
resolve([]) |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return async input => { |
|
|
|
|
const noPrefix = input.toLowerCase().substr(1) |
|
|
|
|
if (previousQuery === noPrefix) return suggestions |
|
|
|
|
|
|
|
|
|
suggestions = [] |
|
|
|
|
previousQuery = noPrefix |
|
|
|
|
// Fetch more and wait, don't fetch if there's the 2nd @ because
|
|
|
|
|
// the backend user search can't deal with it.
|
|
|
|
|
// Reference semantics make it so that we get the updated data after
|
|
|
|
|
// the await.
|
|
|
|
|
if (!noPrefix.includes('@')) { |
|
|
|
|
await debounceUserSearch(noPrefix) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
const newSuggestions = state.users.users.filter( |
|
|
|
|
user => |
|
|
|
|
user.screen_name.toLowerCase().startsWith(noPrefix) || |
|
|
|
|
user.name.toLowerCase().startsWith(noPrefix) |
|
|
|
|
).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 */ |
|
|
|
|
|
|
|
|
|
suggestions = newSuggestions || [] |
|
|
|
|
return suggestions |
|
|
|
|
} |
|
|
|
|
return newUsers |
|
|
|
|
/* eslint-enable camelcase */ |
|
|
|
|
} |
|
|
|
|