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

Move download method to same file as upload

Browse source
This commit is contained in:
Tulir Asokan 2023-07-19 01:18:06 +03:00
parent afae081429
commit b46885ad58
2 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
libgm/client.go
View file

@ -194,48 +194,6 @@ func (c *Client) triggerEvent(evt interface{}) {
} }
} }
func (c *Client) DownloadMedia(mediaID string, key []byte) ([]byte, error) {
downloadMetadata := &gmproto.DownloadAttachmentRequest{
Info: &gmproto.AttachmentInfo{
AttachmentID: mediaID,
Encrypted: true,
},
AuthData: &gmproto.AuthMessage{
RequestID: uuid.NewString(),
TachyonAuthToken: c.AuthData.TachyonAuthToken,
ConfigVersion: util.ConfigMessage,
},
}
downloadMetadataBytes, err := proto.Marshal(downloadMetadata)
if err != nil {
return nil, err
}
downloadMetadataEncoded := base64.StdEncoding.EncodeToString(downloadMetadataBytes)
req, err := http.NewRequest("GET", util.UploadMediaURL, nil)
if err != nil {
return nil, err
}
util.BuildUploadHeaders(req, downloadMetadataEncoded)
res, reqErr := c.http.Do(req)
if reqErr != nil {
return nil, reqErr
}
defer res.Body.Close()
encryptedBuffImg, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
}
cryptor, err := crypto.NewAESGCMHelper(key)
if err != nil {
return nil, err
}
decryptedImageBytes, decryptionErr := cryptor.DecryptData(encryptedBuffImg)
if decryptionErr != nil {
return nil, decryptionErr
}
return decryptedImageBytes, nil
}
func (c *Client) FetchConfigVersion() { func (c *Client) FetchConfigVersion() {
req, bErr := http.NewRequest("GET", util.ConfigUrl, nil) req, bErr := http.NewRequest("GET", util.ConfigUrl, nil)
if bErr != nil { if bErr != nil {

42
libgm/upload.go → libgm/media.go
View file

@ -247,3 +247,45 @@ func (c *Client) buildStartUploadPayload() (string, error) {
return protoDataEncoded, nil return protoDataEncoded, nil
} }
func (c *Client) DownloadMedia(mediaID string, key []byte) ([]byte, error) {
downloadMetadata := &gmproto.DownloadAttachmentRequest{
Info: &gmproto.AttachmentInfo{
AttachmentID: mediaID,
Encrypted: true,
},
AuthData: &gmproto.AuthMessage{
RequestID: uuid.NewString(),
TachyonAuthToken: c.AuthData.TachyonAuthToken,
ConfigVersion: util.ConfigMessage,
},
}
downloadMetadataBytes, err := proto.Marshal(downloadMetadata)
if err != nil {
return nil, err
}
downloadMetadataEncoded := base64.StdEncoding.EncodeToString(downloadMetadataBytes)
req, err := http.NewRequest("GET", util.UploadMediaURL, nil)
if err != nil {
return nil, err
}
util.BuildUploadHeaders(req, downloadMetadataEncoded)
res, reqErr := c.http.Do(req)
if reqErr != nil {
return nil, reqErr
}
defer res.Body.Close()
encryptedBuffImg, err := io.ReadAll(res.Body)
if err != nil {
return nil, err
}
cryptor, err := crypto.NewAESGCMHelper(key)
if err != nil {
return nil, err
}
decryptedImageBytes, decryptionErr := cryptor.DecryptData(encryptedBuffImg)
if decryptionErr != nil {
return nil, decryptionErr
}
return decryptedImageBytes, nil
}