Merge branch 'master' into mark-as-unread

app/notification_push.go

@@ -30,7 +30,6 @@ type PushNotificationsHub struct {
 }
 
 type PushNotification struct {
-	id                 string
 	notificationType   NotificationType
 	currentSessionId   string
 	userId             string
@@ -368,8 +367,8 @@ func ShouldSendPushNotification(user *model.User, channelNotifyProps model.Strin
 func DoesNotifyPropsAllowPushNotification(user *model.User, channelNotifyProps model.StringMap, post *model.Post, wasMentioned bool) bool {
 	userNotifyProps := user.NotifyProps
 	userNotify := userNotifyProps[model.PUSH_NOTIFY_PROP]
-	channelNotify, _ := channelNotifyProps[model.PUSH_NOTIFY_PROP]
-	if channelNotify == "" {
+	channelNotify, ok := channelNotifyProps[model.PUSH_NOTIFY_PROP]
+	if !ok || channelNotify == "" {
 		channelNotify = model.CHANNEL_NOTIFY_DEFAULT
 	}