seang96/gmessages
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove message builder

Browse source
This commit is contained in:
Tulir Asokan 2023-07-15 19:48:26 +03:00
parent b8d4b49de3
commit b2e6d206bd
4 changed files with 116 additions and 282 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libgm/conversations.go
View file

@ -90,12 +90,7 @@ func (c *Conversations) FetchMessages(conversationId string, count int64, cursor
return res, nil return res, nil
} }
func (c *Conversations) SendMessage(messageBuilder *MessageBuilder) (*binary.SendMessageResponse, error) { func (c *Conversations) SendMessage(payload *binary.SendMessagePayload) (*binary.SendMessageResponse, error) {
payload, failedToBuild := messageBuilder.Build()
if failedToBuild != nil {
return nil, failedToBuild
}
actionType := binary.ActionType_SEND_MESSAGE actionType := binary.ActionType_SEND_MESSAGE
sentRequestId, sendErr := c.client.sessionHandler.completeSendMessage(actionType, true, payload) sentRequestId, sendErr := c.client.sessionHandler.completeSendMessage(actionType, true, payload)

139
libgm/image_builder.go
View file

@ -1,41 +1,50 @@
package libgm package libgm
import ( import (
"go.mau.fi/mautrix-gmessages/libgm/binary"
"go.mau.fi/mautrix-gmessages/libgm/crypto" "go.mau.fi/mautrix-gmessages/libgm/crypto"
"go.mau.fi/mautrix-gmessages/libgm/util" "go.mau.fi/mautrix-gmessages/libgm/util"
) )
type ImageType struct { type MediaType struct {
Extension string Extension string
Format string Format string
Type int64 Type int64
} }
var ImageTypes = map[string]ImageType{ var MediaTypes = map[string]MediaType{
"image/jpeg": {Extension: "jpeg", Format: "image/jpeg", Type: 1}, "image/jpeg": {Extension: "jpeg", Format: "image/jpeg", Type: 1},
"image/jpg": {Extension: "jpg", Format: "image/jpg", Type: 2}, "image/jpg": {Extension: "jpg", Format: "image/jpg", Type: 2},
"image/png": {Extension: "png", Format: "image/png", Type: 3}, "image/png": {Extension: "png", Format: "image/png", Type: 3},
"image/gif": {Extension: "gif", Format: "image/gif", Type: 4}, "image/gif": {Extension: "gif", Format: "image/gif", Type: 4},
"image/wbmp": {Extension: "wbmp", Format: "image/wbmp", Type: 5}, "image/wbmp": {Extension: "wbmp", Format: "image/wbmp", Type: 5},
"image/bmp": {Extension: "bmp", Format: "image/bmp", Type: 6}, "image/bmp": {Extension: "bmp", Format: "image/bmp", Type: 6},
"image/x-ms-bmp": {Extension: "bmp", Format: "image/x-ms-bmp", Type: 6}, "image/x-ms-bmp": {Extension: "bmp", Format: "image/x-ms-bmp", Type: 6},
"audio/aac": {Extension: "aac", Format: "audio/aac", Type: 14}, "image": {Type: 7},
"audio/amr": {Extension: "amr", Format: "audio/amr", Type: 15},
"audio/mp3": {Extension: "mp3", Format: "audio/mp3", Type: 16}, "video/mp4": {Extension: "mp4", Format: "video/mp4", Type: 8},
"audio/mpeg": {Extension: "mpeg", Format: "audio/mpeg", Type: 17}, "video/3gpp2": {Extension: "3gpp2", Format: "video/3gpp2", Type: 9},
"audio/mpg": {Extension: "mpg", Format: "audio/mpg", Type: 18}, "video/3gpp": {Extension: "3gpp", Format: "video/3gpp", Type: 10},
"audio/mp4": {Extension: "mp4", Format: "audio/mp4", Type: 19}, "video/webm": {Extension: "webm", Format: "video/webm", Type: 11},
"audio/mp4-latm": {Extension: "latm", Format: "audio/mp4-latm", Type: 20}, "video/x-matroska": {Extension: "mkv", Format: "video/x-matroska", Type: 12},
"audio/3gpp": {Extension: "3gpp", Format: "audio/3gpp", Type: 21}, "video": {Type: 13},
"audio/ogg": {Extension: "ogg", Format: "audio/ogg", Type: 22},
"video/mp4": {Extension: "mp4", Format: "video/mp4", Type: 8}, "audio/aac": {Extension: "aac", Format: "audio/aac", Type: 14},
"video/3gpp2": {Extension: "3gpp2", Format: "video/3gpp2", Type: 9}, "audio/amr": {Extension: "amr", Format: "audio/amr", Type: 15},
"video/3gpp": {Extension: "3gpp", Format: "video/3gpp", Type: 10}, "audio/mp3": {Extension: "mp3", Format: "audio/mp3", Type: 16},
"video/webm": {Extension: "webm", Format: "video/webm", Type: 11}, "audio/mpeg": {Extension: "mpeg", Format: "audio/mpeg", Type: 17},
"video/x-matroska": {Extension: "mkv", Format: "video/x-matroska", Type: 12}, "audio/mpg": {Extension: "mpg", Format: "audio/mpg", Type: 18},
"audio/mp4": {Extension: "mp4", Format: "audio/mp4", Type: 19},
"audio/mp4-latm": {Extension: "latm", Format: "audio/mp4-latm", Type: 20},
"audio/3gpp": {Extension: "3gpp", Format: "audio/3gpp", Type: 21},
"audio/ogg": {Extension: "ogg", Format: "audio/ogg", Type: 22},
"auidio": {Type: 23},
"text/vcard": {Extension: "vcard", Format: "text/vcard", Type: 24},
"text/x-vcard": {Extension: "vcard", Format: "text/x-vcard", Type: 24},
"application/pdf": {Extension: "pdf", Format: "application/pdf", Type: 25}, "application/pdf": {Extension: "pdf", Format: "application/pdf", Type: 25},
"application/txt": {Extension: "txt", Format: "application/txt", Type: 26}, "text/plain": {Extension: "txt", Format: "text/plain", Type: 26},
"application/html": {Extension: "html", Format: "application/html", Type: 27}, "text/html": {Extension: "html", Format: "text/html", Type: 27},
"application/msword": {Extension: "doc", Format: "application/msword", Type: 28}, "application/msword": {Extension: "doc", Format: "application/msword", Type: 28},
"application/vnd.openxmlformats-officedocument.wordprocessingml.document": {Extension: "docx", Format: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", Type: 29}, "application/vnd.openxmlformats-officedocument.wordprocessingml.document": {Extension: "docx", Format: "application/vnd.openxmlformats-officedocument.wordprocessingml.document", Type: 29},
"application/vnd.openxmlformats-officedocument.presentationml.presentation": {Extension: "pptx", Format: "application/vnd.openxmlformats-officedocument.presentationml.presentation", Type: 30}, "application/vnd.openxmlformats-officedocument.presentationml.presentation": {Extension: "pptx", Format: "application/vnd.openxmlformats-officedocument.presentationml.presentation", Type: 30},
@ -51,8 +60,6 @@ var ImageTypes = map[string]ImageType{
"application/vcs": {Extension: "vcs", Format: "application/vcs", Type: 41}, "application/vcs": {Extension: "vcs", Format: "application/vcs", Type: 41},
"application/ics": {Extension: "ics", Format: "application/ics", Type: 42}, "application/ics": {Extension: "ics", Format: "application/ics", Type: 42},
"application/hbs-vcs": {Extension: "vcs", Format: "application/hbs-vcs", Type: 43}, "application/hbs-vcs": {Extension: "vcs", Format: "application/hbs-vcs", Type: 43},
"text/vcard": {Extension: "vcard", Format: "text/vcard", Type: 24},
"text/x-vcard": {Extension: "vcard", Format: "text/x-vcard", Type: 24},
} }
type Image struct { type Image struct {
@ -60,7 +67,7 @@ type Image struct {
imageName string imageName string
imageID string imageID string
imageType ImageType imageType MediaType
imageBytes []byte imageBytes []byte
imageSize int64 imageSize int64
} }
@ -89,7 +96,7 @@ func (i *Image) GetImageSize() int64 {
return i.imageSize return i.imageSize
} }
func (i *Image) GetImageType() ImageType { func (i *Image) GetImageType() MediaType {
return i.imageType return i.imageType
} }
@ -100,52 +107,42 @@ func (i *Image) GetImageID() string {
// This is the equivalent of dragging an image into the window on messages web // This is the equivalent of dragging an image into the window on messages web
// //
// Keep in mind that adding an image to a MessageBuilder will also upload the image to googles server // Keep in mind that adding an image to a MessageBuilder will also upload the image to googles server
func (mb *MessageBuilder) AddImage(imgBytes []byte, mime string) *MessageBuilder { func (c *Client) UploadMedia(data []byte, mime string) (*binary.MediaContent, error) {
if mb.err != nil { mediaType := MediaTypes[mime]
return mb mediaID := util.GenerateImageID()
} fileName := util.RandStr(8) + "." + mediaType.Extension
newImage, newImageErr := mb.newImageData(imgBytes, mime)
if newImageErr != nil {
mb.err = newImageErr
return mb
}
startUploadImage, failedUpload := mb.client.StartUploadMedia(newImage)
if failedUpload != nil {
mb.err = failedUpload
return mb
}
finalizedImage, failedFinalize := mb.client.FinalizeUploadMedia(startUploadImage)
if failedFinalize != nil {
mb.err = failedFinalize
return mb
}
mb.images = append(mb.images, finalizedImage)
return mb
}
func (mb *MessageBuilder) newImageData(imgBytes []byte, mime string) (*Image, error) {
// TODO explode on unsupported types
imgType := ImageTypes[mime]
imageId := util.GenerateImageID()
imageName := util.RandStr(8) + "." + imgType.Extension
decryptionKey, err := crypto.GenerateKey(32) decryptionKey, err := crypto.GenerateKey(32)
if err != nil { if err != nil {
return nil, err return nil, err
} }
imageCryptor, cryptorErr := crypto.NewImageCryptor(decryptionKey) cryptor, err := crypto.NewImageCryptor(decryptionKey)
if cryptorErr != nil { if err != nil {
return nil, cryptorErr return nil, err
} }
return &Image{ image := &Image{
imageCryptor: imageCryptor, imageCryptor: cryptor,
imageID: imageId, imageID: mediaID,
imageBytes: imgBytes, imageBytes: data,
imageType: imgType, imageType: mediaType,
imageSize: int64(len(imgBytes)), imageSize: int64(len(data)),
imageName: imageName, imageName: fileName,
}
startUploadImage, err := c.StartUploadMedia(image)
if err != nil {
return nil, err
}
upload, err := c.FinalizeUploadMedia(startUploadImage)
if err != nil {
return nil, err
}
return &binary.MediaContent{
Format: binary.MediaFormats(image.GetImageType().Type),
MediaID: upload.MediaID,
MediaName: image.GetImageName(),
Size: image.GetImageSize(),
DecryptionKey: image.GetImageCryptor().GetKey(),
}, nil }, nil
} }

186
libgm/message_builder.go
View file

@ -1,186 +0,0 @@
package libgm
import (
"errors"
"go.mau.fi/mautrix-gmessages/libgm/binary"
"go.mau.fi/mautrix-gmessages/libgm/util"
)
var (
errContentNotSet = errors.New("failed to build MessageBuilder: content must be larger than length 0")
errConversationIdNotSet = errors.New("failed to build MessageBuilder: conversationID is empty")
errSelfParticipantIdNotSet = errors.New("failed to build MessageBuilder: selfParticipantID is empty")
)
type MessageBuilder struct {
client *Client
content string
conversationID string
tmpID string
selfParticipantID string
replyToMessageID string
images []*MediaUpload
err error
}
func (mb *MessageBuilder) Err() error {
return mb.err
}
func (mb *MessageBuilder) GetImages() []*MediaUpload {
return mb.images
}
func (mb *MessageBuilder) GetContent() string {
return mb.content
}
func (mb *MessageBuilder) GetConversationID() string {
return mb.conversationID
}
func (mb *MessageBuilder) GetSelfParticipantID() string {
return mb.selfParticipantID
}
func (mb *MessageBuilder) GetTmpID() string {
return mb.tmpID
}
func (mb *MessageBuilder) SetContent(content string) *MessageBuilder {
mb.content = content
return mb
}
func (mb *MessageBuilder) SetConversationID(conversationId string) *MessageBuilder {
mb.conversationID = conversationId
return mb
}
// sendmessage function will set this automatically but if u want to set it yourself feel free
func (mb *MessageBuilder) SetSelfParticipantID(participantId string) *MessageBuilder {
mb.selfParticipantID = participantId
return mb
}
// messageID of the message to reply to
func (mb *MessageBuilder) SetReplyMessage(messageId string) *MessageBuilder {
mb.replyToMessageID = messageId
return mb
}
// sendmessage function will set this automatically but if u want to set it yourself feel free
func (mb *MessageBuilder) SetTmpID(tmpId string) *MessageBuilder {
mb.tmpID = tmpId
return mb
}
func (mb *MessageBuilder) Build() (*binary.SendMessagePayload, error) {
if mb.conversationID == "" {
return nil, errConversationIdNotSet
}
if mb.selfParticipantID == "" {
return nil, errSelfParticipantIdNotSet
}
if mb.content == "" {
return nil, errContentNotSet
}
if mb.tmpID == "" {
mb.tmpID = util.GenerateTmpID()
}
return mb.newSendConversationMessage(), nil
}
func (c *Client) NewMessageBuilder() *MessageBuilder {
mb := &MessageBuilder{
client: c,
}
tmpId := util.GenerateTmpID()
mb.SetTmpID(tmpId)
return mb
}
func (mb *MessageBuilder) newSendConversationMessage() *binary.SendMessagePayload {
convId := mb.GetConversationID()
content := mb.GetContent()
selfParticipantId := mb.GetSelfParticipantID()
tmpId := mb.GetTmpID()
messageInfo := make([]*binary.MessageInfo, 0)
messageInfo = append(messageInfo, &binary.MessageInfo{Data: &binary.MessageInfo_MessageContent{
MessageContent: &binary.MessageContent{
Content: content,
},
}})
mb.appendImagesPayload(&messageInfo)
sendMsgPayload := &binary.SendMessagePayload{
ConversationID: convId,
MessagePayload: &binary.MessagePayload{
TmpID: tmpId,
ConversationID: convId,
SelfParticipantID: selfParticipantId,
MessageInfo: messageInfo,
TmpID2: tmpId,
},
TmpID: tmpId,
}
if len(content) > 0 {
sendMsgPayload.MessagePayload.MessagePayloadContent = &binary.MessagePayloadContent{
MessageContent: &binary.MessageContent{
Content: content,
},
}
}
if mb.replyToMessageID != "" {
sendMsgPayload.IsReply = true
sendMsgPayload.Reply = &binary.ReplyPayload{MessageID: mb.replyToMessageID}
}
mb.client.Logger.Debug().Any("sendMsgPayload", sendMsgPayload).Msg("sendMessagePayload")
return sendMsgPayload
}
func (mb *MessageBuilder) appendImagesPayload(messageInfo *[]*binary.MessageInfo) {
if len(mb.images) <= 0 {
return
}
for _, media := range mb.images {
imgData := mb.newImageContent(media)
*messageInfo = append(*messageInfo, imgData)
}
}
func (mb *MessageBuilder) newImageContent(media *MediaUpload) *binary.MessageInfo {
imageMessage := &binary.MessageInfo{
Data: &binary.MessageInfo_MediaContent{
MediaContent: &binary.MediaContent{
Format: binary.MediaFormats(media.Image.GetImageType().Type),
MediaID: media.MediaID,
MediaName: media.Image.GetImageName(),
Size: media.Image.GetImageSize(),
DecryptionKey: media.Image.GetImageCryptor().GetKey(),
},
},
}
mb.client.Logger.Debug().Any("imageMessage", imageMessage).Msg("New Media Content")
return imageMessage
}

66
portal.go
View file

@ -1207,7 +1207,24 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event, timing
return return
} }
var replyToID string txnID := util.GenerateTmpID()
portal.outgoingMessagesLock.Lock()
portal.outgoingMessages[txnID] = &outgoingMessage{Event: evt}
portal.outgoingMessagesLock.Unlock()
if evt.Type == event.EventSticker {
content.MsgType = event.MsgImage
}
req := &binary.SendMessagePayload{
ConversationID: portal.ID,
TmpID: txnID,
MessagePayload: &binary.MessagePayload{
ConversationID: portal.ID,
TmpID: txnID,
TmpID2: txnID,
SelfParticipantID: portal.SelfUserID,
},
}
replyToMXID := content.RelatesTo.GetReplyTo() replyToMXID := content.RelatesTo.GetReplyTo()
if replyToMXID != "" { if replyToMXID != "" {
replyToMsg, err := portal.bridge.DB.Message.GetByMXID(ctx, replyToMXID) replyToMsg, err := portal.bridge.DB.Message.GetByMXID(ctx, replyToMXID)
@ -1216,35 +1233,46 @@ func (portal *Portal) HandleMatrixMessage(sender *User, evt *event.Event, timing
} else if replyToMsg == nil { } else if replyToMsg == nil {
log.Warn().Str("reply_to_mxid", replyToMXID.String()).Msg("Reply target message not found") log.Warn().Str("reply_to_mxid", replyToMXID.String()).Msg("Reply target message not found")
} else { } else {
replyToID = replyToMsg.ID req.IsReply = true
req.Reply = &binary.ReplyPayload{MessageID: replyToMsg.ID}
} }
} }
txnID := util.GenerateTmpID()
portal.outgoingMessagesLock.Lock()
portal.outgoingMessages[txnID] = &outgoingMessage{Event: evt}
portal.outgoingMessagesLock.Unlock()
switch content.MsgType { switch content.MsgType {
case event.MsgText, event.MsgEmote, event.MsgNotice: case event.MsgText, event.MsgEmote, event.MsgNotice:
text := content.Body text := content.Body
if content.MsgType == event.MsgEmote { if content.MsgType == event.MsgEmote {
text = "/me " + text text = "/me " + text
} }
_, err := sender.Client.Conversations.SendMessage( req.MessagePayload.MessageInfo = []*binary.MessageInfo{{
sender.Client.NewMessageBuilder(). Data: &binary.MessageInfo_MessageContent{MessageContent: &binary.MessageContent{
SetConversationID(portal.ID). Content: text,
SetSelfParticipantID(portal.SelfUserID). }},
SetReplyMessage(replyToID). }}
SetContent(text). case event.MsgImage, event.MsgVideo, event.MsgAudio, event.MsgFile:
SetTmpID(txnID), //fileName := content.Body
) //if content.FileName != "" {
if err != nil { // fileName = content.FileName
go ms.sendMessageMetrics(evt, err, "Error sending", true) //}
} else { //sender.Client.StartUploadMedia()
go ms.sendMessageMetrics(evt, nil, "", true) //req.MessagePayload.MessageInfo = []*binary.MessageInfo{{
} // Data: &binary.MessageInfo_MediaContent{MediaContent: &binary.MediaContent{
// Format: 0,
// MediaID: mediaID,
// MediaName: fileName,
// Size: int64(len(data)),
// DecryptionKey: decryptionKey,
// }},
//}}
default: default:
go ms.sendMessageMetrics(evt, fmt.Errorf("unsupported msgtype"), "Ignoring", true) go ms.sendMessageMetrics(evt, fmt.Errorf("unsupported msgtype"), "Ignoring", true)
return
}
_, err := sender.Client.Conversations.SendMessage(req)
if err != nil {
go ms.sendMessageMetrics(evt, err, "Error sending", true)
} else {
go ms.sendMessageMetrics(evt, nil, "", true)
} }
} }