mirror
/
gomatrix
mirror of https://github.com/matrix-org/gomatrix
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for specifying filename when uploading to content repo

This commit is contained in:
Sharif Paksa 2019-09-20 11:44:41 +02:00
parent 7df988a63f
commit 46de9e6aac
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
client.go
View File

@ -55,7 +55,10 @@ func (e HTTPError) Error() string {
// BuildURL builds a URL with the Client's homserver/prefix/access_token set already.
func (cli *Client) BuildURL(urlPath ...string) string {
ps := []string{cli.Prefix}
ps := []string{}
if urlPath[0] != "_matrix" {
ps = append(ps, cli.Prefix)
}
for _, p := range urlPath {
ps = append(ps, p)
}
@ -589,13 +592,18 @@ func (cli *Client) UploadLink(link string) (*RespMediaUpload, error) {
if err != nil {
return nil, err
}
return cli.UploadToContentRepo(res.Body, res.Header.Get("Content-Type"), res.ContentLength)
return cli.UploadToContentRepo(res.Body, res.Header.Get("Content-Type"), res.ContentLength, "")
}
// UploadToContentRepo uploads the given bytes to the content repository and returns an MXC URI.
// See http://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-media-r0-upload
func (cli *Client) UploadToContentRepo(content io.Reader, contentType string, contentLength int64) (*RespMediaUpload, error) {
req, err := http.NewRequest("POST", cli.BuildBaseURL("_matrix/media/r0/upload"), content)
func (cli *Client) UploadToContentRepo(content io.Reader, contentType string, contentLength int64, contentFilename string) (*RespMediaUpload, error) {
query := map[string]string{}
if contentFilename != "" {
query["filename"] = contentFilename
}
url := cli.BuildURLWithQuery([]string{"_matrix", "media", "r0", "upload"}, query)
req, err := http.NewRequest("POST", url, content)
if err != nil {
return nil, err
}