Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove double https: from export URLs #506

Merged
merged 2 commits into from
Nov 23, 2023
Merged

Remove double https: from export URLs #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0aedda3
Remove double `https:` from export URLs
turt2live Nov 23, 2023
674ffc1
Changelog
turt2live Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

* Dendrite homeservers can now have their media imported safely, and `adminApiKind` may be set to `dendrite`.

### Fixed

* Exports created with `s3_urls` now contain valid URLs.

## [1.3.3] - October 31, 2023

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion datastores/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func GetS3Url(ds config.DatastoreConfig, location string) (string, error) {
}

// HACK: Surely there's a better way...
return fmt.Sprintf("https://%s/%s/%s", s3c.client.EndpointURL(), s3c.bucket, location), nil
return fmt.Sprintf("%s/%s/%s", s3c.client.EndpointURL(), s3c.bucket, location), nil
}

func ParseS3Url(s3url string) (config.DatastoreConfig, string, error) {
Expand Down