msgconv: clean up reuploading attachments to Matrix

This commit is contained in:
Tulir Asokan
2026-01-28 17:05:23 +02:00
parent 1a3144d2d0
commit d89746d099
9 changed files with 228 additions and 238 deletions

View File

@@ -17,35 +17,25 @@
package msgconv
import (
"context"
"math/rand"
"strconv"
"sync/atomic"
"maunium.net/go/mautrix/bridgev2"
"go.mau.fi/mautrix-discord/pkg/attachment"
)
type MediaReuploader func(ctx context.Context, intent bridgev2.MatrixAPI, portal *bridgev2.Portal, reupload attachment.AttachmentReupload) (*attachment.ReuploadedAttachment, error)
type MessageConverter struct {
Bridge *bridgev2.Bridge
nextDiscordUploadID atomic.Int32
// ReuploadMedia is called when the message converter wants to upload some
// media it is attempting to bridge.
//
// This can be directly forwarded to the ReuploadMedia method on DiscordConnector.
// The indirection is only necessary to prevent an import cycle.
ReuploadMedia MediaReuploader
MaxFileSize int64
}
func NewMessageConverter(bridge *bridgev2.Bridge, reuploader MediaReuploader) *MessageConverter {
func NewMessageConverter(bridge *bridgev2.Bridge) *MessageConverter {
mc := &MessageConverter{
Bridge: bridge,
ReuploadMedia: reuploader,
Bridge: bridge,
MaxFileSize: 50 * 1024 * 1024,
}
mc.nextDiscordUploadID.Store(rand.Int31n(100))