diff options
| author | Girish S <girish.sonawane@gmail.com> | 2015-10-30 12:44:00 +0530 |
|---|---|---|
| committer | Girish S <girish.sonawane@gmail.com> | 2015-10-30 12:44:00 +0530 |
| commit | fec10f5f80a554eece55a17c479b04bb42d2dea0 (patch) | |
| tree | e805e3276cde31609a472c8b88261fafbdd04ed9 /web | |
| parent | 8cf5687e8af4d2f72ccc0bd15fde612738f9141a (diff) | |
| download | chat-fec10f5f80a554eece55a17c479b04bb42d2dea0.tar.gz chat-fec10f5f80a554eece55a17c479b04bb42d2dea0.tar.bz2 chat-fec10f5f80a554eece55a17c479b04bb42d2dea0.zip | |
Show usernames overridden by Incoming Webhooks in notification messages.
fixes PLT-856
Diffstat (limited to 'web')
| -rw-r--r-- | web/react/stores/socket_store.jsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx index 4d69a6716..1cdd390db 100644 --- a/web/react/stores/socket_store.jsx +++ b/web/react/stores/socket_store.jsx @@ -189,7 +189,9 @@ function handleNewPostEvent(msg) { } let username = 'Someone'; - if (UserStore.hasProfile(msg.user_id)) { + if (post.props.override_username && global.window.mm_config.EnablePostUsernameOverride === 'true') { + username = post.props.override_username; + } else if (UserStore.hasProfile(msg.user_id)) { username = UserStore.getProfile(msg.user_id).username; } |