diff --git a/api/post.go b/api/post.go index b4c70fab2c..984b79adf9 100644 --- a/api/post.go +++ b/api/post.go @@ -565,7 +565,7 @@ func sendNotifications(teamId string, post *model.Post, team *model.Team, channe } mentionedUserIds := make(map[string]bool) - alwaysNotifyUserIds := []string{} + allActivityPushUserIds := []string{} hereNotification := false updateMentionChans := []store.StoreChannel{} @@ -629,7 +629,7 @@ func sendNotifications(teamId string, post *model.Post, team *model.Team, channe if profile.NotifyProps["push"] == model.USER_NOTIFY_ALL && (post.UserId != profile.Id || post.Props["from_webhook"] == "true") && !post.IsSystemMessage() { - alwaysNotifyUserIds = append(alwaysNotifyUserIds, profile.Id) + allActivityPushUserIds = append(allActivityPushUserIds, profile.Id) } } } @@ -705,13 +705,28 @@ func sendNotifications(teamId string, post *model.Post, team *model.Team, channe if sendPushNotifications { for _, id := range mentionedUsersList { - if profileMap[id].NotifyProps["push"] != "none" { + var status *model.Status + var err *model.AppError + if status, err = GetStatus(id); err != nil { + status = &model.Status{id, model.STATUS_OFFLINE, 0} + } + + if profileMap[id].StatusAllowsPushNotification(status) { sendPushNotification(post, profileMap[id], channel, senderName, true) } } - for _, id := range alwaysNotifyUserIds { + + for _, id := range allActivityPushUserIds { if _, ok := mentionedUserIds[id]; !ok { - sendPushNotification(post, profileMap[id], channel, senderName, false) + var status *model.Status + var err *model.AppError + if status, err = GetStatus(id); err != nil { + status = &model.Status{id, model.STATUS_OFFLINE, 0} + } + + if profileMap[id].StatusAllowsPushNotification(status) { + sendPushNotification(post, profileMap[id], channel, senderName, false) + } } } } diff --git a/model/user.go b/model/user.go index d8ad54065f..3da862b6bb 100644 --- a/model/user.go +++ b/model/user.go @@ -373,6 +373,24 @@ func (u *User) IsLDAPUser() bool { return false } +func (u *User) StatusAllowsPushNotification(status *Status) bool { + props := u.NotifyProps + + if props["push"] == "none" { + return false + } + + if pushStatus, ok := props["push_status"]; pushStatus == STATUS_ONLINE || !ok { + return true + } else if pushStatus == STATUS_AWAY && (status.Status == STATUS_AWAY || status.Status == STATUS_OFFLINE) { + return true + } else if pushStatus == STATUS_OFFLINE && status.Status == STATUS_OFFLINE { + return true + } + + return false +} + // UserFromJson will decode the input and return a User func UserFromJson(data io.Reader) *User { decoder := json.NewDecoder(data) diff --git a/webapp/components/setting_item_min.jsx b/webapp/components/setting_item_min.jsx index a46a9e455f..1c5fd40f3a 100644 --- a/webapp/components/setting_item_min.jsx +++ b/webapp/components/setting_item_min.jsx @@ -33,7 +33,7 @@ export default class SettingItemMin extends React.Component { >
  • {this.props.title}
    • {editButton} -
  • {this.props.describe}
    • +
  • {this.props.describe}
    • ); } diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx index e393bea032..b3953ec17a 100644 --- a/webapp/components/user_settings/user_settings_notifications.jsx +++ b/webapp/components/user_settings/user_settings_notifications.jsx @@ -11,40 +11,48 @@ import Client from 'client/web_client.jsx'; import * as AsyncClient from 'utils/async_client.jsx'; import * as UserAgent from 'utils/user_agent.jsx'; import * as Utils from 'utils/utils.jsx'; +import Constants from 'utils/constants.jsx'; import EmailNotificationSetting from './email_notification_setting.jsx'; import {FormattedMessage} from 'react-intl'; function getNotificationsStateFromStores() { - var user = UserStore.getCurrentUser(); - var soundNeeded = !UserAgent.isFirefox(); + const user = UserStore.getCurrentUser(); + const soundNeeded = !UserAgent.isFirefox(); - var sound = 'true'; - if (user.notify_props && user.notify_props.desktop_sound) { - sound = user.notify_props.desktop_sound; - } - var desktop = 'default'; - if (user.notify_props && user.notify_props.desktop) { - desktop = user.notify_props.desktop; - } - var comments = 'never'; - if (user.notify_props && user.notify_props.comments) { - comments = user.notify_props.comments; - } - var enableEmail = 'true'; - if (user.notify_props && user.notify_props.email) { - enableEmail = user.notify_props.email; - } - var push = 'mention'; - if (user.notify_props && user.notify_props.push) { - push = user.notify_props.push; + let sound = 'true'; + let desktop = 'default'; + let comments = 'never'; + let enableEmail = 'true'; + let pushActivity = 'mention'; + let pushStatus = Constants.UserStatuses.ONLINE; + + if (user.notify_props) { + if (user.notify_props.desktop_sound) { + sound = user.notify_props.desktop_sound; + } + if (user.notify_props.desktop) { + desktop = user.notify_props.desktop; + } + if (user.notify_props.comments) { + comments = user.notify_props.comments; + } + if (user.notify_props.email) { + enableEmail = user.notify_props.email; + } + if (user.notify_props.push) { + pushActivity = user.notify_props.push; + } + if (user.notify_props.push_status) { + pushStatus = user.notify_props.push_status; + } } - var usernameKey = false; - var mentionKey = false; - var customKeys = ''; - var firstNameKey = false; - var channelKey = false; + let usernameKey = false; + let mentionKey = false; + let customKeys = ''; + let firstNameKey = false; + let channelKey = false; if (user.notify_props) { if (user.notify_props.mention_keys) { @@ -78,8 +86,9 @@ function getNotificationsStateFromStores() { return { notifyLevel: desktop, - notifyPushLevel: push, enableEmail, + pushActivity, + pushStatus, soundNeeded, enableSound: sound, usernameKey, @@ -123,7 +132,8 @@ export default class NotificationsTab extends React.Component { data.email = this.state.enableEmail; data.desktop_sound = this.state.enableSound; data.desktop = this.state.notifyLevel; - data.push = this.state.notifyPushLevel; + data.push = this.state.pushActivity; + data.push_status = this.state.pushStatus; data.comments = this.state.notifyCommentsLevel; var mentionKeys = []; @@ -147,6 +157,7 @@ export default class NotificationsTab extends React.Component { () => { this.props.updateSection(''); AsyncClient.getMe(); + $('.settings-modal .modal-body').scrollTop(0).perfectScrollbar('update'); }, (err) => { this.setState({serverError: err.message}); @@ -195,8 +206,13 @@ export default class NotificationsTab extends React.Component { this.refs.wrapper.focus(); } - handlePushRadio(notifyPushLevel) { - this.setState({notifyPushLevel}); + handlePushRadio(pushActivity) { + this.setState({pushActivity}); + this.refs.wrapper.focus(); + } + + handlePushStatusRadio(pushStatus) { + this.setState({pushStatus}); this.refs.wrapper.focus(); } @@ -245,22 +261,93 @@ export default class NotificationsTab extends React.Component { } createPushNotificationSection() { - var handleUpdateDesktopSection; + let handleUpdateDesktopSection; if (this.props.activeSection === 'push') { - var notifyActive = [false, false, false]; - if (this.state.notifyPushLevel === 'all') { - notifyActive[0] = true; - } else if (this.state.notifyPushLevel === 'none') { - notifyActive[2] = true; - } else { - notifyActive[1] = true; - } - let inputs = []; let extraInfo = null; let submit = null; if (global.window.mm_config.SendPushNotifications === 'true') { + const pushActivityRadio = [false, false, false]; + if (this.state.pushActivity === 'all') { + pushActivityRadio[0] = true; + } else if (this.state.pushActivity === 'none') { + pushActivityRadio[2] = true; + } else { + pushActivityRadio[1] = true; + } + + const pushStatusRadio = [false, false, false]; + if (this.state.pushStatus === Constants.UserStatuses.ONLINE) { + pushStatusRadio[0] = true; + } else if (this.state.pushStatus === Constants.UserStatuses.AWAY) { + pushStatusRadio[1] = true; + } else { + pushStatusRadio[2] = true; + } + + let pushStatusSettings; + if (this.state.pushActivity !== 'none') { + pushStatusSettings = ( +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    +
    + ); + + extraInfo = ( + + + + ); + } + inputs.push(
    @@ -268,7 +355,7 @@ export default class NotificationsTab extends React.Component {
    +
    + + + + {pushStatusSettings}
    ); - extraInfo = ( - - - - ); - submit = this.handleSubmit; } else { inputs.push( @@ -347,14 +433,30 @@ export default class NotificationsTab extends React.Component { } let describe = ''; - if (this.state.notifyPushLevel === 'all') { - describe = ( - - ); - } else if (this.state.notifyPushLevel === 'none') { + if (this.state.pushActivity === 'all') { + if (this.state.pushStatus === Constants.UserStatuses.AWAY) { + describe = ( + + ); + } else if (this.state.pushStatus === Constants.UserStatuses.OFFLINE) { + describe = ( + + ); + } else { + describe = ( + + ); + } + } else if (this.state.pushActivity === 'none') { describe = ( ); } else { - describe = ( - - ); + if (this.state.pushStatus === Constants.UserStatuses.AWAY) { //eslint-disable-line no-lonely-if + describe = ( + + ); + } else if (this.state.pushStatus === Constants.UserStatuses.OFFLINE) { + describe = ( + + ); + } else { + describe = ( + + ); + } } handleUpdateDesktopSection = function updateDesktopSection() { diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 5c636716b6..44731f08fa 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1890,12 +1890,20 @@ "user.settings.notifications.title": "Notification Settings", "user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"", "user.settings.notifications.wordsTrigger": "Words that trigger mentions", - "user.settings.push_notification.allActivity": "For all activity", + "user.settings.push_notification.online": "Online, away or offline", + "user.settings.push_notification.away": "Away or offline", + "user.settings.push_notification.offline": "Offline", + "user.settings.push_notification.status_info": "Notification alerts are pushed to your mobile device depending on your online status.", + "user.settings.push_notification.allActivityOnline": "For all activity when online, away or offline", + "user.settings.push_notification.allActivityAway": "For all activity when away or offline", + "user.settings.push_notification.allActivityOffline": "For all activity when offline", "user.settings.push_notification.disabled": "Disabled by System Administrator", "user.settings.push_notification.disabled_long": "Push notifications for mobile devices have been disabled by your System Administrator.", "user.settings.push_notification.info": "Notification alerts are pushed to your mobile device when there is activity in Mattermost.", "user.settings.push_notification.off": "Off", - "user.settings.push_notification.onlyMentions": "For mentions and direct messages", + "user.settings.push_notification.onlyMentionsOnline": "For mentions and direct messages when online, away or offline", + "user.settings.push_notification.onlyMentionsAway": "For mentions and direct messages when away or offline", + "user.settings.push_notification.onlyMentionsOffline": "For mentions and direct messages when offline", "user.settings.security.close": "Close", "user.settings.security.currentPassword": "Current Password", "user.settings.security.currentPasswordError": "Please enter your current password.",