Skip to content

Fix assert of unsafe media api behaviour #639

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

Merged
reivilibre merged 2 commits into from
Jun 15, 2023
Merged

Fix assert of unsafe media api behaviour #639

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef956a9
/inline/attachment/s
joshqou Jun 9, 2023
ef3bf68
Merge branch 'matrix-org:main' into main
joshqou Jun 13, 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
6 changes: 3 additions & 3 deletions tests/media_filename_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func TestMediaFilenames(t *testing.T) {
})
}

// Returns content disposition information like (inline, filename)
// Returns content disposition information like (mediatype, filename)
func downloadForFilename(t *testing.T, c *client.CSAPI, mxcUri string, diffName string) string {
t.Helper()

Expand All @@ -139,8 +139,8 @@ func downloadForFilename(t *testing.T, c *client.CSAPI, mxcUri string, diffName
t.Fatalf("Got err when parsing content disposition: %s", err)
}

if mediaType != "inline" {
t.Fatalf("Found unexpected mediatype %s, expected inline", mediaType)
if mediaType != "attachment" {
t.Fatalf("Found unexpected mediatype %s, expected attachment", mediaType)
}

if filename, ok := params["filename"]; ok {
Expand Down