Merge pull request #1667 from mattermost/fix-push

Fixing push notifications

api/post.go

@@ -565,7 +565,11 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
 									msg.DeviceId = strings.TrimPrefix(session.DeviceId, "apple:")
 									msg.ServerId = utils.CfgDiagnosticId
 
-									msg.Message = profileMap[id].FirstName + " mentioned you in " + channel.DisplayName
+									if channel.Type == model.CHANNEL_DIRECT {
+										msg.Message = channelName + " sent you a direct message"
+									} else {
+										msg.Message = profileMap[id].FirstName + " mentioned you in " + channelName
+									}
 
 									httpClient := http.Client{}
 									request, _ := http.NewRequest("POST", *utils.Cfg.EmailSettings.PushNotificationServer+"/api/v1/send_push", strings.NewReader(msg.ToJson()))

config/config.json

@@ -68,8 +68,8 @@
         "ConnectionSecurity": "",
         "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
         "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
-        "SendPushNotifications": true,
-        "PushNotificationServer": "https://push.mattermost.com"
+        "SendPushNotifications": false,
+        "PushNotificationServer": ""
     },
     "RateLimitSettings": {
         "EnableRateLimiter": true,

docker/dev/config_docker.json

@@ -68,8 +68,8 @@
         "ConnectionSecurity": "",
         "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
         "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
-        "SendPushNotifications": true,
-        "PushNotificationServer": "https://push.mattermost.com"
+        "SendPushNotifications": false,
+        "PushNotificationServer": ""
     },
     "RateLimitSettings": {
         "EnableRateLimiter": true,

docker/local/config_docker.json

@@ -68,8 +68,8 @@
         "ConnectionSecurity": "",
         "InviteSalt": "bjlSR4QqkXFBr7TP4oDzlfZmcNuH9YoS",
         "PasswordResetSalt": "vZ4DcKyVVRlKHHJpexcuXzojkE5PZ5eL",
-        "SendPushNotifications": true,
-        "PushNotificationServer": "https://push.mattermost.com"
+        "SendPushNotifications": false,
+        "PushNotificationServer": ""
     },
     "RateLimitSettings": {
         "EnableRateLimiter": true,

model/config.go

@@ -181,12 +181,12 @@ func (o *Config) SetDefaults() {
 
 	if o.EmailSettings.SendPushNotifications == nil {
 		o.EmailSettings.SendPushNotifications = new(bool)
-		*o.EmailSettings.SendPushNotifications = true
+		*o.EmailSettings.SendPushNotifications = false
 	}
 
 	if o.EmailSettings.PushNotificationServer == nil {
 		o.EmailSettings.PushNotificationServer = new(string)
-		*o.EmailSettings.PushNotificationServer = "https://push.mattermost.com"
+		*o.EmailSettings.PushNotificationServer = ""
 	}
 
 }