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

Merge pull request #61 from matrix-org/babolivier/trailing-slashes 

Manually append a trailing slash at the end of a path if needed
This commit is contained in:
Brendan Abolivier 2019-03-20 22:38:05 +00:00 committed by GitHub
parent 94881c65f3 998378da2b
commit 54b415d5fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client.go
View File

@ -13,6 +13,7 @@ import (
"net/url" "net/url"
"path" "path"
"strconv" "strconv"
"strings"
"sync" "sync"
"time" "time"
) )
@ -68,6 +69,10 @@ func (cli *Client) BuildBaseURL(urlPath ...string) string {
parts := []string{hsURL.Path} parts := []string{hsURL.Path}
parts = append(parts, urlPath...) parts = append(parts, urlPath...)
hsURL.Path = path.Join(parts...) hsURL.Path = path.Join(parts...)
// Manually add the trailing slash back to the end of the path if it's explicitely needed
if strings.HasSuffix(urlPath[len(urlPath)-1], "/") {
hsURL.Path = hsURL.Path + "/"
}
query := hsURL.Query() query := hsURL.Query()
if cli.AccessToken != "" { if cli.AccessToken != "" {
query.Set("access_token", cli.AccessToken) query.Set("access_token", cli.AccessToken)