fix blaze message data base64

cedricfung · cedricfung · commit c5cffddc25cd · 2024-05-10T07:20:36.000Z
diff --git a/blaze.go b/blaze.go
@@ -59,7 +59,7 @@ type MessageView struct {
 	UserId           string    `json:"user_id"`
 	MessageId        string    `json:"message_id"`
 	Category         string    `json:"category"`
-	Data             string    `json:"data"`
+	DataBase64       string    `json:"data_base64"`
 	RepresentativeId string    `json:"representative_id"`
 	QuoteMessageId   string    `json:"quote_message_id"`
 	Status           string    `json:"status"`
@@ -187,7 +187,7 @@ func (b *BlazeClient) SendMessage(ctx context.Context, conversationId, recipient
 		"recipient_id":      recipientId,
 		"message_id":        messageId,
 		"category":          category,
-		"data":              base64.StdEncoding.EncodeToString([]byte(content)),
+		"data_base64":       base64.RawURLEncoding.EncodeToString([]byte(content)),
 		"representative_id": representativeId,
 	}
 	if err := writeMessageAndWait(ctx, b.mc, createMessageAction, params); err != nil {
@@ -202,7 +202,7 @@ func (b *BlazeClient) SendPlainText(ctx context.Context, msg MessageView, conten
 		"recipient_id":    msg.UserId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryPlainText,
-		"data":            base64.StdEncoding.EncodeToString([]byte(content)),
+		"data_base64":     base64.RawURLEncoding.EncodeToString([]byte(content)),
 	}
 	if err := writeMessageAndWait(ctx, b.mc, createMessageAction, params); err != nil {
 		return BlazeServerError(ctx, err)
@@ -220,7 +220,7 @@ func (b *BlazeClient) SendRecallMessage(ctx context.Context, conversationId, rec
 		"recipient_id":    recipientId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryMessageRecall,
-		"data":            base64.StdEncoding.EncodeToString(a),
+		"data_base64":     base64.RawURLEncoding.EncodeToString(a),
 	}
 	if err := writeMessageAndWait(ctx, b.mc, createMessageAction, params); err != nil {
 		return BlazeServerError(ctx, err)
@@ -234,7 +234,7 @@ func (b *BlazeClient) SendPost(ctx context.Context, msg MessageView, content str
 		"recipient_id":    msg.UserId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryPlainPost,
-		"data":            base64.StdEncoding.EncodeToString([]byte(content)),
+		"data_base64":     base64.RawURLEncoding.EncodeToString([]byte(content)),
 	}
 	if err := writeMessageAndWait(ctx, b.mc, createMessageAction, params); err != nil {
 		return BlazeServerError(ctx, err)
@@ -250,7 +250,7 @@ func (b *BlazeClient) SendContact(ctx context.Context, conversationId, recipient
 		"recipient_id":    recipientId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryPlainContact,
-		"data":            base64.StdEncoding.EncodeToString(contactData),
+		"data_base64":     base64.RawURLEncoding.EncodeToString(contactData),
 	}
 	if err := writeMessageAndWait(ctx, b.mc, createMessageAction, params); err != nil {
 		return BlazeServerError(ctx, err)
@@ -273,7 +273,7 @@ func (b *BlazeClient) SendAppCard(ctx context.Context, conversationId, recipient
 		"recipient_id":    recipientId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryAppCard,
-		"data":            base64.StdEncoding.EncodeToString(data),
+		"data_base64":     base64.RawURLEncoding.EncodeToString(data),
 	}
 	err = writeMessageAndWait(ctx, b.mc, createMessageAction, params)
 	if err != nil {
@@ -296,7 +296,7 @@ func (b *BlazeClient) SendAppButton(ctx context.Context, conversationId, recipie
 		"recipient_id":    recipientId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryAppButtonGroup,
-		"data":            base64.StdEncoding.EncodeToString(btns),
+		"data_base64":     base64.RawURLEncoding.EncodeToString(btns),
 	}
 	err = writeMessageAndWait(ctx, b.mc, createMessageAction, params)
 	if err != nil {
@@ -318,7 +318,7 @@ func (b *BlazeClient) SendGroupAppButton(ctx context.Context, conversationId, re
 		"recipient_id":    recipientId,
 		"message_id":      UuidNewV4().String(),
 		"category":        MessageCategoryAppButtonGroup,
-		"data":            base64.StdEncoding.EncodeToString(btns),
+		"data_base64":     base64.RawURLEncoding.EncodeToString(btns),
 	}
 	err = writeMessageAndWait(ctx, b.mc, createMessageAction, params)
 	if err != nil {
diff --git a/cli/pin.go b/cli/pin.go
@@ -35,6 +35,6 @@ func verifyPINCmd(c *cli.Context) error {
 	if err != nil {
 		panic(err)
 	}
-	log.Println("user %#v", user)
+	log.Printf("user %#v", user)
 	return nil
 }
diff --git a/message.go b/message.go
@@ -39,7 +39,7 @@ type MessageRequest struct {
 	RecipientId      string `json:"recipient_id"`
 	MessageId        string `json:"message_id"`
 	Category         string `json:"category"`
-	Data             string `json:"data"`
+	DataBase64       string `json:"data_base64"`
 	RepresentativeId string `json:"representative_id"`
 	QuoteMessageId   string `json:"quote_message_id"`
 }
@@ -101,13 +101,13 @@ func PostMessages(ctx context.Context, messages []*MessageRequest, user *SafeUse
 	return nil
 }
 
-func PostMessage(ctx context.Context, conversationId, recipientId, messageId, category, data string, user *SafeUser) error {
+func PostMessage(ctx context.Context, conversationId, recipientId, messageId, category, dataBase64 string, user *SafeUser) error {
 	request := MessageRequest{
 		ConversationId: conversationId,
 		RecipientId:    recipientId,
 		MessageId:      messageId,
 		Category:       category,
-		Data:           data,
+		DataBase64:     dataBase64,
 	}
 	return PostMessages(ctx, []*MessageRequest{&request}, user)
 }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ func verifyPINCmd(c *cli.Context) error {`
`35`	`35`	`if err != nil {`
`36`	`36`	`panic(err)`
`37`	`37`	`}`
`38`		`- log.Println("user %#v", user)`
	`38`	`+ log.Printf("user %#v", user)`
`39`	`39`	`return nil`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ type MessageRequest struct {`
`39`	`39`	RecipientId string `json:"recipient_id"`
`40`	`40`	MessageId string `json:"message_id"`
`41`	`41`	Category string `json:"category"`
`42`		- Data string `json:"data"`
	`42`	+ DataBase64 string `json:"data_base64"`
`43`	`43`	RepresentativeId string `json:"representative_id"`
`44`	`44`	QuoteMessageId string `json:"quote_message_id"`
`45`	`45`	`}`
`@@ -101,13 +101,13 @@ func PostMessages(ctx context.Context, messages []MessageRequest, user SafeUse`
`101`	`101`	`return nil`
`102`	`102`	`}`
`103`	`103`
`104`		`-func PostMessage(ctx context.Context, conversationId, recipientId, messageId, category, data string, user *SafeUser) error {`
	`104`	`+func PostMessage(ctx context.Context, conversationId, recipientId, messageId, category, dataBase64 string, user *SafeUser) error {`
`105`	`105`	`request := MessageRequest{`
`106`	`106`	`ConversationId: conversationId,`
`107`	`107`	`RecipientId: recipientId,`
`108`	`108`	`MessageId: messageId,`
`109`	`109`	`Category: category,`
`110`		`- Data: data,`
	`110`	`+ DataBase64: dataBase64,`
`111`	`111`	`}`
`112`	`112`	`return PostMessages(ctx, []*MessageRequest{&request}, user)`
`113`	`113`	`}`