Merge pull request #55 from signal-golang/json_marshall_error

Fix receiving messages on 32bit systems
signal-golang · Jan 28, 2022 · 042b4bf · 042b4bf
2 parents 9ce24f5 + 5692f19
commit 042b4bf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crayfish/backend.go b/crayfish/backend.go
@@ -147,15 +147,15 @@ type Sender struct {
 }
 type PhoneNumber struct {
 	Code     PhoneNumberCode     `json:"code"`
-	National PhoneNumberNational `json:"national"`
+	National PhoneNumberNational `json:"national,string,omitempty"`
 }
 type PhoneNumberCode struct {
-	Value  int    `json:"value"`
+	Value  uint64 `json:"value"`
 	Source string `json:"source"`
 }
 type PhoneNumberNational struct {
-	Value int `json:"value"`
-	Zeros int `json:"zeros"`
+	Value uint64 `json:"value"`
+	Zeros int    `json:"zeros"`
 }
 
 func Run() {

diff --git a/textsecure.go b/textsecure.go
@@ -636,7 +636,7 @@ func handleReceivedMessage(env *signalservice.Envelope) error {
 			return err
 		}
 		env.Content = content
-		phoneNumber := "+" + strconv.Itoa(data.Sender.PhoneNumber.Code.Value) + strconv.Itoa(data.Sender.PhoneNumber.National.Value)
+		phoneNumber := "+" + strconv.FormatUint(data.Sender.PhoneNumber.Code.Value, 10) + strconv.FormatUint(data.Sender.PhoneNumber.National.Value, 10)
 		log.Println("[textsecure] handleReceivedMessage:", phoneNumber, data.Sender.UUID)
 		err = handleMessage(phoneNumber, data.Sender.UUID, uint64(data.Timestamp), content)
 		if err != nil {