|
|
@ -75,7 +75,7 @@ const PostStatusForm = {
|
|
|
|
const firstchar = this.textAtCaret.charAt(0)
|
|
|
|
const firstchar = this.textAtCaret.charAt(0)
|
|
|
|
if (firstchar === '@') {
|
|
|
|
if (firstchar === '@') {
|
|
|
|
const matchedUsers = filter(this.users, (user) => (String(user.name + user.screen_name)).toUpperCase()
|
|
|
|
const matchedUsers = filter(this.users, (user) => (String(user.name + user.screen_name)).toUpperCase()
|
|
|
|
.match(this.textAtCaret.slice(1).toUpperCase()))
|
|
|
|
.startsWith(this.textAtCaret.slice(1).toUpperCase()))
|
|
|
|
if (matchedUsers.length <= 0) {
|
|
|
|
if (matchedUsers.length <= 0) {
|
|
|
|
return false
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -89,7 +89,7 @@ const PostStatusForm = {
|
|
|
|
}))
|
|
|
|
}))
|
|
|
|
} else if (firstchar === ':') {
|
|
|
|
} else if (firstchar === ':') {
|
|
|
|
if (this.textAtCaret === ':') { return }
|
|
|
|
if (this.textAtCaret === ':') { return }
|
|
|
|
const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.match(this.textAtCaret.slice(1)))
|
|
|
|
const matchedEmoji = filter(this.emoji.concat(this.customEmoji), (emoji) => emoji.shortcode.startsWith(this.textAtCaret.slice(1)))
|
|
|
|
if (matchedEmoji.length <= 0) {
|
|
|
|
if (matchedEmoji.length <= 0) {
|
|
|
|
return false
|
|
|
|
return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|