Skip to content

Backport msc4190 from bridgev2 #371

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

Merged
merged 2 commits into from
May 3, 2025

Conversation

onestacked
Copy link
Contributor

@onestacked onestacked commented Apr 17, 2025

I've attempted to backport the msc4190 support form bridgev2.

The main reason for this is to allow mautrix-discord to use msc4190 before the bridgev2 rewrite.

I think this should work, but I'm unsure how to test this.

From what I undestand The (encryption) config upgrade needs to be done in the bridge itself instead of here.
Draft PR to mautrix-discord

@tulir
Copy link
Member

tulir commented Apr 17, 2025

Discord is on v0.16.x, not v0.16.0.x

Easiest way to test local changes is adding replace maunium.net/go/mautrix => ../mautrix-go in the bridge's go.mod (assuming mautrix-go is cloned at that path)

@onestacked onestacked force-pushed the msc4190-bridgev1-backport branch from 4475e9a to 991c640 Compare April 17, 2025 13:15
@onestacked onestacked changed the base branch from v0.16.0.x to v0.16.x April 17, 2025 13:15
@onestacked
Copy link
Contributor Author

onestacked commented Apr 17, 2025

Discord is on v0.16.x, not v0.16.0.x

Changed to correct target branch

Easiest way to test local changes is adding replace maunium.net/go/mautrix => ../mautrix-go in the bridge's go.mod (assuming mautrix-go is cloned at that path)

I wanted to avoid having to use the whole discord bridge, but It seems to work in my test setup with mautirx-discord, synapse & MAS.

@onestacked onestacked marked this pull request as ready for review April 17, 2025 14:06
@onestacked
Copy link
Contributor Author

I've added a draft PR to mautrix-discord for the config change.

@onestacked
Copy link
Contributor Author

@tulir can this (and the mautrix-discord change) be included in the May releases?

@tulir tulir merged commit e173d97 into mautrix:v0.16.x May 3, 2025
3 checks passed
@onestacked onestacked deleted the msc4190-bridgev1-backport branch May 4, 2025 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants