send img

Author: rnons

pkg/connector/handlematrix.go

@@ -8,6 +8,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
 
+	"go.mau.fi/util/ptr"
+
 	"go.mau.fi/mautrix-googlechat/pkg/gchatmeow/proto"
 )
 
@@ -27,10 +29,37 @@ func (c *GChatClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.Mat
 		return nil, err
 	}
 
-	res, err := c.client.CreateTopic(ctx, &proto.CreateTopicRequest{
+	plainGroupId := groupId.GetDmId().DmId
+	if plainGroupId == nil {
+		plainGroupId = groupId.GetSpaceId().SpaceId
+	}
+
+	req := &proto.CreateTopicRequest{
 		GroupId:  groupId,
 		TextBody: &msg.Content.Body,
-	})
+	}
+
+	if msg.Content.MsgType.IsMedia() {
+		data, err := c.userLogin.Bridge.Bot.DownloadMedia(ctx, msg.Content.URL, msg.Content.File)
+		if err != nil {
+			return nil, err
+		}
+		metadata, err := c.client.UploadFile(ctx, data, *plainGroupId, msg.Content.FileName, msg.Content.Info.MimeType)
+		if err != nil {
+			return nil, err
+		}
+		req.Annotations = []*proto.Annotation{
+			{
+				Type:           ptr.Ptr(proto.AnnotationType_UPLOAD_METADATA),
+				ChipRenderType: ptr.Ptr(proto.Annotation_RENDER),
+				Metadata: &proto.Annotation_UploadMetadata{
+					UploadMetadata: metadata,
+				},
+			},
+		}
+	}
+
+	res, err := c.client.CreateTopic(ctx, req)
 	if err != nil {
 		return nil, err
 	}

pkg/gchatmeow/api.go

@@ -2,6 +2,8 @@ package gchatmeow
 
 import (
 	"context"
+	"encoding/base64"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -46,7 +48,7 @@ func (c *Client) gcRequest(ctx context.Context, endpoint string, requestPB proto
 		return err
 	}
 
-	if err := pb.Unmarshal(res, responsePB); err != nil {
+	if err := pb.Unmarshal(res.Body, responsePB); err != nil {
 		return fmt.Errorf("failed to decode Protocol Buffer response: %v", err)
 	}
 
@@ -63,7 +65,7 @@ func (c *Client) baseRequest(
 	headers http.Header,
 	params url.Values,
 	method string,
-) ([]byte, error) {
+) (*FetchResponse, error) {
 	if headers == nil {
 		headers = http.Header{}
 	}
@@ -88,7 +90,7 @@ func (c *Client) baseRequest(
 		return nil, err
 	}
 
-	return res.Body, nil
+	return res, nil
 }
 
 func (c *Client) getSelfUserStatus(ctx context.Context) (*proto.GetSelfUserStatusResponse, error) {
@@ -145,3 +147,49 @@ func (c *Client) GetGroup(ctx context.Context, request *proto.GetGroupRequest) (
 	err := c.gcRequest(ctx, "get_group", request, response)
 	return response, err
 }
+
+func (c *Client) UploadFile(ctx context.Context, data []byte, groupId string, fileName string, mimeType string) (*proto.UploadMetadata, error) {
+	headers := http.Header{
+		"x-goog-upload-protocol":       {"resumable"},
+		"x-goog-upload-command":        {"start"},
+		"x-goog-upload-content-length": {string(len(data))},
+		"x-goog-upload-content-type":   {mimeType},
+		"x-goog-upload-file-name":      {fileName},
+	}
+	res, err := c.baseRequest(
+		ctx, uploadURL, "", "", nil,
+		headers, url.Values{"group_id": []string{groupId}},
+		http.MethodPost,
+	)
+	if err != nil {
+		return nil, err
+	}
+	newUploadURL := res.Headers.Get("x-goog-upload-url")
+	if newUploadURL == "" {
+		return nil, errors.New("image upload failed: can not acquire an upload url")
+	}
+
+	headers = http.Header{
+		"x-goog-upload-command":  {"upload, finalize"},
+		"x-goog-upload-protocol": {"resumable"},
+		"x-goog-upload-offset":   {"0"},
+	}
+	res, err = c.baseRequest(
+		ctx, newUploadURL, "", "",
+		data, headers, nil,
+		http.MethodPut,
+	)
+	if err != nil {
+		return nil, err
+	}
+	body, err := base64.StdEncoding.DecodeString(string(res.Body))
+	if err != nil {
+		return nil, err
+	}
+	uploadMetadata := &proto.UploadMetadata{}
+	err = pb.Unmarshal(body, uploadMetadata)
+	if err != nil {
+		return nil, err
+	}
+	return uploadMetadata, nil
+}

pkg/gchatmeow/session.go

@@ -148,7 +148,11 @@ func (s *Session) FetchRaw(ctx context.Context, method, urlStr string, params ur
 	}
 
 	if params != nil {
-		parsedURL.RawQuery = params.Encode()
+		query := parsedURL.Query()
+		for key, value := range params {
+			query.Set(key, value[0])
+		}
+		parsedURL.RawQuery = query.Encode()
 	}
 
 	req, err := http.NewRequestWithContext(ctx, method, parsedURL.String(), bytes.NewReader(data))