Merge pull request #70 from timakin/feature/apns-payload-extension

Support APNs payload extensions for `Title & Subtitle`
mercari · Jul 13, 2017 · e972312 · e972312
2 parents 1897595 + b33e014
commit e972312
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 1 deletion.
diff --git a/SPEC.md b/SPEC.md
@@ -27,6 +27,8 @@ The JSON below is the request-body example.
             "token" : ["xxx"],
             "platform" : 1,
             "message" : "Hello, iOS!",
+            "title": "Greeting",
+            "subtitle": "greeting",
             "badge" : 1,
             "sound" : "default",
             "content_available" : false,
@@ -53,6 +55,8 @@ The request-body must has the `notifications` array. There is the parameter tabl
 |token            |string array|device tokens                            |o       |       |                |
 |platform         |int         |platform(iOS,Android)                    |o       |       |1=iOS, 2=Android|
 |message          |string      |message for notification                 |o       |       |                |
+|title            |string      |title for notification                   |-       |       |only iOS        |
+|subtitle         |string      |subtitle for notification                |-       |       |only iOS        |
 |badge            |int         |badge count                              |-       |0      |only iOS        |
 |sound            |string      |sound type                               |-       |       |only iOS        |
 |expiry           |int         |expiration for notification              |-       |0      |only iOS.       |

diff --git a/cmd/gaurun_recover/gaurun_recover.go b/cmd/gaurun_recover/gaurun_recover.go
@@ -187,6 +187,8 @@ func main() {
 			CollapseKey:      logPush.CollapseKey,
 			DelayWhileIdle:   logPush.DelayWhileIdle,
 			TimeToLive:       logPush.TimeToLive,
+			Title:            logPush.Title,
+			Subtitle:         logPush.Subtitle,
 			Badge:            logPush.Badge,
 			Sound:            logPush.Sound,
 			ContentAvailable: logPush.ContentAvailable,

diff --git a/gaurun/apns_http2.go b/gaurun/apns_http2.go
@@ -69,7 +69,7 @@ func NewApnsServiceHttp2(client *http.Client) *push.Service {
 
 func NewApnsPayloadHttp2(req *RequestGaurunNotification) map[string]interface{} {
 	p := payload.APS{
-		Alert:            payload.Alert{Body: req.Message},
+		Alert:            payload.Alert{Title: req.Title, Body: req.Message, Subtitle: req.Subtitle},
 		Badge:            badge.New(uint(req.Badge)),
 		Sound:            req.Sound,
 		ContentAvailable: req.ContentAvailable,

diff --git a/gaurun/log.go b/gaurun/log.go
@@ -35,6 +35,8 @@ type LogPushEntry struct {
 	DelayWhileIdle bool   `json:"delay_while_idle,omitempty"`
 	TimeToLive     int    `json:"time_to_live,omitempty"`
 	// iOS
+	Title            string `json:"title,omitempty"`
+	Subtitle         string `json:"subtitle,omitempty"`
 	Badge            int    `json:"badge,omitempty"`
 	Sound            string `json:"sound,omitempty"`
 	ContentAvailable bool   `json:"content_available,omitempty"`
@@ -147,6 +149,14 @@ func LogPush(id uint64, status, token string, ptime float64, req RequestGaurunNo
 	if req.TimeToLive != 0 {
 		timeToLive = zap.Int("time_to_live", req.TimeToLive)
 	}
+	title := zap.Skip()
+	if req.Title != "" {
+		title = zap.String("title", req.Title)
+	}
+	subtitle := zap.Skip()
+	if req.Subtitle != "" {
+		subtitle = zap.String("subtitle", req.Subtitle)
+	}
 	badge := zap.Skip()
 	if req.Badge != 0 {
 		badge = zap.Int("badge", req.Badge)
@@ -178,6 +188,8 @@ func LogPush(id uint64, status, token string, ptime float64, req RequestGaurunNo
 		collapseKey,
 		delayWhileIdle,
 		timeToLive,
+		title,
+		subtitle,
 		badge,
 		sound,
 		contentAvailable,

diff --git a/gaurun/notification.go b/gaurun/notification.go
@@ -29,6 +29,8 @@ type RequestGaurunNotification struct {
 	DelayWhileIdle bool   `json:"delay_while_idle,omitempty"`
 	TimeToLive     int    `json:"time_to_live,omitempty"`
 	// iOS
+	Title            string       `json:"title,omitempty"`
+	Subtitle         string       `json:"subtitle,omitempty"`
 	Badge            int          `json:"badge,omitempty"`
 	Sound            string       `json:"sound,omitempty"`
 	ContentAvailable bool         `json:"content_available,omitempty"`

diff --git a/samples/client.go b/samples/client.go
@@ -24,6 +24,8 @@ type RequestGaurunNotification struct {
 	DelayWhileIdle bool   `json:"data_while_idle"`
 	TimeToLive     int    `json:"time_to_live"`
 	// iOS
+	Title            string `json:"title"`
+	Subtitle         string `json:"subtitle"`
 	Badge            int    `json:"badge"`
 	Sound            string `json:"sound"`
 	ContentAvailable bool   `json:"content_available"`
@@ -58,6 +60,8 @@ func main() {
 		req.Notifications[i].Tokens = append(req.Notifications[i].Tokens, *iOSToken)
 		req.Notifications[i].Platform = 1
 		req.Notifications[i].Message = "Hello, iOS!"
+		req.Notifications[i].Title = "Greeting"
+		req.Notifications[i].Subtitle = "greeting"
 		req.Notifications[i].Badge = 1
 		req.Notifications[i].Sound = "default"
 		req.Notifications[i].ContentAvailable = true