Merge pull request #106 from mattermost/mm-1119

fixes mm-1119 adds @all and @channel mention capabilites

1 files changed, 8 insertions, 5 deletions

diff --git a/model/user.go b/model/user.go
index 794adcad4..18fbb0d2a 100644
--- a/model/user.go
+++ b/model/user.go
@@ -147,10 +147,13 @@ func (u *User) SetDefaultNotifications() {
 	u.NotifyProps["email"] = "true"
 	u.NotifyProps["desktop"] = USER_NOTIFY_ALL
 	u.NotifyProps["desktop_sound"] = "true"
-	u.NotifyProps["mention_keys"] = u.Username
-	u.NotifyProps["first_name"] = "true"
+	u.NotifyProps["mention_keys"] = u.Username + ",@" + u.Username
+	u.NotifyProps["first_name"] = "false"
+	u.NotifyProps["all"] = "true"
+	u.NotifyProps["channel"] = "true"
 	splitName := strings.Split(u.FullName, " ")
 	if len(splitName) > 0 && splitName[0] != "" {
+		u.NotifyProps["first_name"] = "true"
 		u.NotifyProps["mention_keys"] += "," + splitName[0]
 	}
 }
@@ -277,17 +280,17 @@ func ComparePassword(hash string, password string) bool {
 
 func IsUsernameValid(username string) bool {
 
-	var restrictedUsernames = []string {
+	var restrictedUsernames = []string{
 		BOT_USERNAME,
 		"all",
 		"channel",
 	}
 
-	for _,restrictedUsername := range restrictedUsernames {
+	for _, restrictedUsername := range restrictedUsernames {
 		if username == restrictedUsername {
 			return false
 		}
-	}	
+	}
 
 	return true
 }