From 4956a7198b16630e394e93e69a571df3638f3a99 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Sun, 9 Jul 2017 06:36:30 +0800
Subject: Revert "PLT-7039 Use loadProfilesAndStatusesForPosts from the redux
 library (#6881)" (#6882)

This reverts commit 250a344d04d8e682a98760bdc378d1a5c46f31e6.
---
 webapp/actions/post_actions.jsx      | 30 ++++++++++++++++++++++++++----
 webapp/actions/websocket_actions.jsx |  8 +++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/webapp/actions/post_actions.jsx b/webapp/actions/post_actions.jsx
index ae9f069f5..43204a543 100644
--- a/webapp/actions/post_actions.jsx
+++ b/webapp/actions/post_actions.jsx
@@ -19,6 +19,7 @@ import store from 'stores/redux_store.jsx';
 const dispatch = store.dispatch;
 const getState = store.getState;
 
+import {getProfilesByIds} from 'mattermost-redux/actions/users';
 import * as PostActions from 'mattermost-redux/actions/posts';
 import {getMyChannelMember} from 'mattermost-redux/actions/channels';
 
@@ -54,7 +55,7 @@ function completePostReceive(post, websocketMessageProps) {
         PostActions.getPostThread(post.root_id)(dispatch, getState).then(
             (data) => {
                 dispatchPostActions(post, websocketMessageProps);
-                PostActions.getProfilesAndStatusesForPosts(data.posts, dispatch, getState);
+                loadProfilesForPosts(data.posts);
             }
         );
 
@@ -122,7 +123,7 @@ export function getFlaggedPosts() {
                 is_pinned_posts: false
             });
 
-            PostActions.getProfilesAndStatusesForPosts(data.posts, dispatch, getState);
+            loadProfilesForPosts(data.posts);
         }
     ).catch(
         () => {} //eslint-disable-line no-empty-function
@@ -146,13 +147,34 @@ export function getPinnedPosts(channelId = ChannelStore.getCurrentId()) {
                 is_pinned_posts: true
             });
 
-            PostActions.getProfilesAndStatusesForPosts(data.posts, dispatch, getState);
+            loadProfilesForPosts(data.posts);
         }
     ).catch(
         () => {} //eslint-disable-line no-empty-function
     );
 }
 
+export function loadProfilesForPosts(posts) {
+    const profilesToLoad = {};
+    for (const pid in posts) {
+        if (!posts.hasOwnProperty(pid)) {
+            continue;
+        }
+
+        const post = posts[pid];
+        if (!UserStore.hasProfile(post.user_id)) {
+            profilesToLoad[post.user_id] = true;
+        }
+    }
+
+    const list = Object.keys(profilesToLoad);
+    if (list.length === 0) {
+        return;
+    }
+
+    getProfilesByIds(list)(dispatch, getState);
+}
+
 export function addReaction(channelId, postId, emojiName) {
     PostActions.addReaction(postId, emojiName)(dispatch, getState);
 }
@@ -230,7 +252,7 @@ export function performSearch(terms, isMentionSearch, success, error) {
                 is_mention_search: isMentionSearch
             });
 
-            PostActions.getProfilesAndStatusesForPosts(data.posts, dispatch, getState);
+            loadProfilesForPosts(data.posts);
 
             if (success) {
                 success(data);
diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 82c9df617..dec3edd12 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -15,7 +15,7 @@ import WebSocketClient from 'client/web_websocket_client.jsx';
 import * as WebrtcActions from './webrtc_actions.jsx';
 
 import * as GlobalActions from 'actions/global_actions.jsx';
-import {handleNewPost} from 'actions/post_actions.jsx';
+import {handleNewPost, loadProfilesForPosts} from 'actions/post_actions.jsx';
 import {loadProfilesForSidebar} from 'actions/user_actions.jsx';
 import {loadChannelsForCurrentUser} from 'actions/channel_actions.jsx';
 import * as StatusActions from 'actions/status_actions.jsx';
@@ -34,7 +34,7 @@ import {getSiteURL} from 'utils/url.jsx';
 
 import * as TeamActions from 'mattermost-redux/actions/teams';
 import {viewChannel, getChannelAndMyMember, getChannelStats} from 'mattermost-redux/actions/channels';
-import {getPosts, getProfilesAndStatusesForPosts} from 'mattermost-redux/actions/posts';
+import {getPosts} from 'mattermost-redux/actions/posts';
 import {setServerVersion} from 'mattermost-redux/actions/general';
 import {ChannelTypes, TeamTypes, UserTypes, PostTypes, EmojiTypes} from 'mattermost-redux/action_types';
 
@@ -242,7 +242,9 @@ function handleNewPostEvent(msg) {
     const post = JSON.parse(msg.data.post);
     handleNewPost(post, msg);
 
-    getProfilesAndStatusesForPosts([post], dispatch, getState);
+    const posts = {};
+    posts[post.id] = post;
+    loadProfilesForPosts(posts);
 
     if (post.user_id !== UserStore.getCurrentId()) {
         UserStore.setStatus(post.user_id, UserStatuses.ONLINE);
-- 
cgit v1.2.3-1-g7c22