chore(style): fix format by gofumpt

config/config.go

@@ -253,7 +253,6 @@ func LoadConf(confPath string) (ConfYaml, error) {
 
 	if confPath != "" {
 		content, err := ioutil.ReadFile(confPath)
-
 		if err != nil {
 			return conf, err
 		}

gorush/feedback.go

@@ -11,13 +11,11 @@ import (
 
 // DispatchFeedback sends a feedback to the configured gateway.
 func DispatchFeedback(log LogPushEntry, url string, timeout int64) error {
-
 	if url == "" {
 		return errors.New("The url can't be empty")
 	}
 
 	payload, err := json.Marshal(log)
-
 	if err != nil {
 		return err
 	}
@@ -29,13 +27,13 @@ func DispatchFeedback(log LogPushEntry, url string, timeout int64) error {
 
 	req.Header.Set("Content-Type", "application/json; charset=utf-8")
 
-	var transport = &http.Transport{
+	transport := &http.Transport{
 		Dial: (&net.Dialer{
 			Timeout: 5 * time.Second,
 		}).Dial,
 		TLSHandshakeTimeout: 5 * time.Second,
 	}
-	var client = &http.Client{
+	client := &http.Client{
 		Timeout:   time.Duration(timeout) * time.Second,
 		Transport: transport,
 	}

gorush/feedback_test.go

@@ -43,14 +43,12 @@ func TestHTTPErrorInFeedbackCall(t *testing.T) {
 }
 
 func TestSuccessfulFeedbackCall(t *testing.T) {
-
 	// Mock http server
 	httpMock := httptest.NewServer(
 		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if r.URL.Path == "/dispatch" {
 				w.Header().Add("Content-Type", "application/json")
 				_, err := w.Write([]byte(`{}`))
-
 				if err != nil {
 					log.Println(err)
 					panic(err)

gorush/log.go

@@ -40,7 +40,6 @@ func init() {
 
 // InitLog use for initial log module
 func InitLog() error {
-
 	var err error
 
 	// init logger
@@ -90,8 +89,7 @@ func SetLogOut(log *logrus.Logger, outString string) error {
 	case "stderr":
 		log.Out = os.Stderr
 	default:
-		f, err := os.OpenFile(outString, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
+		f, err := os.OpenFile(outString, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0o600)
-
 		if err != nil {
 			return err
 		}
@@ -106,7 +104,6 @@ func SetLogOut(log *logrus.Logger, outString string) error {
 // log level: panic, fatal, error, warn, info and debug
 func SetLogLevel(log *logrus.Logger, levelString string) error {
 	level, err := logrus.ParseLevel(levelString)
-
 	if err != nil {
 		return err
 	}

gorush/metrics.go

@@ -21,7 +21,6 @@ type Metrics struct {
 
 // NewMetrics returns a new Metrics with all prometheus.Desc initialized
 func NewMetrics() Metrics {
-
 	return Metrics{
 		TotalPushCount: prometheus.NewDesc(
 			namespace+"total_push_count",

gorush/notification.go

@@ -131,7 +131,6 @@ func (p *PushNotification) AddLog(log LogPushEntry) {
 // IsTopic check if message format is topic for FCM
 // ref: https://firebase.google.com/docs/cloud-messaging/send-message#topic-http-post-request
 func (p *PushNotification) IsTopic() bool {
-
 	if p.Platform == PlatFormAndroid {
 		return p.To != "" && strings.HasPrefix(p.To, "/topics/") || p.Condition != ""
 	}
@@ -185,9 +184,7 @@ func CheckMessage(req PushNotification) error {
 
 // SetProxy only working for FCM server.
 func SetProxy(proxy string) error {
-
 	proxyURL, err := url.ParseRequestURI(proxy)
-
 	if err != nil {
 		return err
 	}

gorush/notification_apns.go

@@ -377,9 +377,7 @@ func PushToIOS(req PushNotification) {
 	}
 
 Retry:
-	var (
+	var newTokens []string
-		newTokens []string
-	)
 
 	notification := GetIOSNotification(req)
 	client := getApnsClient(req)

gorush/notification_apns_test.go

@@ -52,9 +52,10 @@ func TestMissingIOSCertificate(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, "certificate file does not exist", err.Error())
 }
+
 func TestIOSNotificationStructure(t *testing.T) {
 	var dat map[string]interface{}
-	var unix = time.Now().Unix()
+	unix := time.Now().Unix()
 
 	test := "test"
 	expectBadge := 0
@@ -579,7 +580,7 @@ func TestDisabledIosNotifications(t *testing.T) {
 
 	req := RequestPush{
 		Notifications: []PushNotification{
-			//ios
+			// ios
 			{
 				Tokens:   []string{"11aa01229f15f0f0c52029d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
 				Platform: PlatFormIos,
@@ -667,7 +668,7 @@ func TestAPNSClientInvaildToken(t *testing.T) {
 	err = InitAPNSClient()
 	assert.Error(t, err)
 
-	//empty key-id or team-id
+	// empty key-id or team-id
 	PushConf.Ios.Enabled = true
 	PushConf.Ios.KeyPath = "../certificate/authkey-valid.p8"
 	err = InitAPNSClient()

gorush/notification_fcm.go

@@ -116,7 +116,6 @@ func PushToAndroid(req PushNotification) {
 
 	// check message
 	err := CheckMessage(req)
-
 	if err != nil {
 		LogError.Error("request error: " + err.Error())
 		return

gorush/notification_fcm_test.go

@@ -39,6 +39,7 @@ func TestMissingAndroidAPIKey(t *testing.T) {
 	assert.Error(t, err)
 	assert.Equal(t, "Missing Android API Key", err.Error())
 }
+
 func TestMissingKeyForInitFCMClient(t *testing.T) {
 	client, err := InitFCMClient("")
 
@@ -220,7 +221,6 @@ func TestCheckAndroidMessage(t *testing.T) {
 }
 
 func TestAndroidNotificationStructure(t *testing.T) {
-
 	test := "test"
 	timeToLive := uint(100)
 	req := PushNotification{

gorush/notification_hms.go

@@ -33,7 +33,6 @@ func GetPushClient(conf *config.Config) (*core.HMSClient, error) {
 
 // InitHMSClient use for initialize HMS Client.
 func InitHMSClient(apiKey string, appID string) (*core.HMSClient, error) {
-
 	if apiKey == "" {
 		return nil, errors.New("Missing Huawei API Key")
 	}
@@ -42,7 +41,7 @@ func InitHMSClient(apiKey string, appID string) (*core.HMSClient, error) {
 		return nil, errors.New("Missing Huawei APP Id")
 	}
 
-	var conf = &config.Config{
+	conf := &config.Config{
 		AppId:     appID,
 		AppSecret: apiKey,
 		AuthUrl:   "https://login.cloud.huawei.com/oauth2/v2/token",
@@ -64,7 +63,6 @@ func InitHMSClient(apiKey string, appID string) (*core.HMSClient, error) {
 // HTTP Connection Server Reference for HMS
 // https://developer.huawei.com/consumer/en/doc/development/HMS-References/push-sendapi
 func GetHuaweiNotification(req PushNotification) (*model.MessageRequest, error) {
-
 	msgRequest := model.NewNotificationMsgRequest()
 
 	msgRequest.Message.Android = model.GetDefaultAndroid()
@@ -89,7 +87,7 @@ func GetHuaweiNotification(req PushNotification) (*model.MessageRequest, error)
 		msgRequest.Message.Android.Urgency = "HIGH"
 	}
 
-	//if req.HuaweiCollapseKey != nil {
+	// if req.HuaweiCollapseKey != nil {
 	msgRequest.Message.Android.CollapseKey = req.HuaweiCollapseKey
 	//}
 
@@ -107,11 +105,11 @@ func GetHuaweiNotification(req PushNotification) (*model.MessageRequest, error)
 
 	msgRequest.Message.Android.FastAppTarget = req.FastAppTarget
 
-	//Add data fields
+	// Add data fields
 	if len(req.HuaweiData) > 0 {
 		msgRequest.Message.Data = req.HuaweiData
 	} else {
-		//Notification Message
+		// Notification Message
 		msgRequest.Message.Android.Notification = model.GetDefaultAndroidNotification()
 
 		n := msgRequest.Message.Android.Notification
@@ -179,14 +177,13 @@ func PushToHuawei(req PushNotification) bool {
 
 	// check message
 	err := CheckMessage(req)
-
 	if err != nil {
 		LogError.Error("request error: " + err.Error())
 		return false
 	}
 
 Retry:
-	var isError = false
+	isError := false
 
 	notification, _ := GetHuaweiNotification(req)
 

gorush/notification_test.go

@@ -39,7 +39,7 @@ func TestSenMultipleNotifications(t *testing.T) {
 
 	req := RequestPush{
 		Notifications: []PushNotification{
-			//ios
+			// ios
 			{
 				Tokens:   []string{"11aa01229f15f0f0c52029d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
 				Platform: PlatFormIos,
@@ -75,7 +75,7 @@ func TestDisabledAndroidNotifications(t *testing.T) {
 
 	req := RequestPush{
 		Notifications: []PushNotification{
-			//ios
+			// ios
 			{
 				Tokens:   []string{"11aa01229f15f0f0c52029d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
 				Platform: PlatFormIos,
@@ -114,7 +114,7 @@ func TestSyncModeForNotifications(t *testing.T) {
 
 	req := RequestPush{
 		Notifications: []PushNotification{
-			//ios
+			// ios
 			{
 				Tokens:   []string{"11aa01229f15f0f0c52029d8cf8cd0aeaf2365fe4cebc4af26cd6d76b7919ef7"},
 				Platform: PlatFormIos,
@@ -205,7 +205,6 @@ func TestSyncModeForDeviceGroupNotification(t *testing.T) {
 }
 
 func TestSetProxyURL(t *testing.T) {
-
 	err := SetProxy("87.236.233.92:8080")
 	assert.Error(t, err)
 	assert.Equal(t, "parse \"87.236.233.92:8080\": invalid URI for request", err.Error())

gorush/server.go

@@ -19,9 +19,7 @@ import (
 	"golang.org/x/crypto/acme/autocert"
 )
 
-var (
+var rxURL = regexp.MustCompile(`^/healthz$`)
-	rxURL = regexp.MustCompile(`^/healthz$`)
-)
 
 func init() {
 	// Support metrics

gorush/server_test.go

@@ -92,8 +92,8 @@ func TestRunTLSServer(t *testing.T) {
 }
 
 func TestRunTLSBase64Server(t *testing.T) {
-	var cert = `LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrekNDQWVPZ0F3SUJBZ0lKQUxiWkVEdlVRckZLTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB4TmpBek1qZ3dNek13TkRGYUZ3MHlOakF6TWpZd016TXdOREZhTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DCmdnRUJBTWoxK3hnNGpWTHpWbkI1ajduMXVsMzBXRUU0QkN6Y05GeGc1QU9CNUg1cSt3amUwWVlpVkZnNlBReXYKR0NpcHFJUlhWUmRWUTFoSFNldW5ZR0tlOGxxM1NiMVg4UFVKMTJ2OXVSYnBTOURLMU93cWs4cnNQRHU2c1ZUTApxS0tnSDFaOHlhenphUzBBYlh1QTVlOWdPL1J6aWpibnBFUCtxdU00ZHVlaU1QVkVKeUxxK0VvSVFZK01NOE1QCjhkWnpMNFhabDd3TDRVc0NON3JQY082VzN0bG5UMGlPM2g5Yy9ZbTJoRmh6K0tOSjlLUlJDdnRQR1pFU2lndEsKYkhzWEgwOTlXRG84di9XcDUvZXZCdy8rSkQwb3B4bUNmSElCQUxIdDl2NTNSdnZzRFoxdDMzUnB1NUM4em5FWQpZMkF5N05neGhxanFvV0pxQTQ4bEplQTBjbHNDQXdFQUFhTlFNRTR3SFFZRFZSME9CQllFRkMwYlRVMVhvZmVoCk5LSWVsYXNoSXNxS2lkRFlNQjhHQTFVZEl3UVlNQmFBRkMwYlRVMVhvZmVoTktJZWxhc2hJc3FLaWREWU1Bd0cKQTFVZEV3UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFBaUpMOElNVHdOWDlYcVFXWURGZ2tHNApBbnJWd1FocmVBcUM5clN4RENqcXFuTUhQSEd6Y0NlRE1MQU1vaDBrT3kyMG5vd1VHTnRDWjB1QnZuWDJxMWJOCmcxanQrR0JjTEpEUjNMTDRDcE5PbG0zWWhPeWN1TmZXTXhUQTdCWGttblNyWkQvN0toQXJzQkVZOGF1bHh3S0oKSFJnTmxJd2Uxb0ZEMVlkWDFCUzVwcDR0MjVCNlZxNEEzRk1NVWtWb1dFNjg4bkUxNjhodlFnd2pySGtnSGh3ZQplTjhsR0UyRGhGcmFYbldtRE1kd2FIRDNIUkZHaHlwcElGTitmN0JxYldYOWdNK1QyWVJUZk9iSVhMV2JxSkxECjNNay9Oa3hxVmNnNGVZNTR3SjF1ZkNVR0FZQUlhWTZmUXFpTlV6OG5od0szdDQ1TkJWVDl5L3VKWHFuVEx5WT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=`
+	cert := `LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUMrekNDQWVPZ0F3SUJBZ0lKQUxiWkVEdlVRckZLTUEwR0NTcUdTSWIzRFFFQkJRVUFNQlF4RWpBUUJnTlYKQkFNTUNXeHZZMkZzYUc5emREQWVGdzB4TmpBek1qZ3dNek13TkRGYUZ3MHlOakF6TWpZd016TXdOREZhTUJReApFakFRQmdOVkJBTU1DV3h2WTJGc2FHOXpkRENDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFEZ2dFUEFEQ0NBUW9DCmdnRUJBTWoxK3hnNGpWTHpWbkI1ajduMXVsMzBXRUU0QkN6Y05GeGc1QU9CNUg1cSt3amUwWVlpVkZnNlBReXYKR0NpcHFJUlhWUmRWUTFoSFNldW5ZR0tlOGxxM1NiMVg4UFVKMTJ2OXVSYnBTOURLMU93cWs4cnNQRHU2c1ZUTApxS0tnSDFaOHlhenphUzBBYlh1QTVlOWdPL1J6aWpibnBFUCtxdU00ZHVlaU1QVkVKeUxxK0VvSVFZK01NOE1QCjhkWnpMNFhabDd3TDRVc0NON3JQY082VzN0bG5UMGlPM2g5Yy9ZbTJoRmh6K0tOSjlLUlJDdnRQR1pFU2lndEsKYkhzWEgwOTlXRG84di9XcDUvZXZCdy8rSkQwb3B4bUNmSElCQUxIdDl2NTNSdnZzRFoxdDMzUnB1NUM4em5FWQpZMkF5N05neGhxanFvV0pxQTQ4bEplQTBjbHNDQXdFQUFhTlFNRTR3SFFZRFZSME9CQllFRkMwYlRVMVhvZmVoCk5LSWVsYXNoSXNxS2lkRFlNQjhHQTFVZEl3UVlNQmFBRkMwYlRVMVhvZmVoTktJZWxhc2hJc3FLaWREWU1Bd0cKQTFVZEV3UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFBaUpMOElNVHdOWDlYcVFXWURGZ2tHNApBbnJWd1FocmVBcUM5clN4RENqcXFuTUhQSEd6Y0NlRE1MQU1vaDBrT3kyMG5vd1VHTnRDWjB1QnZuWDJxMWJOCmcxanQrR0JjTEpEUjNMTDRDcE5PbG0zWWhPeWN1TmZXTXhUQTdCWGttblNyWkQvN0toQXJzQkVZOGF1bHh3S0oKSFJnTmxJd2Uxb0ZEMVlkWDFCUzVwcDR0MjVCNlZxNEEzRk1NVWtWb1dFNjg4bkUxNjhodlFnd2pySGtnSGh3ZQplTjhsR0UyRGhGcmFYbldtRE1kd2FIRDNIUkZHaHlwcElGTitmN0JxYldYOWdNK1QyWVJUZk9iSVhMV2JxSkxECjNNay9Oa3hxVmNnNGVZNTR3SjF1ZkNVR0FZQUlhWTZmUXFpTlV6OG5od0szdDQ1TkJWVDl5L3VKWHFuVEx5WT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=`
-	var key = `LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeVBYN0dEaU5Vdk5XY0htUHVmVzZYZlJZUVRnRUxOdzBYR0RrQTRIa2ZtcjdDTjdSCmhpSlVXRG85REs4WUtLbW9oRmRWRjFWRFdFZEo2NmRnWXA3eVdyZEp2VmZ3OVFuWGEvMjVGdWxMME1yVTdDcVQKeXV3OE83cXhWTXVvb3FBZlZuekpyUE5wTFFCdGU0RGw3MkE3OUhPS051ZWtRLzZxNHpoMjU2SXc5VVFuSXVyNApTZ2hCajR3end3L3gxbk12aGRtWHZBdmhTd0kzdXM5dzdwYmUyV2RQU0k3ZUgxejlpYmFFV0hQNG8wbjBwRkVLCiswOFprUktLQzBwc2V4Y2ZUMzFZT2p5Lzlhbm45NjhIRC80a1BTaW5HWUo4Y2dFQXNlMzIvbmRHKyt3Tm5XM2YKZEdtN2tMek9jUmhqWURMczJER0dxT3FoWW1vRGp5VWw0RFJ5V3dJREFRQUJBb0lCQUdUS3FzTjlLYlNmQTQycQpDcUkwVXVMb3VKTU5hMXFzbno1dUFpNllLV2dXZEE0QTQ0bXBFakNtRlJTVmhVSnZ4V3VLK2N5WUlRelh4SVdECkQxNm5aZHFGNzJBZUNXWjlKeVNzdnZaMDBHZktNM3kzNWlSeTA4c0pXZ096bWNMbkdKQ2lTZXlLc1FlM0hUSkMKZGhEWGJYcXZzSFRWUFpnMDFMVGVEeFVpVGZmVThOTUtxUjJBZWNRMnNURHdYRWhBblR5QXRuemwvWGFCZ0Z6dQpVNkc3RnpHTTV5OWJ4a2ZRVmt2eStERUprSEdOT2p6d2NWZkJ5eVZsNjEwaXhtRzF2bXhWajlQYldtSVBzVVY4CnlTbWpodkRRYk9mb3hXMGg5dlRsVHFHdFFjQnc5NjJvc25ERE1XRkNkTTdsek8wVDdSUm5QVkdJUnBDSk9LaHEKa2VxSEt3RUNnWUVBOHd3SS9pWnVnaG9UWFRORzlMblFRL1dBdHNxTzgwRWpNVFVoZW81STFrT3ptVXowOXB5aAppQXNVRG9OMC8yNnRaNVdOamxueVp1N2R2VGMveDNkVFpwbU5ub284Z2NWYlFORUNEUnpxZnVROVBQWG0xU041CjZwZUJxQXZCdjc4aGpWMDVhWHpQRy9WQmJlaWc3bDI5OUVhckVBK2Evb0gzS3JnRG9xVnFFMEVDZ1lFQTA2dkEKWUptZ2c0ZlpSdWNBWW9hWXNMejlaOXJDRmpUZTFQQlRtVUprYk9SOHZGSUhIVFRFV2kvU3V4WEwwd0RTZW9FMgo3QlFtODZnQ0M3L0tnUmRyem9CcVo1cVM5TXYyZHNMZ1k2MzVWU2dqamZaa1ZMaUgxVlJScFNRT2JZbmZveXNnCmdhdGNIU0tNRXhkNFNMUUJ5QXVJbVhQK0w1YXlEQmNFSmZicVNwc0NnWUI3OElzMWIwdXpOTERqT2g3WTlWaHIKRDJxUHpFT1JjSW9Oc2RaY3RPb1h1WGFBbW1uZ3lJYm01UjlaTjFnV1djNDdvRndMVjNyeFdxWGdzNmZtZzhjWAo3djMwOXZGY0M5UTQvVnhhYTRCNUxOSzluM2dUQUlCUFRPdGxVbmwrMm15MXRmQnRCcVJtMFc2SUtiVEhXUzVnCnZ4akVtL0NpRUl5R1VFZ3FUTWdIQVFLQmdCS3VYZFFvdXRuZzYzUXVmd0l6RHRiS1Z6TUxRNFhpTktobWJYcGgKT2F2Q25wK2dQYkIrTDdZbDhsdEFtVFNPSmdWWjBoY1QwRHhBMzYxWngrMk11NThHQmw0T2JsbmNobXdFMXZqMQpLY1F5UHJFUXhkb1VUeWlzd0dmcXZyczhKOWltdmIrejkvVTZUMUtBQjhXaTNXVmlYelByNE1zaWFhUlhnNjQyCkZJZHhBb0dBWjcvNzM1ZGtoSmN5T2ZzK0xLc0xyNjhKU3N0b29yWE9ZdmRNdTErSkdhOWlMdWhuSEVjTVZXQzgKSXVpaHpQZmxvWnRNYkdZa1pKbjhsM0JlR2Q4aG1mRnRnVGdaR1BvVlJldGZ0MkxERkxuUHhwMnNFSDVPRkxzUQpSK0sva0FPdWw4ZVN0V3VNWE9GQTlwTXpHa0dFZ0lGSk1KT3lhSk9OM2tlZFFJOGRlQ009Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==`
+	key := `LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb2dJQkFBS0NBUUVBeVBYN0dEaU5Vdk5XY0htUHVmVzZYZlJZUVRnRUxOdzBYR0RrQTRIa2ZtcjdDTjdSCmhpSlVXRG85REs4WUtLbW9oRmRWRjFWRFdFZEo2NmRnWXA3eVdyZEp2VmZ3OVFuWGEvMjVGdWxMME1yVTdDcVQKeXV3OE83cXhWTXVvb3FBZlZuekpyUE5wTFFCdGU0RGw3MkE3OUhPS051ZWtRLzZxNHpoMjU2SXc5VVFuSXVyNApTZ2hCajR3end3L3gxbk12aGRtWHZBdmhTd0kzdXM5dzdwYmUyV2RQU0k3ZUgxejlpYmFFV0hQNG8wbjBwRkVLCiswOFprUktLQzBwc2V4Y2ZUMzFZT2p5Lzlhbm45NjhIRC80a1BTaW5HWUo4Y2dFQXNlMzIvbmRHKyt3Tm5XM2YKZEdtN2tMek9jUmhqWURMczJER0dxT3FoWW1vRGp5VWw0RFJ5V3dJREFRQUJBb0lCQUdUS3FzTjlLYlNmQTQycQpDcUkwVXVMb3VKTU5hMXFzbno1dUFpNllLV2dXZEE0QTQ0bXBFakNtRlJTVmhVSnZ4V3VLK2N5WUlRelh4SVdECkQxNm5aZHFGNzJBZUNXWjlKeVNzdnZaMDBHZktNM3kzNWlSeTA4c0pXZ096bWNMbkdKQ2lTZXlLc1FlM0hUSkMKZGhEWGJYcXZzSFRWUFpnMDFMVGVEeFVpVGZmVThOTUtxUjJBZWNRMnNURHdYRWhBblR5QXRuemwvWGFCZ0Z6dQpVNkc3RnpHTTV5OWJ4a2ZRVmt2eStERUprSEdOT2p6d2NWZkJ5eVZsNjEwaXhtRzF2bXhWajlQYldtSVBzVVY4CnlTbWpodkRRYk9mb3hXMGg5dlRsVHFHdFFjQnc5NjJvc25ERE1XRkNkTTdsek8wVDdSUm5QVkdJUnBDSk9LaHEKa2VxSEt3RUNnWUVBOHd3SS9pWnVnaG9UWFRORzlMblFRL1dBdHNxTzgwRWpNVFVoZW81STFrT3ptVXowOXB5aAppQXNVRG9OMC8yNnRaNVdOamxueVp1N2R2VGMveDNkVFpwbU5ub284Z2NWYlFORUNEUnpxZnVROVBQWG0xU041CjZwZUJxQXZCdjc4aGpWMDVhWHpQRy9WQmJlaWc3bDI5OUVhckVBK2Evb0gzS3JnRG9xVnFFMEVDZ1lFQTA2dkEKWUptZ2c0ZlpSdWNBWW9hWXNMejlaOXJDRmpUZTFQQlRtVUprYk9SOHZGSUhIVFRFV2kvU3V4WEwwd0RTZW9FMgo3QlFtODZnQ0M3L0tnUmRyem9CcVo1cVM5TXYyZHNMZ1k2MzVWU2dqamZaa1ZMaUgxVlJScFNRT2JZbmZveXNnCmdhdGNIU0tNRXhkNFNMUUJ5QXVJbVhQK0w1YXlEQmNFSmZicVNwc0NnWUI3OElzMWIwdXpOTERqT2g3WTlWaHIKRDJxUHpFT1JjSW9Oc2RaY3RPb1h1WGFBbW1uZ3lJYm01UjlaTjFnV1djNDdvRndMVjNyeFdxWGdzNmZtZzhjWAo3djMwOXZGY0M5UTQvVnhhYTRCNUxOSzluM2dUQUlCUFRPdGxVbmwrMm15MXRmQnRCcVJtMFc2SUtiVEhXUzVnCnZ4akVtL0NpRUl5R1VFZ3FUTWdIQVFLQmdCS3VYZFFvdXRuZzYzUXVmd0l6RHRiS1Z6TUxRNFhpTktobWJYcGgKT2F2Q25wK2dQYkIrTDdZbDhsdEFtVFNPSmdWWjBoY1QwRHhBMzYxWngrMk11NThHQmw0T2JsbmNobXdFMXZqMQpLY1F5UHJFUXhkb1VUeWlzd0dmcXZyczhKOWltdmIrejkvVTZUMUtBQjhXaTNXVmlYelByNE1zaWFhUlhnNjQyCkZJZHhBb0dBWjcvNzM1ZGtoSmN5T2ZzK0xLc0xyNjhKU3N0b29yWE9ZdmRNdTErSkdhOWlMdWhuSEVjTVZXQzgKSXVpaHpQZmxvWnRNYkdZa1pKbjhsM0JlR2Q4aG1mRnRnVGdaR1BvVlJldGZ0MkxERkxuUHhwMnNFSDVPRkxzUQpSK0sva0FPdWw4ZVN0V3VNWE9GQTlwTXpHa0dFZ0lGSk1KT3lhSk9OM2tlZFFJOGRlQ009Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==`
 	initTest()
 
 	PushConf.Core.SSL = true
@@ -224,7 +224,6 @@ func TestMissingNotificationsParameter(t *testing.T) {
 	// missing notifications parameter.
 	r.POST("/api/push").
 		Run(routerEngine(), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
-
 			assert.Equal(t, http.StatusBadRequest, r.Code)
 			assert.Equal(t, "application/json; charset=utf-8", r.HeaderMap.Get("Content-Type"))
 		})
@@ -241,7 +240,6 @@ func TestEmptyNotifications(t *testing.T) {
 			"notifications": []PushNotification{},
 		}).
 		Run(routerEngine(), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
-
 			assert.Equal(t, http.StatusBadRequest, r.Code)
 		})
 }
@@ -299,7 +297,6 @@ func TestOutOfRangeMaxNotifications(t *testing.T) {
 			},
 		}).
 		Run(routerEngine(), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
-
 			assert.Equal(t, http.StatusBadRequest, r.Code)
 		})
 }
@@ -326,7 +323,6 @@ func TestSuccessPushHandler(t *testing.T) {
 			},
 		}).
 		Run(routerEngine(), func(r gofight.HTTPResponse, rq gofight.HTTPRequest) {
-
 			assert.Equal(t, http.StatusOK, r.Code)
 		})
 }
@@ -391,6 +387,7 @@ func TestVersionHandler(t *testing.T) {
 			assert.Equal(t, "3.0.0", value)
 		})
 }
+
 func TestDisabledHTTPServer(t *testing.T) {
 	initTest()
 	PushConf.Core.Enabled = false

main.go

@@ -201,7 +201,6 @@ func main() {
 		}
 
 		err := gorush.CheckMessage(req)
-
 		if err != nil {
 			gorush.LogError.Fatal(err)
 		}
@@ -235,7 +234,6 @@ func main() {
 		}
 
 		err := gorush.CheckMessage(req)
-
 		if err != nil {
 			gorush.LogError.Fatal(err)
 		}
@@ -273,7 +271,6 @@ func main() {
 		}
 
 		err := gorush.CheckMessage(req)
-
 		if err != nil {
 			gorush.LogError.Fatal(err)
 		}
@@ -415,13 +412,13 @@ func usage() {
 // handles pinging the endpoint and returns an error if the
 // agent is in an unhealthy state.
 func pinger() error {
-	var transport = &http.Transport{
+	transport := &http.Transport{
 		Dial: (&net.Dialer{
 			Timeout: 5 * time.Second,
 		}).Dial,
 		TLSHandshakeTimeout: 5 * time.Second,
 	}
-	var client = &http.Client{
+	client := &http.Client{
 		Timeout:   time.Second * 10,
 		Transport: transport,
 	}

rpc/proto/gorush.pb.go

@@ -8,6 +8,9 @@ package proto
 
 import (
 	context "context"
+	reflect "reflect"
+	sync "sync"
+
 	proto "github.com/golang/protobuf/proto"
 	_struct "github.com/golang/protobuf/ptypes/struct"
 	grpc "google.golang.org/grpc"
@@ -15,8 +18,6 @@ import (
 	status "google.golang.org/grpc/status"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
 )
 
 const (
@@ -659,18 +660,21 @@ func file_gorush_proto_rawDescGZIP() []byte {
 	return file_gorush_proto_rawDescData
 }
 
-var file_gorush_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var (
-var file_gorush_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+	file_gorush_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
-var file_gorush_proto_goTypes = []interface{}{
+	file_gorush_proto_msgTypes  = make([]protoimpl.MessageInfo, 5)
-	(Priority)(0),                          // 0: proto.Priority
+	file_gorush_proto_goTypes   = []interface{}{
-	(HealthCheckResponse_ServingStatus)(0), // 1: proto.HealthCheckResponse.ServingStatus
+		(Priority)(0),                          // 0: proto.Priority
-	(*Alert)(nil),                          // 2: proto.Alert
+		(HealthCheckResponse_ServingStatus)(0), // 1: proto.HealthCheckResponse.ServingStatus
-	(*NotificationRequest)(nil),            // 3: proto.NotificationRequest
+		(*Alert)(nil),                          // 2: proto.Alert
-	(*NotificationReply)(nil),              // 4: proto.NotificationReply
+		(*NotificationRequest)(nil),            // 3: proto.NotificationRequest
-	(*HealthCheckRequest)(nil),             // 5: proto.HealthCheckRequest
+		(*NotificationReply)(nil),              // 4: proto.NotificationReply
-	(*HealthCheckResponse)(nil),            // 6: proto.HealthCheckResponse
+		(*HealthCheckRequest)(nil),             // 5: proto.HealthCheckRequest
-	(*_struct.Struct)(nil),                 // 7: google.protobuf.Struct
+		(*HealthCheckResponse)(nil),            // 6: proto.HealthCheckResponse
-}
+		(*_struct.Struct)(nil),                 // 7: google.protobuf.Struct
+	}
+)
+
 var file_gorush_proto_depIdxs = []int32{
 	2, // 0: proto.NotificationRequest.alert:type_name -> proto.Alert
 	7, // 1: proto.NotificationRequest.data:type_name -> google.protobuf.Struct
@@ -776,8 +780,10 @@ func file_gorush_proto_init() {
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
-var _ context.Context
+var (
-var _ grpc.ClientConnInterface
+	_ context.Context
+	_ grpc.ClientConnInterface
+)
 
 // This is a compile-time assertion to ensure that this generated file
 // is compatible with the grpc package it is being compiled against.
@@ -813,8 +819,7 @@ type GorushServer interface {
 }
 
 // UnimplementedGorushServer can be embedded to have forward compatible implementations.
-type UnimplementedGorushServer struct {
+type UnimplementedGorushServer struct{}
-}
 
 func (*UnimplementedGorushServer) Send(context.Context, *NotificationRequest) (*NotificationReply, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Send not implemented")
@@ -885,8 +890,7 @@ type HealthServer interface {
 }
 
 // UnimplementedHealthServer can be embedded to have forward compatible implementations.
-type UnimplementedHealthServer struct {
+type UnimplementedHealthServer struct{}
-}
 
 func (*UnimplementedHealthServer) Check(context.Context, *HealthCheckRequest) (*HealthCheckResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Check not implemented")

rpc/server.go

@@ -49,7 +49,7 @@ func (s *Server) Check(ctx context.Context, in *proto.HealthCheckRequest) (*prot
 
 // Send implements helloworld.GreeterServer
 func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*proto.NotificationReply, error) {
-	var badge = int(in.Badge)
+	badge := int(in.Badge)
 	notification := gorush.PushNotification{
 		Platform:         int(in.Platform),
 		Tokens:           in.Tokens,

storage/badger/badger.go

@@ -68,7 +68,6 @@ func (s *Storage) setBadger(key string, count int64) {
 		value := convert.ToString(count).(string)
 		return txn.Set([]byte(key), []byte(value))
 	})
-
 	if err != nil {
 		log.Println(s.name, "update error:", err.Error())
 	}
@@ -95,7 +94,6 @@ func (s *Storage) getBadger(key string, count *int64) {
 
 		return nil
 	})
-
 	if err != nil {
 		log.Println(s.name, "get error:", err.Error())
 	}

storage/buntdb/buntdb.go

@@ -58,7 +58,6 @@ func (s *Storage) setBuntDB(key string, count int64) {
 		}
 		return nil
 	})
-
 	if err != nil {
 		log.Println("BuntDB update error:", err.Error())
 	}
@@ -70,7 +69,6 @@ func (s *Storage) getBuntDB(key string, count *int64) {
 		*count, _ = strconv.ParseInt(val, 10, 64)
 		return nil
 	})
-
 	if err != nil {
 		log.Println("BuntDB get error:", err.Error())
 	}