From 68765a8f21db8a1b732f26f5bc1bf0e1a8e52d8f Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Mon, 30 Nov 2015 22:38:38 -0800
Subject: PLT-902 switching to push proxy server

---
 api/post.go | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'api/post.go')

diff --git a/api/post.go b/api/post.go
index 88d0127d3..81cc9a1c6 100644
--- a/api/post.go
+++ b/api/post.go
@@ -536,7 +536,7 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
 						l4g.Error("Failed to send mention email successfully email=%v err=%v", profileMap[id].Email, err)
 					}
 
-					if len(utils.Cfg.EmailSettings.ApplePushServer) > 0 {
+					if *utils.Cfg.EmailSettings.SendPushNotifications {
 						sessionChan := Srv.Store.Session().GetSessions(id)
 						if result := <-sessionChan; result.Err != nil {
 							l4g.Error("Failed to retrieve sessions in notifications id=%v, err=%v", id, result.Err)
@@ -548,7 +548,19 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
 								if len(session.DeviceId) > 0 && alreadySeen[session.DeviceId] == "" && strings.HasPrefix(session.DeviceId, "apple:") {
 									alreadySeen[session.DeviceId] = session.DeviceId
 
-									utils.SendAppleNotifyAndForget(strings.TrimPrefix(session.DeviceId, "apple:"), subjectPage.Render(), 1)
+									msg := model.PushNotification{}
+									msg.Platform = model.PUSH_NOTIFY_APPLE
+									msg.Message = subjectPage.Render()
+									msg.Badge = 1
+									msg.DeviceId = strings.TrimPrefix(session.DeviceId, "apple:")
+									msg.ServerId = utils.CfgDiagnosticId
+
+									httpClient := http.Client{}
+									request, _ := http.NewRequest("POST", *utils.Cfg.EmailSettings.PushNotificationServer+"/api/v1/send_push", strings.NewReader(msg.ToJson()))
+
+									if _, err := httpClient.Do(request); err != nil {
+										l4g.Error("Failed to send push notificationid=%v, err=%v", id, err)
+									}
 								}
 							}
 						}
-- 
cgit v1.2.3-1-g7c22