deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

client,bridgev2/matrix: fix context used for async uploads
Some checks are pending
Go / Lint (latest) (push) Waiting to run
Details
Go / Build (old, libolm) (push) Waiting to run
Details
Go / Build (latest, libolm) (push) Waiting to run
Details
Go / Build (old, goolm) (push) Waiting to run
Details
Go / Build (latest, goolm) (push) Waiting to run
Details

Browse source
This commit is contained in:
Tulir Asokan 2026-01-20 12:06:55 +02:00
commit a55693bbd7
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bridgev2/matrix/intent.go
View file

@ -403,6 +403,7 @@ func (as *ASIntent) UploadMediaStream(
removeAndClose(replFile)
removeAndClose(tempFile)
}
req.AsyncContext = zerolog.Ctx(ctx).WithContext(as.Connector.Bridge.BackgroundCtx)
startedAsyncUpload = true
var resp *mautrix.RespCreateMXC
resp, err = as.Matrix.UploadAsync(ctx, req)
@ -435,6 +436,7 @@ func (as *ASIntent) doUploadReq(ctx context.Context, file *event.EncryptedFileIn
as.Connector.uploadSema.Release(int64(len(req.ContentBytes)))
}
}
req.AsyncContext = zerolog.Ctx(ctx).WithContext(as.Connector.Bridge.BackgroundCtx)
var resp *mautrix.RespCreateMXC
resp, err = as.Matrix.UploadAsync(ctx, req)
if resp != nil {

10
client.go
View file

@ -1933,10 +1933,15 @@ func (cli *Client) UploadAsync(ctx context.Context, req ReqUploadMedia) (*RespCr
}
req.MXC = resp.ContentURI
req.UnstableUploadURL = resp.UnstableUploadURL
if req.AsyncContext == nil {
req.AsyncContext = cli.cliOrContextLog(ctx).WithContext(context.Background())
}
go func() {
_, err = cli.UploadMedia(ctx, req)
_, err = cli.UploadMedia(req.AsyncContext, req)
if err != nil {
cli.Log.Error().Stringer("mxc", req.MXC).Err(err).Msg("Async upload of media failed")
zerolog.Ctx(req.AsyncContext).Err(err).
Stringer("mxc", req.MXC).
Msg("Async upload of media failed")
}
}()
return resp, nil
@ -1972,6 +1977,7 @@ type ReqUploadMedia struct {
ContentType string
FileName string
AsyncContext context.Context
DoneCallback func()
// MXC specifies an existing MXC URI which doesn't have content yet to upload into.