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: add optional media HTTP client
Some checks failed
Go / Lint (latest) (push) Has been cancelled
Details
Go / Build (old, libolm) (push) Has been cancelled
Details
Go / Build (latest, libolm) (push) Has been cancelled
Details
Go / Build (old, goolm) (push) Has been cancelled
Details
Go / Build (latest, goolm) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Nick Mills-Barrett 2025-01-08 09:35:06 +00:00
commit e571946e82
No known key found for this signature in database
GPG key ID: 31F23F2CF354937B
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client.go
View file

@ -76,18 +76,19 @@ type VerificationHelper interface {
// Client represents a Matrix client.
type Client struct {
HomeserverURL *url.URL // The base homeserver URL
UserID id.UserID // The user ID of the client. Used for forming HTTP paths which use the client's user ID.
DeviceID id.DeviceID // The device ID of the client.
AccessToken string // The access_token for the client.
UserAgent string // The value for the User-Agent header
Client *http.Client // The underlying HTTP client which will be used to make HTTP requests.
Syncer Syncer // The thing which can process /sync responses
Store SyncStore // The thing which can store tokens/ids
StateStore StateStore
Crypto CryptoHelper
Verification VerificationHelper
SpecVersions *RespVersions
HomeserverURL *url.URL // The base homeserver URL
UserID id.UserID // The user ID of the client. Used for forming HTTP paths which use the client's user ID.
DeviceID id.DeviceID // The device ID of the client.
AccessToken string // The access_token for the client.
UserAgent string // The value for the User-Agent header
Client *http.Client // The underlying HTTP client which will be used to make HTTP requests.
Syncer Syncer // The thing which can process /sync responses
Store SyncStore // The thing which can store tokens/ids
StateStore StateStore
Crypto CryptoHelper
Verification VerificationHelper
SpecVersions *RespVersions
ExternalClient *http.Client // The HTTP client used for external (not matrix) media HTTP requests.
Log zerolog.Logger
@ -1693,7 +1694,11 @@ func (cli *Client) tryUploadMediaToURL(ctx context.Context, url, contentType str
req.Header.Set("Content-Type", contentType)
req.Header.Set("User-Agent", cli.UserAgent+" (external media uploader)")
return http.DefaultClient.Do(req)
if cli.ExternalClient != nil {
return cli.ExternalClient.Do(req)
} else {
return http.DefaultClient.Do(req)
}
}
func (cli *Client) uploadMediaToURL(ctx context.Context, data ReqUploadMedia) (*RespMediaUpload, error) {