diff options
| author | Corey Hulen <corey@hulen.com> | 2015-10-30 08:48:27 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-10-30 08:48:27 -0700 |
| commit | 3d54abd3a09d2035ed6f0a019e32edacb3cb9bfd (patch) | |
| tree | 53d420a85848a9f8dbe7f176dfe2d3dba98d5e21 /web | |
| parent | 256be4c14dfd99fc923d497cc6d7dfe3f4e8e3c5 (diff) | |
| parent | fec10f5f80a554eece55a17c479b04bb42d2dea0 (diff) | |
| download | chat-3d54abd3a09d2035ed6f0a019e32edacb3cb9bfd.tar.gz chat-3d54abd3a09d2035ed6f0a019e32edacb3cb9bfd.tar.bz2 chat-3d54abd3a09d2035ed6f0a019e32edacb3cb9bfd.zip | |
Merge pull request #1236 from girishso/webhook-notification
Show usernames overridden by Incoming Webhooks in notification messages.
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; } |