summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorElias Nahum <nahumhbl@gmail.com>2016-02-25 04:24:03 -0300
committerElias Nahum <nahumhbl@gmail.com>2016-02-25 04:24:03 -0300
commitf0084229a5ca6a0c51addb888237f6eb42becbfb (patch)
tree7f6f2e82b5e87d3d3c9fc6249630891c22799117 /web
parent6f319fc64c9a947d8f076262aaab51354cb39ecd (diff)
downloadchat-f0084229a5ca6a0c51addb888237f6eb42becbfb.tar.gz
chat-f0084229a5ca6a0c51addb888237f6eb42becbfb.tar.bz2
chat-f0084229a5ca6a0c51addb888237f6eb42becbfb.zip
Member show on Activate and Hide on deactivate from channel member list and at_mention
Diffstat (limited to 'web')
-rw-r--r--web/react/components/member_list_team_item.jsx3
-rw-r--r--web/react/components/suggestion/at_mention_provider.jsx2
2 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx
index 7b1f6170d..23bc10781 100644
--- a/web/react/components/member_list_team_item.jsx
+++ b/web/react/components/member_list_team_item.jsx
@@ -2,6 +2,7 @@
// See License.txt for license information.
import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
import * as Client from '../utils/client.jsx';
import * as AsyncClient from '../utils/async_client.jsx';
import * as Utils from '../utils/utils.jsx';
@@ -71,6 +72,7 @@ export default class MemberListTeamItem extends React.Component {
Client.updateActive(this.props.user.id, true,
() => {
AsyncClient.getProfiles();
+ AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
},
(err) => {
this.setState({serverError: err.message});
@@ -81,6 +83,7 @@ export default class MemberListTeamItem extends React.Component {
Client.updateActive(this.props.user.id, false,
() => {
AsyncClient.getProfiles();
+ AsyncClient.getChannelExtraInfo(ChannelStore.getCurrentId());
},
(err) => {
this.setState({serverError: err.message});
diff --git a/web/react/components/suggestion/at_mention_provider.jsx b/web/react/components/suggestion/at_mention_provider.jsx
index c4e1314c9..4dc72f69a 100644
--- a/web/react/components/suggestion/at_mention_provider.jsx
+++ b/web/react/components/suggestion/at_mention_provider.jsx
@@ -83,7 +83,7 @@ export default class AtMentionProvider {
if (captured) {
const usernamePrefix = captured[1];
- const users = UserStore.getProfiles();
+ const users = UserStore.getActiveOnlyProfiles(true);
let filtered = [];
for (const id of Object.keys(users)) {