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.

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

Support optional MSC3860 redirects #4007

Merged
merged 6 commits into from
Jan 24, 2024
Merged

Support optional MSC3860 redirects #4007

merged 6 commits into from
Jan 24, 2024

Conversation

turt2live
Copy link
Member

@turt2live turt2live commented Jan 15, 2024

See allow_redirect across the media endpoints: https://spec.matrix.org/v1.9/client-server-api/#client-behaviour-7

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

Here's what your changelog entry will look like:

✨ Features

@turt2live turt2live added this pull request to the merge queue Jan 15, 2024
github-merge-queue bot pushed a commit that referenced this pull request Jan 15, 2024
* Support optional MSC3860 redirects

See `allow_redirect` across the media endpoints: https://spec.matrix.org/v1.9/client-server-api/#client-behaviour-7

* Update the tests

* Appease the linter

* Add test to appease SonarCloud
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 15, 2024
@uhoreg
Copy link
Member

uhoreg commented Jan 20, 2024

@turt2live I don't know if you noticed, but this PR got removed from the review queue due to failing downstream tests. Looks like you need to make a PR for react-sdk to handle the new URLs that this PR creates.

@turt2live
Copy link
Member Author

There is a react-sdk PR: matrix-org/matrix-react-sdk#12142

@turt2live turt2live added this pull request to the merge queue Jan 23, 2024
github-merge-queue bot pushed a commit to matrix-org/matrix-react-sdk that referenced this pull request Jan 23, 2024
* Enable redirected media by default

See matrix-org/matrix-js-sdk#4007

* Update the tests

* Update tests

* Update end-to-end tests too
@turt2live turt2live removed this pull request from the merge queue due to a manual request Jan 23, 2024
…efaulting to `false`

Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy
Copy link
Member

t3chguy commented Jan 23, 2024

After discussing with Travis, to avoid a backwards incompatible change (for tests at least) we've gone with only sending the param if a boolean is passed for the new param

Copy link
Member Author

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't approve my own PR, but explicit behaviour lgtm, thanks :)

@t3chguy t3chguy added this pull request to the merge queue Jan 24, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 24, 2024
@t3chguy t3chguy added this pull request to the merge queue Jan 24, 2024
Merged via the queue into develop with commit ab217bd Jan 24, 2024
23 checks passed
@t3chguy t3chguy deleted the travis/redirects branch January 24, 2024 10:53
github-merge-queue bot pushed a commit to matrix-org/matrix-react-sdk that referenced this pull request Feb 11, 2024
* Enable redirected media by default

See matrix-org/matrix-js-sdk#4007

* Update the tests

* Update tests

* Update end-to-end tests too

* Update linkifier to use Media customisation endpoint

* Fix tests for new js-sdk behaviour

* Fix unchanged file

* Fix linkifier

* Fix lint
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants