diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 254531808c90b..adf801a27ad3b 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -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", diff --git a/ee/packages/federation-matrix/docker-compose.test.yml b/ee/packages/federation-matrix/docker-compose.test.yml index 0fb421fe52b68..6779c597f86e7 100644 --- a/ee/packages/federation-matrix/docker-compose.test.yml +++ b/ee/packages/federation-matrix/docker-compose.test.yml @@ -41,7 +41,7 @@ services: # HomeServer 1 (synapse) hs1: - image: matrixdotorg/synapse:v1.157.2 + image: matrixdotorg/synapse:v1.160.0 profiles: - test - element diff --git a/ee/packages/federation-matrix/package.json b/ee/packages/federation-matrix/package.json index 3f42b3807d253..84fd9f099bf54 100644 --- a/ee/packages/federation-matrix/package.json +++ b/ee/packages/federation-matrix/package.json @@ -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:^", diff --git a/ee/packages/federation-matrix/src/api/_matrix/send-join.ts b/ee/packages/federation-matrix/src/api/_matrix/send-join.ts index f127559ef3c4e..53a50c95956e4 100644 --- a/ee/packages/federation-matrix/src/api/_matrix/send-join.ts +++ b/ee/packages/federation-matrix/src/api/_matrix/send-join.ts @@ -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); diff --git a/ee/packages/federation-matrix/src/events/message.ts b/ee/packages/federation-matrix/src/events/message.ts index ed21775df54b2..ff8d3d8b38fcc 100644 --- a/ee/packages/federation-matrix/src/events/message.ts +++ b/ee/packages/federation-matrix/src/events/message.ts @@ -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; @@ -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; diff --git a/ee/packages/federation-matrix/src/events/reaction.ts b/ee/packages/federation-matrix/src/events/reaction.ts index 17564556a1bc1..5b0ffd0ea0873 100644 --- a/ee/packages/federation-matrix/src/events/reaction.ts +++ b/ee/packages/federation-matrix/src/events/reaction.ts @@ -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; diff --git a/packages/core-services/package.json b/packages/core-services/package.json index 30f68c8566756..74cb1d4819f3f 100644 --- a/packages/core-services/package.json +++ b/packages/core-services/package.json @@ -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:^", diff --git a/yarn.lock b/yarn.lock index 6dac92ccba9c4..f6e75d3ddb6d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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:~" @@ -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:^" @@ -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" @@ -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 @@ -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"