diff options
Diffstat (limited to 'webapp/stores')
| -rw-r--r-- | webapp/stores/modal_store.jsx | 1 | ||||
| -rw-r--r-- | webapp/stores/notification_store.jsx | 3 | ||||
| -rw-r--r-- | webapp/stores/user_store.jsx | 7 |
3 files changed, 10 insertions, 1 deletions
diff --git a/webapp/stores/modal_store.jsx b/webapp/stores/modal_store.jsx index 9961475b2..b1c2887df 100644 --- a/webapp/stores/modal_store.jsx +++ b/webapp/stores/modal_store.jsx @@ -38,6 +38,7 @@ class ModalStoreClass extends EventEmitter { case ActionTypes.TOGGLE_GET_POST_LINK_MODAL: case ActionTypes.TOGGLE_GET_TEAM_INVITE_LINK_MODAL: case ActionTypes.TOGGLE_GET_PUBLIC_LINK_MODAL: + case ActionTypes.TOGGLE_DM_MODAL: this.emit(type, value, args); break; } diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx index 58e4433ec..28e5ea65d 100644 --- a/webapp/stores/notification_store.jsx +++ b/webapp/stores/notification_store.jsx @@ -8,6 +8,7 @@ import UserStore from './user_store.jsx'; import ChannelStore from './channel_store.jsx'; import * as UserAgent from 'utils/user_agent.jsx'; import * as Utils from 'utils/utils.jsx'; +import {buildGroupChannelName} from 'utils/channel_utils.jsx'; import * as PostUtils from 'utils/post_utils.jsx'; const ActionTypes = Constants.ActionTypes; @@ -74,6 +75,8 @@ class NotificationStoreClass extends EventEmitter { }; } else if (channel.type === Constants.DM_CHANNEL) { title = Utils.localizeMessage('notification.dm', 'Direct Message'); + } else if (channel.type === Constants.GM_CHANNEL) { + title = buildGroupChannelName(channel.id); } else { title = channel.display_name; } diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index bcc59b690..007d8a5a7 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -414,13 +414,18 @@ class UserStoreClass extends EventEmitter { userIds.splice(index, 1); } - getProfileListInChannel(channelId = ChannelStore.getCurrentId()) { + getProfileListInChannel(channelId = ChannelStore.getCurrentId(), skipCurrent = false) { const userIds = this.profiles_in_channel[channelId] || []; + const currentId = this.getCurrentId(); const profiles = []; for (let i = 0; i < userIds.length; i++) { const profile = this.getProfile(userIds[i]); if (profile) { + if (skipCurrent && profile.id === currentId) { + continue; + } + profiles.push(profile); } } |