Add support for sending captions and fix some fields in send requests

mautrix · Apr 16, 2024 · 1d3ef74 · 1d3ef74
1 parent d0a8b84
commit 1d3ef74
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 5 deletions.
diff --git a/libgm/gmproto/client.pb.go b/libgm/gmproto/client.pb.go
diff --git a/libgm/gmproto/client.pb.raw b/libgm/gmproto/client.pb.raw
diff --git a/libgm/gmproto/client.proto b/libgm/gmproto/client.proto
@@ -254,7 +254,7 @@ message SendMessageRequest {
     MessagePayload messagePayload = 3;
     settings.SIMPayload SIMPayload = 4;
     string tmpID = 5;
-    bool isReply = 6; // not sure
+    bool isRCS = 6; // not sure
     ReplyPayload reply = 8;
 }
 

diff --git a/libgm/gmproto/conversations.pb.go b/libgm/gmproto/conversations.pb.go
diff --git a/libgm/gmproto/conversations.pb.raw b/libgm/gmproto/conversations.pb.raw
diff --git a/libgm/gmproto/conversations.proto b/libgm/gmproto/conversations.proto
@@ -130,6 +130,7 @@ message MediaContent {
     string mediaID2 = 9;
     bytes decryptionKey = 11;
     bytes decryptionKey2 = 12;
+    string mimeType = 14;
 }
 
 message Dimensions {

diff --git a/libgm/media.go b/libgm/media.go
@@ -115,6 +115,7 @@ func (c *Client) UploadMedia(data []byte, fileName, mime string) (*gmproto.Media
 		MediaName:     fileName,
 		Size:          int64(len(data)),
 		DecryptionKey: decryptionKey,
+		MimeType:      mime,
 	}, nil
 }
 

diff --git a/portal.go b/portal.go
@@ -1932,10 +1932,10 @@ func (portal *Portal) convertMatrixMessage(ctx context.Context, sender *User, co
 		} else if replyToMsg == nil {
 			log.Warn().Str("reply_to_mxid", replyToMXID.String()).Msg("Reply target message not found")
 		} else {
-			req.IsReply = true
 			req.Reply = &gmproto.ReplyPayload{MessageID: replyToMsg.ID}
 		}
 	}
+	req.IsRCS = portal.Type == gmproto.ConversationType_RCS
 
 	switch content.MsgType {
 	case event.MsgText, event.MsgEmote, event.MsgNotice:
@@ -1956,6 +1956,13 @@ func (portal *Portal) convertMatrixMessage(ctx context.Context, sender *User, co
 		req.MessagePayload.MessageInfo = []*gmproto.MessageInfo{{
 			Data: &gmproto.MessageInfo_MediaContent{MediaContent: resp},
 		}}
+		if content.FileName != "" && content.FileName != content.Body {
+			req.MessagePayload.MessageInfo = append(req.MessagePayload.MessageInfo, &gmproto.MessageInfo{
+				Data: &gmproto.MessageInfo_MessageContent{MessageContent: &gmproto.MessageContent{
+					Content: content.Body,
+				}},
+			})
+		}
 	case event.MsgBeeperGallery:
 		for i, part := range content.BeeperGalleryImages {
 			convertedPart, err := portal.reuploadMedia(ctx, sender, part, nil)