diff options
| author | hmhealey <harrisonmhealey@gmail.com> | 2015-07-13 15:39:53 -0400 |
|---|---|---|
| committer | hmhealey <harrisonmhealey@gmail.com> | 2015-07-17 15:22:56 -0400 |
| commit | 079538d9e7d22cd8d5f782f4f7434858bd80d914 (patch) | |
| tree | e6fe87c2dd1fc4a1782a985b7a0ec961f85f3aa9 /web/react/stores/user_store.jsx | |
| parent | fb42a74613a6a5c4ebe316cf6e528d74aa74bb78 (diff) | |
| download | chat-079538d9e7d22cd8d5f782f4f7434858bd80d914.tar.gz chat-079538d9e7d22cd8d5f782f4f7434858bd80d914.tar.bz2 chat-079538d9e7d22cd8d5f782f4f7434858bd80d914.zip | |
Use User.FirstName for notifications instead of trying to determine it from User.Nickname
Diffstat (limited to 'web/react/stores/user_store.jsx')
| -rw-r--r-- | web/react/stores/user_store.jsx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx index c293469e5..e417e72ff 100644 --- a/web/react/stores/user_store.jsx +++ b/web/react/stores/user_store.jsx @@ -180,11 +180,7 @@ var UserStore = assign({}, EventEmitter.prototype, { if (user && user.notify_props && user.notify_props.mention_keys) { var keys = user.notify_props.mention_keys.split(','); - if (user.nickname.length > 0 && user.notify_props.first_name === "true") { - var first = user.nickname.split(' ')[0]; - if (first.length > 0) keys.push(first); - } - + if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name); if (user.notify_props.all === "true") keys.push('@all'); if (user.notify_props.channel === "true") keys.push('@channel'); |