iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

media: support documents

Browse Source 
Signed-off-by: Sumner Evans <sumner.evans@automattic.com>
This commit is contained in:
Sumner Evans
2024-06-19 14:22:48 -06:00
parent 2df6f73098
commit 16706d8338
5 changed files with 234 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/directdownload.go
+32 -10
View File
@@ -7,12 +7,13 @@ import (
"io"
"github.com/gotd/td/tg"
"github.com/rs/zerolog"
"maunium.net/go/mautrix/bridgev2"
"maunium.net/go/mautrix/bridgev2/networkid"
"maunium.net/go/mautrix/mediaproxy"
"go.mau.fi/mautrix-telegram/pkg/connector/download"
"go.mau.fi/mautrix-telegram/pkg/connector/ids"
conmedia "go.mau.fi/mautrix-telegram/pkg/connector/media"
)
var _ bridgev2.DirectMediableNetwork = (*TelegramConnector)(nil)
@@ -26,6 +27,12 @@ func (tc *TelegramConnector) Download(ctx context.Context, mediaID networkid.Med
if err != nil {
return nil, err
}
log := zerolog.Ctx(ctx).With().
Str("component", "direct download").
Any("info", info).
Logger()
ctx = log.WithContext(ctx)
log.Info().Msg("handling direct download")
logins, err := tc.Bridge.GetUserLoginsInPortal(ctx, info.PeerType.AsPortalKey(info.ChatID))
if err != nil {
@@ -42,6 +49,7 @@ func (tc *TelegramConnector) Download(ctx context.Context, mediaID networkid.Med
&tg.InputMessageID{ID: int(info.MessageID)},
})
case ids.PeerTypeChannel:
// TODO test this
messages, err = client.client.API().ChannelsGetMessages(ctx, &tg.ChannelsGetMessagesRequest{
Channel: &tg.InputChannel{ChannelID: info.ChatID},
ID: []tg.InputMessageClass{
@@ -59,26 +67,31 @@ func (tc *TelegramConnector) Download(ctx context.Context, mediaID networkid.Med
if m, ok := messages.(getMessages); !ok {
return nil, fmt.Errorf("unknown message type")
} else {
var found bool
for _, message := range m.GetMessages() {
if msg, ok := message.(*tg.Message); ok && msg.ID == int(info.MessageID) {
media = msg.Media
found = true
break
}
}
if !found {
return nil, fmt.Errorf("no media found with ID %d", info.MessageID)
}
}
var data []byte
var mimeType string
switch media := media.(type) {
case *tg.MessageMediaPhoto:
data, mimeType, err := conmedia.DownloadPhoto(ctx, client.client.API(), media)
if err != nil {
return nil, err
data, mimeType, err = download.DownloadPhoto(ctx, client.client.API(), media)
case *tg.MessageMediaDocument:
document, ok := media.Document.(*tg.Document)
if !ok {
return nil, fmt.Errorf("unrecognized document type %T", media.Document)
}
return &mediaproxy.GetMediaResponseData{
Reader: io.NopCloser(bytes.NewBuffer(data)),
ContentType: mimeType,
ContentLength: int64(len(data)),
}, nil
mimeType = document.GetMimeType()
data, err = download.DownloadDocument(ctx, client.client.API(), document)
// TODO all of these
// case *tg.MessageMediaGeo: // messageMediaGeo#56e0d474
@@ -98,6 +111,15 @@ func (tc *TelegramConnector) Download(ctx context.Context, mediaID networkid.Med
default:
return nil, fmt.Errorf("unhandled media type %T", media)
}
if err != nil {
return nil, err
}
return &mediaproxy.GetMediaResponseData{
Reader: io.NopCloser(bytes.NewBuffer(data)),
ContentType: mimeType,
ContentLength: int64(len(data)),
}, nil
}
func (tg *TelegramConnector) SetUseDirectMedia() {
pkg/connector/download/document.go
+21
View File
@@ -0,0 +1,21 @@
package download
import (
"bytes"
"context"
"github.com/gotd/td/telegram/downloader"
"github.com/gotd/td/tg"
)
func DownloadDocument(ctx context.Context, client downloader.Client, document *tg.Document) (data []byte, err error) {
file := tg.InputDocumentFileLocation{
ID: document.GetID(),
AccessHash: document.GetAccessHash(),
FileReference: document.GetFileReference(),
}
var buf bytes.Buffer
_, err = downloader.NewDownloader().Download(client, &file).Stream(ctx, &buf)
data = buf.Bytes()
return
}
pkg/connector/media/download.go → pkg/connector/download/photo.go
+1 -1
View File
@@ -1,4 +1,4 @@
package media
package download
import (
"bytes"
pkg/connector/matrix.go
+33 -22
View File
@@ -7,6 +7,7 @@ import (
"github.com/gotd/td/telegram/message"
"github.com/gotd/td/telegram/message/html"
"github.com/gotd/td/telegram/message/styling"
"github.com/gotd/td/telegram/uploader"
"github.com/gotd/td/tg"
"maunium.net/go/mautrix/bridgev2"
@@ -17,6 +18,19 @@ import (
"go.mau.fi/mautrix-telegram/pkg/connector/ids"
)
func getMediaFilenameAndCaption(content *event.MessageEventContent) (filename, caption string) {
if content.FileName != "" {
filename = content.FileName
caption = content.FormattedBody
if caption == "" {
caption = content.Body
}
} else {
filename = content.Body
}
return
}
func (t *TelegramClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.MatrixMessage) (resp *bridgev2.MatrixMessageResponse, err error) {
sender := message.NewSender(t.client.API())
peer, err := ids.InputPeerForPortalID(msg.Portal.ID)
@@ -31,42 +45,39 @@ func (t *TelegramClient) HandleMatrixMessage(ctx context.Context, msg *bridgev2.
switch msg.Content.MsgType {
case event.MsgText:
updates, err = builder.Text(ctx, msg.Content.Body)
if err != nil {
return nil, err
}
case event.MsgImage, event.MsgFile, event.MsgAudio, event.MsgVideo:
var filename, caption string
if msg.Content.FileName != "" {
filename = msg.Content.FileName
caption = msg.Content.FormattedBody
if caption == "" {
caption = msg.Content.Body
}
} else {
filename = msg.Content.Body
}
filename, caption := getMediaFilenameAndCaption(msg.Content)
// TODO stream this download straight into the uploader
fileData, err := t.main.Bridge.Bot.DownloadMedia(ctx, msg.Content.URL, msg.Content.File)
var fileData []byte
fileData, err = t.main.Bridge.Bot.DownloadMedia(ctx, msg.Content.URL, msg.Content.File)
if err != nil {
return nil, fmt.Errorf("failed to download media from Matrix: %w", err)
}
uploader := uploader.NewUploader(t.client.API())
upload, err := uploader.FromBytes(ctx, filename, fileData)
var upload tg.InputFileClass
upload, err = uploader.FromBytes(ctx, filename, fileData)
if err != nil {
return nil, fmt.Errorf("failed to upload media to Telegram: %w", err)
}
var photo *message.UploadedPhotoBuilder
var styling []styling.StyledTextOption
if caption != "" {
// TODO resolver?
photo = message.UploadedPhoto(upload, html.String(nil, caption))
styling = append(styling, html.String(nil, caption))
}
if msg.Content.MsgType == event.MsgImage {
updates, err = builder.Media(ctx, message.UploadedPhoto(upload, styling...))
} else {
photo = message.UploadedPhoto(upload)
}
updates, err = builder.Media(ctx, photo)
if err != nil {
return nil, err
document := message.UploadedDocument(upload, styling...).
Filename(filename).
MIME(msg.Content.Info.MimeType)
updates, err = builder.Media(ctx, document)
}
default:
return nil, fmt.Errorf("unsupported message type %s", msg.Content.MsgType)
}
if err != nil {
return nil, err
}
var tgMessageID, tgDate int
pkg/connector/msgconv/tomatrix.go
+147 -66
View File
@@ -14,10 +14,18 @@ import (
"maunium.net/go/mautrix/event"
"maunium.net/go/mautrix/id"
"go.mau.fi/mautrix-telegram/pkg/connector/download"
"go.mau.fi/mautrix-telegram/pkg/connector/ids"
conmedia "go.mau.fi/mautrix-telegram/pkg/connector/media"
)
type spoilable interface {
GetSpoiler() bool
}
type ttlable interface {
GetTTLSeconds() (value int, ok bool)
}
func (mc *MessageConverter) ToMatrix(ctx context.Context, portal *bridgev2.Portal, intent bridgev2.MatrixAPI, msg *tg.Message) (*bridgev2.ConvertedMessage, error) {
log := zerolog.Ctx(ctx).With().Str("conversion_direction", "to_matrix").Logger()
ctx = log.WithContext(ctx)
@@ -31,79 +39,112 @@ func (mc *MessageConverter) ToMatrix(ctx context.Context, portal *bridgev2.Porta
})
}
if m, ok := msg.GetMedia(); ok {
switch media := m.(type) {
if media, ok := msg.GetMedia(); ok {
mediaParts, disappearingSetting, err := mc.convertMedia(ctx, portal, intent, msg.ID, media)
if err != nil {
return nil, err
}
if disappearingSetting != nil {
cm.Disappear = *disappearingSetting
}
cm.Parts = append(cm.Parts, mediaParts)
}
return cm, nil
}
func (mc *MessageConverter) convertMedia(ctx context.Context, portal *bridgev2.Portal, intent bridgev2.MatrixAPI, msgID int, media tg.MessageMediaClass) (*bridgev2.ConvertedMessagePart, *database.DisappearingSetting, error) {
var partID networkid.PartID
var msgType event.MessageType
var filename string
// Determine the filename and some other information
switch media := media.(type) {
case *tg.MessageMediaPhoto:
partID = networkid.PartID("photo")
msgType = event.MsgImage
filename = "image"
case *tg.MessageMediaDocument:
partID = networkid.PartID("document")
msgType = event.MsgFile
document, ok := media.Document.(*tg.Document)
if !ok {
return nil, nil, fmt.Errorf("unrecognized document type %T", media.Document)
}
for _, attr := range document.GetAttributes() {
if f, ok := attr.(*tg.DocumentAttributeFilename); ok {
filename = f.GetFileName()
break
}
}
// TODO all of these
// case *tg.MessageMediaGeo: // messageMediaGeo#56e0d474
// case *tg.MessageMediaContact: // messageMediaContact#70322949
// case *tg.MessageMediaUnsupported: // messageMediaUnsupported#9f84f49e
// case *tg.MessageMediaWebPage: // messageMediaWebPage#ddf10c3b
// case *tg.MessageMediaVenue: // messageMediaVenue#2ec0533f
// case *tg.MessageMediaGame: // messageMediaGame#fdb19008
// case *tg.MessageMediaInvoice: // messageMediaInvoice#f6a548d3
// case *tg.MessageMediaGeoLive: // messageMediaGeoLive#b940c666
// case *tg.MessageMediaPoll: // messageMediaPoll#4bd6e798
// case *tg.MessageMediaDice: // messageMediaDice#3f7ee58b
// case *tg.MessageMediaStory: // messageMediaStory#68cb6283
// case *tg.MessageMediaGiveaway: // messageMediaGiveaway#daad85b0
// case *tg.MessageMediaGiveawayResults: // messageMediaGiveawayResults#c6991068
default:
return nil, nil, fmt.Errorf("unhandled media type %T", media)
}
var mxcURI id.ContentURIString
var encryptedFileInfo *event.EncryptedFileInfo
if mc.useDirectMedia {
var err error
peerType, chatID, err := ids.ParsePortalID(portal.ID)
if err != nil {
return nil, nil, err
}
mediaID, err := ids.DirectMediaInfo{
PeerType: peerType,
ChatID: chatID,
MessageID: int64(msgID),
}.AsMediaID()
if err != nil {
return nil, nil, err
}
mxcURI, err = portal.Bridge.Matrix.GenerateContentURI(ctx, mediaID)
if err != nil {
return nil, nil, err
}
}
if mxcURI == "" {
var data []byte
var mimeType string
var err error
switch media := media.(type) {
case *tg.MessageMediaPhoto:
var filename string
var mxcURI id.ContentURIString
var encryptedFileInfo *event.EncryptedFileInfo
if mc.useDirectMedia {
var err error
filename = "image"
peerType, chatID, err := ids.ParsePortalID(portal.ID)
if err != nil {
return nil, err
}
mediaID, err := ids.DirectMediaInfo{
PeerType: peerType,
ChatID: chatID,
MessageID: int64(msg.ID),
}.AsMediaID()
if err != nil {
return nil, err
}
mxcURI, err = portal.Bridge.Matrix.GenerateContentURI(ctx, mediaID)
if err != nil {
return nil, err
}
if _, ok := media.GetTTLSeconds(); ok {
filename = "disappearing_image" + exmime.ExtensionFromMimetype(mimeType)
} else {
filename = "image" + exmime.ExtensionFromMimetype(mimeType)
}
if mxcURI == "" {
data, mimeType, err := conmedia.DownloadPhoto(ctx, mc.client.API(), media)
if err != nil {
return nil, err
}
if ttl, ok := media.GetTTLSeconds(); ok {
filename = "disappearing_image" + exmime.ExtensionFromMimetype(mimeType)
cm.Disappear = database.DisappearingSetting{
Type: database.DisappearingTypeAfterSend,
Timer: time.Duration(ttl) * time.Second,
}
} else {
filename = "image" + exmime.ExtensionFromMimetype(mimeType)
}
mxcURI, encryptedFileInfo, err = intent.UploadMedia(ctx, "", data, filename, mimeType)
if err != nil {
return nil, err
}
data, mimeType, err = download.DownloadPhoto(ctx, mc.client.API(), media)
case *tg.MessageMediaDocument:
document, ok := media.Document.(*tg.Document)
if !ok {
return nil, nil, fmt.Errorf("unrecognized document type %T", media.Document)
}
extra := map[string]any{}
if media.GetSpoiler() {
// See: https://github.com/matrix-org/matrix-spec-proposals/pull/3725
extra["town.robin.msc3725.content_warning"] = map[string]any{
"type": "town.robin.msc3725.spoiler",
}
}
cm.Parts = append(cm.Parts, &bridgev2.ConvertedMessagePart{
ID: networkid.PartID("photo"),
Type: event.EventMessage,
Content: &event.MessageEventContent{
MsgType: event.MsgImage,
Body: filename,
URL: mxcURI,
File: encryptedFileInfo,
},
Extra: extra,
})
mimeType = document.GetMimeType()
data, err = download.DownloadDocument(ctx, mc.client.API(), document)
// TODO all of these
// case *tg.MessageMediaGeo: // messageMediaGeo#56e0d474
// case *tg.MessageMediaContact: // messageMediaContact#70322949
// case *tg.MessageMediaUnsupported: // messageMediaUnsupported#9f84f49e
// case *tg.MessageMediaDocument: // messageMediaDocument#4cf4d72d
// case *tg.MessageMediaWebPage: // messageMediaWebPage#ddf10c3b
// case *tg.MessageMediaVenue: // messageMediaVenue#2ec0533f
// case *tg.MessageMediaGame: // messageMediaGame#fdb19008
@@ -115,8 +156,48 @@ func (mc *MessageConverter) ToMatrix(ctx context.Context, portal *bridgev2.Porta
// case *tg.MessageMediaGiveaway: // messageMediaGiveaway#daad85b0
// case *tg.MessageMediaGiveawayResults: // messageMediaGiveawayResults#c6991068
default:
return nil, fmt.Errorf("unhandled media type %T", m)
return nil, nil, fmt.Errorf("unhandled media type %T", media)
}
if err != nil {
return nil, nil, err
}
mxcURI, encryptedFileInfo, err = intent.UploadMedia(ctx, "", data, filename, mimeType)
if err != nil {
return nil, nil, err
}
}
return cm, nil
extra := map[string]any{}
// Handle spolilers
// See: https://github.com/matrix-org/matrix-spec-proposals/pull/3725
if s, ok := media.(spoilable); ok && s.GetSpoiler() {
extra["town.robin.msc3725.content_warning"] = map[string]any{
"type": "town.robin.msc3725.spoiler",
}
}
// Handle disappearing messages
var disappearingSetting *database.DisappearingSetting
if t, ok := media.(ttlable); ok {
if ttl, ok := t.GetTTLSeconds(); ok {
disappearingSetting = &database.DisappearingSetting{
Type: database.DisappearingTypeAfterSend,
Timer: time.Duration(ttl) * time.Second,
}
}
}
return &bridgev2.ConvertedMessagePart{
ID: partID,
Type: event.EventMessage,
Content: &event.MessageEventContent{
MsgType: msgType,
Body: filename,
URL: mxcURI,
File: encryptedFileInfo,
},
Extra: extra,
}, disappearingSetting, nil
}