diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-10-05 08:46:23 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-10-05 08:46:23 -0400 |
| commit | 2a23d90ca6528ffaaf38365d549682de0613e922 (patch) | |
| tree | 593cfe75817e7dbadc2183b969417ca5ee7408c2 /web/react/components/post.jsx | |
| parent | 11903a38341eb55bb4c6f26ea141eccb90beabe2 (diff) | |
| download | chat-2a23d90ca6528ffaaf38365d549682de0613e922.tar.gz chat-2a23d90ca6528ffaaf38365d549682de0613e922.tar.bz2 chat-2a23d90ca6528ffaaf38365d549682de0613e922.zip | |
Add config options for overriding username and icon, and add BOT indicator next to webhook posts.
Diffstat (limited to 'web/react/components/post.jsx')
| -rw-r--r-- | web/react/components/post.jsx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index ba53054cd..ac9c9252e 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -159,8 +159,10 @@ export default class Post extends React.Component { var profilePic = null; if (!this.props.hideProfilePic) { let src = '/api/v1/users/' + post.user_id + '/image?time=' + timestamp; - if (post.props && post.props.override_icon_url) { - src = post.props.override_icon_url; + if (post.props && post.props.from_webhook && global.window.config.EnablePostIconOverride === 'true') { + if (post.props.override_icon_url) { + src = post.props.override_icon_url; + } } profilePic = ( |