coopgo-platform
/
gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #33 from appleboy/ios 

fix #31 support iOS expiration field
This commit is contained in:
Bo-Yi Wu 2016-04-08 23:31:20 -05:00
parent e507877b45 0bd6840f28
commit 746627685c
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gorush/notification.go
View File

@ -7,6 +7,7 @@ import (
apns "github.com/sideshow/apns2" apns "github.com/sideshow/apns2"
"github.com/sideshow/apns2/certificate" "github.com/sideshow/apns2/certificate"
"github.com/sideshow/apns2/payload" "github.com/sideshow/apns2/payload"
"time"
) )
type ExtendJSON struct { type ExtendJSON struct {
@ -59,14 +60,15 @@ type RequestPushNotification struct {
Notification gcm.Notification `json:"notification,omitempty"` Notification gcm.Notification `json:"notification,omitempty"`
// iOS // iOS
ApnsID string `json:"apns_id,omitempty"` Expiration int64 `json:"expiration,omitempty"`
Topic string `json:"topic,omitempty"` ApnsID string `json:"apns_id,omitempty"`
Badge int `json:"badge,omitempty"` Topic string `json:"topic,omitempty"`
Sound string `json:"sound,omitempty"` Badge int `json:"badge,omitempty"`
Category string `json:"category,omitempty"` Sound string `json:"sound,omitempty"`
URLArgs []string `json:"url-args,omitempty"` Category string `json:"category,omitempty"`
Extend []ExtendJSON `json:"extend,omitempty"` URLArgs []string `json:"url-args,omitempty"`
Alert Alert `json:"alert,omitempty"` Extend []ExtendJSON `json:"extend,omitempty"`
Alert Alert `json:"alert,omitempty"`
} }
func CheckPushConf() error { func CheckPushConf() error {
@ -141,6 +143,10 @@ func GetIOSNotification(req RequestPushNotification) *apns.Notification {
notification.Topic = req.Topic notification.Topic = req.Topic
} }
if req.Expiration > 0 {
notification.Expiration = time.Unix(req.Expiration, 0)
}
if len(req.Priority) > 0 && req.Priority == "normal" { if len(req.Priority) > 0 && req.Priority == "normal" {
notification.Priority = apns.PriorityLow notification.Priority = apns.PriorityLow
} }

4
gorush/notification_test.go
View File

@ -8,6 +8,7 @@ import (
"log" "log"
"os" "os"
"testing" "testing"
"time"
) )
func TestDisabledAndroidIosConf(t *testing.T) { func TestDisabledAndroidIosConf(t *testing.T) {
@ -59,12 +60,14 @@ func TestCorrectConf(t *testing.T) {
func TestIOSNotificationStructure(t *testing.T) { func TestIOSNotificationStructure(t *testing.T) {
var dat map[string]interface{} var dat map[string]interface{}
var unix = time.Now().Unix()
test := "test" test := "test"
message := "Welcome notification Server" message := "Welcome notification Server"
req := RequestPushNotification{ req := RequestPushNotification{
ApnsID: test, ApnsID: test,
Topic: test, Topic: test,
Expiration: time.Now().Unix(),
Priority: "normal", Priority: "normal",
Message: message, Message: message,
Badge: 1, Badge: 1,
@ -106,6 +109,7 @@ func TestIOSNotificationStructure(t *testing.T) {
assert.Equal(t, test, notification.ApnsID) assert.Equal(t, test, notification.ApnsID)
assert.Equal(t, test, notification.Topic) assert.Equal(t, test, notification.Topic)
assert.Equal(t, unix, notification.Expiration.Unix())
assert.Equal(t, ApnsPriorityLow, notification.Priority) assert.Equal(t, ApnsPriorityLow, notification.Priority)
assert.Equal(t, message, alert) assert.Equal(t, message, alert)
assert.Equal(t, 1, int(badge)) assert.Equal(t, 1, int(badge))