summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_list.jsx
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-10-05 08:46:23 -0400
committerJoramWilander <jwawilander@gmail.com>2015-10-05 08:46:23 -0400
commit2a23d90ca6528ffaaf38365d549682de0613e922 (patch)
tree593cfe75817e7dbadc2183b969417ca5ee7408c2 /web/react/components/post_list.jsx
parent11903a38341eb55bb4c6f26ea141eccb90beabe2 (diff)
downloadchat-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_list.jsx')
-rw-r--r--web/react/components/post_list.jsx8
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index 0354d132c..b90197ac4 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -520,13 +520,13 @@ export default class PostList extends React.Component {
// the previous post was made by the same user as the current post,
// the previous post is not a comment,
// the current post is not a comment,
- // the current profile pic is not overridden
- // and the previous profile pic is not overridden
+ // the current post is not from a webhook
+ // and the previous post is not from a webhook
if ((prevPost.user_id === post.user_id) &&
!utils.isComment(prevPost) &&
!utils.isComment(post) &&
- (!post.props || !post.props.override_icon_url) &&
- (!prevPost.props || !prevPost.props.override_icon_url)) {
+ (!post.props || !post.props.from_webhook) &&
+ (!prevPost.props || !prevPost.props.from_webhook)) {
hideProfilePic = true;
}
}