IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-08-26 21:27:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow Users to be notified using @all, @channel, and their first name when other notifications are disabled

Browse Source
This commit is contained in:
hmhealey
2015-07-17 15:22:56 -04:00
parent 079538d9e7
commit e737ec3eb5
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/post.go
+4 -4
View File
@@ -298,11 +298,11 @@ func fireAndForgetNotifications(post *model.Post, teamId, teamUrl string) {
for _, k := range splitKeys {
keywordMap[k] = append(keywordMap[strings.ToLower(k)], profile.Id)
}
}
// If turned on, add the user's case sensitive first name
if profile.NotifyProps["first_name"] == "true" {
keywordMap[profile.FirstName] = append(keywordMap[profile.FirstName], profile.Id)
}
// If turned on, add the user's case sensitive first name
if profile.NotifyProps["first_name"] == "true" {
keywordMap[profile.FirstName] = append(keywordMap[profile.FirstName], profile.Id)
}
// Add @all to keywords if user has them turned on
web/react/stores/user_store.jsx
+7 -9
View File
@@ -177,17 +177,15 @@ var UserStore = assign({}, EventEmitter.prototype, {
},
getCurrentMentionKeys: function() {
var user = this.getCurrentUser();
if (user && user.notify_props && user.notify_props.mention_keys) {
var keys = user.notify_props.mention_keys.split(',');
if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name);
if (user.notify_props.all === "true") keys.push('@all');
if (user.notify_props.channel === "true") keys.push('@channel');
var keys = [];
return keys;
} else {
return [];
}
if (user.notify_props && user.notify_props.mention_keys) keys = keys.concat(user.notify_props.mention_keys.split(','));
if (user.first_name && user.notify_props.first_name === "true") keys.push(user.first_name);
if (user.notify_props.all === "true") keys.push('@all');
if (user.notify_props.channel === "true") keys.push('@channel');
return keys;
},
getLastVersion: function() {
return BrowserStore.getItem("last_version", '');