Merge d09a9667498ac6663d7239bccc204a203acabf9a into 40232de0d0c4059c7594b1ae7bb29481176502b1

see #837

.github/workflows/ci.yml

@@ -4,9 +4,22 @@ on:
   push:
     branches:
       - '**' #every branch
+    paths-ignore:
+      - "*/*.md"
+      - "*/*.yml"
+      - "doc/**"
+      - "plugins/**"
+      - ".github/**"
   pull_request:
     branches:
       - '**' #every branch
+    paths-ignore:
+      - "*/*.md"
+      - "*/*.yml"
+      - "doc/**"
+      - "plugins/**"
+      - ".github/**"
+      
 
 jobs:
   setup:

src/api/api.go

@@ -324,8 +324,14 @@ func (a *Api) RegisterNumber(c *gin.Context) {
 
 	err = a.signalClient.RegisterNumber(number, req.UseVoice, req.Captcha)
 	if err != nil {
-		c.JSON(400, gin.H{"error": err.Error()})
+		switch err.(type) {
-		return
+		case *client.InvalidTransportError:
+			c.JSON(400, Error{Msg: "Couldn't use SMS verification to register the specified number. Wait 60 seconds and try again with {\"use_voice\": true}"})
+			return
+		default:
+			c.JSON(400, Error{Msg: err.Error()})
+			return
+		}
 	}
 	c.Writer.WriteHeader(201)
 }

src/client/client.go

@@ -749,6 +749,8 @@ func (s *SignalClient) About() About {
 }
 
 func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha string) error {
+	var err error
+	var jsonRpc2Client *JsonRpc2Client
 	if s.signalCliMode == JsonRpc {
 		type Request struct {
 			UseVoice bool   `json:"voice,omitempty"`
@@ -765,12 +767,11 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
 			request.Captcha = captcha
 		}
 
-		jsonRpc2Client, err := s.getJsonRpc2Client()
+		jsonRpc2Client, err = s.getJsonRpc2Client()
 		if err != nil {
 			return err
 		}
 		_, err = jsonRpc2Client.getRaw("register", nil, request)
-		return err
 	} else {
 		command := []string{"--config", s.signalCliConfig, "-a", number, "register"}
 
@@ -782,9 +783,16 @@ func (s *SignalClient) RegisterNumber(number string, useVoice bool, captcha stri
 			command = append(command, []string{"--captcha", captcha}...)
 		}
 
-		_, err := s.cliClient.Execute(true, command, "")
+		_, err = s.cliClient.Execute(true, command, "")
-		return err
 	}
+
+	if err != nil {
+		if !useVoice && strings.Contains(err.Error(), "StatusCode: 400 (InvalidTransportModeException)") {
+			return &InvalidTransportError{Description: "Couldn't use SMS verification to register number."}
+		}
+	}
+
+	return err
 }
 
 func (s *SignalClient) UnregisterNumber(number string, deleteAccount bool, deleteLocalData bool) error {

src/client/errors.go

@@ -23,3 +23,11 @@ type InternalError struct {
 func (e *InternalError) Error() string {
 	return e.Description
 }
+
+type InvalidTransportError struct {
+	Description string
+}
+
+func (e *InvalidTransportError) Error() string {
+	return e.Description
+}