Skip to content

chore(federation): prepare support room matrix rooms version 11 #41718

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

Draft
sampaiodiego wants to merge 7 commits into
base: develop
Choose a base branch
from
+18 −18
Draft

chore(federation): prepare support room matrix rooms version 11 #41718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6a75d39
chore(federation): join event on make_join doesnt have origin field
sampaiodiego Aug 7, 2026
b133e7c
chore(federation): add support for future room v11 redacts
sampaiodiego Aug 7, 2026
6246aa7
remove origin as mandatory
sampaiodiego Aug 21, 2026
4c901a7
prefer the new redacts property
sampaiodiego Aug 21, 2026
4d76e2b
update federation-sdk
sampaiodiego Sep 9, 2026
74372e1
bump synapse to latest
sampaiodiego Sep 9, 2026
05361f6
remove type overwrite
sampaiodiego Sep 9, 2026
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
2 changes: 1 addition & 1 deletion apps/meteor/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
"@rocket.chat/emitter": "workspace:~",
"@rocket.chat/favicon": "workspace:^",
"@rocket.chat/federation-matrix": "workspace:^",
"@rocket.chat/federation-sdk": "0.7.0",
"@rocket.chat/federation-sdk": "0.8.0",
"@rocket.chat/fuselage": "^0.88.0",
"@rocket.chat/fuselage-forms": "~1.5.1",
"@rocket.chat/fuselage-hooks": "^0.43.1",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/federation-matrix/docker-compose.test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ services:

# HomeServer 1 (synapse)
hs1:
image: matrixdotorg/synapse:v1.157.2
image: matrixdotorg/synapse:v1.160.0
profiles:
- test
- element
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/federation-matrix/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@rocket.chat/core-services": "workspace:^",
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/emitter": "workspace:~",
"@rocket.chat/federation-sdk": "0.7.0",
"@rocket.chat/federation-sdk": "0.8.0",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/license": "workspace:^",
"@rocket.chat/models": "workspace:^",
Expand Down
2 changes: 1 addition & 1 deletion ee/packages/federation-matrix/src/api/_matrix/send-join.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const SendJoinEventSchema = {
required: ['membership'],
},
},
required: ['type', 'state_key', 'sender', 'origin', 'origin_server_ts', 'content'],
required: ['type', 'state_key', 'sender', 'origin_server_ts', 'content'],
};

const isSendJoinEventProps = ajv.compile(SendJoinEventSchema);
Expand Down
8 changes: 4 additions & 4 deletions ee/packages/federation-matrix/src/events/message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,9 @@ export function message() {
}
});

federationSDK.eventEmitterService.on('homeserver.matrix.redaction', async ({ event }) => {
federationSDK.eventEmitterService.on('homeserver.matrix.redaction', async ({ event, redacts }) => {
try {
const redactedEventId = event.redacts;
const redactedEventId = redacts || event.redacts;
if (!redactedEventId) {
logger.debug('No redacts field in redaction event');
return;
Expand All @@ -146,9 +146,9 @@ export function message() {
return;
}

const rcMessage = await Messages.findOneByFederationId(event.redacts);
const rcMessage = await Messages.findOneByFederationId(redactedEventId);
if (!rcMessage) {
logger.debug({ msg: 'No RC message found for event', eventId: event.redacts });
logger.debug({ msg: 'No RC message found for event', eventId: redactedEventId });
return;
}
const internalUsername = event.sender;
Expand Down
4 changes: 2 additions & 2 deletions ee/packages/federation-matrix/src/events/reaction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ export function reaction() {
}
});

federationSDK.eventEmitterService.on('homeserver.matrix.redaction', async ({ event }) => {
federationSDK.eventEmitterService.on('homeserver.matrix.redaction', async ({ event, redacts }) => {
try {
const redactedEventId = event.redacts;
const redactedEventId = redacts || event.redacts;
if (!redactedEventId) {
logger.debug('No redacts field in redaction event');
return;
Expand Down
2 changes: 1 addition & 1 deletion packages/core-services/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"dependencies": {
"@rocket.chat/core-typings": "workspace:^",
"@rocket.chat/federation-sdk": "0.7.0",
"@rocket.chat/federation-sdk": "0.8.0",
"@rocket.chat/http-router": "workspace:^",
"@rocket.chat/icons": "^0.49.0",
"@rocket.chat/media-signaling": "workspace:^",
Expand Down
14 changes: 7 additions & 7 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9254,7 +9254,7 @@ __metadata:
dependencies:
"@rocket.chat/apps": "workspace:^"
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/federation-sdk": "npm:0.7.0"
"@rocket.chat/federation-sdk": "npm:0.8.0"
"@rocket.chat/http-router": "workspace:^"
"@rocket.chat/icons": "npm:^0.49.0"
"@rocket.chat/jest-presets": "workspace:~"
Expand Down Expand Up @@ -9490,7 +9490,7 @@ __metadata:
"@rocket.chat/core-typings": "workspace:^"
"@rocket.chat/ddp-client": "workspace:^"
"@rocket.chat/emitter": "workspace:~"
"@rocket.chat/federation-sdk": "npm:0.7.0"
"@rocket.chat/federation-sdk": "npm:0.8.0"
"@rocket.chat/http-router": "workspace:^"
"@rocket.chat/license": "workspace:^"
"@rocket.chat/models": "workspace:^"
Expand Down Expand Up @@ -9519,9 +9519,9 @@ __metadata:
languageName: unknown
linkType: soft

"@rocket.chat/federation-sdk@npm:0.7.0":
version: 0.7.0
resolution: "@rocket.chat/federation-sdk@npm:0.7.0"
"@rocket.chat/federation-sdk@npm:0.8.0":
version: 0.8.0
resolution: "@rocket.chat/federation-sdk@npm:0.8.0"
dependencies:
"@datastructures-js/priority-queue": "npm:^6.3.5"
"@noble/ed25519": "npm:^3.0.0"
Expand All @@ -9535,7 +9535,7 @@ __metadata:
zod: "npm:~4.3.6"
peerDependencies:
typescript: ~5.9.2
checksum: 10/cebd162f6ba829456dac69040a750f33c7c25bb19c4646bf2036a49511c461971bbd8ad840d5ae5a7c48e3b87ca02f0beb8700a1f03e017018962a610bc13bed
checksum: 10/b711ff081c238654ba83c030a317329c8119363993253ca18545920b0afe31657926af959e13ec91395b8466b205451d90abe87dfeda751d72e8b83f87e227cb
languageName: node
linkType: hard

Expand Down Expand Up @@ -10120,7 +10120,7 @@ __metadata:
"@rocket.chat/emitter": "workspace:~"
"@rocket.chat/favicon": "workspace:^"
"@rocket.chat/federation-matrix": "workspace:^"
"@rocket.chat/federation-sdk": "npm:0.7.0"
"@rocket.chat/federation-sdk": "npm:0.8.0"
"@rocket.chat/fuselage": "npm:^0.88.0"
"@rocket.chat/fuselage-forms": "npm:~1.5.1"
"@rocket.chat/fuselage-hooks": "npm:^0.43.1"
Expand Down
Loading