refactor: refactor function signatures and imports in notify and rout…

…er packages

- Remove the import of `github.com/appleboy/gorush/logx` in `notify/feedback.go`
- Add the import of `github.com/appleboy/gorush/logx` in `notify/feedback.go`
- Change the signature of the `SendNotification` function in `notify/notification.go`
- Change the signature of the `Run` function in `notify/notification.go`
- Change the signature of the `handleNotification` function in `router/server.go`
- Change the signature of the `TestMain` function in `router/server_test.go`
- Change the signature of the `Send` method in `rpc/server.go`

Signed-off-by: Bo-Yi Wu <[email protected]>

notify/feedback.go

@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"github.com/appleboy/gorush/logx"
 	"net"
 	"net/http"
 	"strings"
 	"time"
+
+	"github.com/appleboy/gorush/logx"
 )
 
 var feedbackClient *http.Client

notify/notification.go

@@ -235,12 +235,16 @@ func CheckPushConf(cfg *config.ConfYaml) error {
 	return nil
 }
 
-// SendNotification send notification
-func SendNotification(req qcore.QueuedMessage, cfg *config.ConfYaml) (resp *ResponsePush, err error) {
+// SendNotification provide send notification.
+func SendNotification(
+	ctx context.Context,
+	req qcore.QueuedMessage,
+	cfg *config.ConfYaml,
+) (resp *ResponsePush, err error) {
 	v, ok := req.(*PushNotification)
 	if !ok {
 		if err = json.Unmarshal(req.Bytes(), &v); err != nil {
-			return
+			return nil, err
 		}
 	}
 
@@ -262,13 +266,13 @@ func SendNotification(req qcore.QueuedMessage, cfg *config.ConfYaml) (resp *Resp
 		}
 	}
 
-	return
+	return resp, err
 }
 
 // Run send notification
 var Run = func(cfg *config.ConfYaml) func(ctx context.Context, msg qcore.QueuedMessage) error {
 	return func(ctx context.Context, msg qcore.QueuedMessage) error {
-		_, err := SendNotification(msg, cfg)
+		_, err := SendNotification(ctx, msg, cfg)
 		return err
 	}
 }

router/server.go

@@ -290,7 +290,7 @@ func handleNotification(
 			func(msg *notify.PushNotification, cfg *config.ConfYaml) {
 				if err := q.QueueTask(func(ctx context.Context) error {
 					defer wg.Done()
-					resp, err := notify.SendNotification(msg, cfg)
+					resp, err := notify.SendNotification(ctx, msg, cfg)
 					if err != nil {
 						return err
 					}

router/server_test.go

@@ -47,7 +47,7 @@ func TestMain(m *testing.M) {
 	q = queue.NewPool(
 		int(cfg.Core.WorkerNum),
 		queue.WithFn(func(ctx context.Context, msg qcore.QueuedMessage) error {
-			_, err := notify.SendNotification(msg, cfg)
+			_, err := notify.SendNotification(ctx, msg, cfg)
 			return err
 		}),
 		queue.WithLogger(logx.QueueLogger()),

rpc/server.go

@@ -108,7 +108,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot
 	}
 
 	go func() {
-		_, err := notify.SendNotification(&notification, s.cfg)
+		_, err := notify.SendNotification(ctx, &notification, s.cfg)
 		if err != nil {
 			logx.LogError.Error(err)
 		}