remove odd way to create error

cpraehaus · Mar 16, 2022 · 61399cc · 61399cc
1 parent 7f95f61
commit 61399cc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/provider/aliyun/aliyun.go b/provider/aliyun/aliyun.go
@@ -36,7 +36,6 @@ func NewAliyun(config Config) (*Aliyun, error) {
 }
 
 func (aliyun *Aliyun) Send(message sachet.Message) error {
-	var err error = nil
 	switch message.Type {
 	case "", "text":
 		request := dysmsapi.CreateSendSmsRequest()
@@ -52,11 +51,12 @@ func (aliyun *Aliyun) Send(message sachet.Message) error {
 			var response *dysmsapi.SendSmsResponse
 			response, err = aliyun.client.SendSms(request)
 			if err == nil && (!response.IsSuccess() || response.Code != "OK") {
-				err = fmt.Errorf(response.String())
+				return fmt.Errorf(response.String())
 			}
 		}
 	default:
 		return fmt.Errorf("unknown message type %s", message.Type)
 	}
-	return err
+
+	return nil
 }
diff --git a/provider/messagebird/messagebird.go b/provider/messagebird/messagebird.go
@@ -44,8 +44,7 @@ func NewMessageBird(config Config) *MessageBird {
 	}
 }
 
-func (mb *MessageBird) Send(message sachet.Message) error {
-	var err error = nil
+func (mb *MessageBird) Send(message sachet.Message) (err error) {
 	switch message.Type {
 	case "", "text":
 		_, err = sms.Create(mb.client, message.From, message.To, message.Text, &mb.messageParams)

diff --git a/provider/pushbullet/pushbullet.go b/provider/pushbullet/pushbullet.go
@@ -72,7 +72,6 @@ func (c *Pushbullet) Send(message sachet.Message) error {
 		default:
 			return fmt.Errorf("unrecognised target type: %s", targetType)
 		}
-
 	}
 
 	return nil

diff --git a/provider/textmagic/textmagic.go b/provider/textmagic/textmagic.go
@@ -33,8 +33,7 @@ func NewTextMagic(config Config) *TextMagic {
 	}
 }
 
-func (tm *TextMagic) Send(message sachet.Message) error {
-	var err error = nil
+func (tm *TextMagic) Send(message sachet.Message) (err error) {
 	switch message.Type {
 	case "", "text":
 		joinedTo := strings.Join(message.To[:], ",")