diff options
author | nickago <ngonella@calpoly.edu> | 2015-07-01 12:41:36 -0700 |
---|---|---|
committer | nickago <ngonella@calpoly.edu> | 2015-07-01 12:41:36 -0700 |
commit | fd310e382a2cc1a9779ef28dee7fea9476bb425f (patch) | |
tree | 403e6ec6d8ccbe5f0742f2e9faddea71068f9745 /web/react/components/post_list.jsx | |
parent | 5e204030ffe91aaab090a26547185017edf1d2e1 (diff) | |
download | chat-fd310e382a2cc1a9779ef28dee7fea9476bb425f.tar.gz chat-fd310e382a2cc1a9779ef28dee7fea9476bb425f.tar.bz2 chat-fd310e382a2cc1a9779ef28dee7fea9476bb425f.zip |
Finally fixed the git weirdness
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r-- | web/react/components/post_list.jsx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index e37de8d88..142d7ab1c 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -324,13 +324,7 @@ module.exports = React.createClass({ if (order.length > 0 && order.length % Constants.POST_CHUNK_SIZE === 0) { more_messages = <a ref="loadmore" className="more-messages-text theme" href="#" onClick={this.getMorePosts}>Load more messages</a>; } else if (channel.type === 'D') { - var userIds = channel.name.split('__'); - var teammate; - if (userIds.length === 2 && userIds[0] === user_id) { - teammate = UserStore.getProfile(userIds[1]); - } else if (userIds.length === 2 && userIds[1] === user_id) { - teammate = UserStore.getProfile(userIds[0]); - } + var teammate = utils.getDirectTeammate(channel.id) if (teammate) { var teammate_name = teammate.full_name.length > 0 ? teammate.full_name : teammate.username; |