Merge branch 'develop' into regression/integration-sendMessage

RocketChat · Sep 17, 2024 · 5c6f124 · 5c6f124
2 parents 85077f3 + b919221
commit 5c6f124
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.changeset/great-humans-live.md b/.changeset/great-humans-live.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a Federation callback not awaiting db call
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -291,7 +291,7 @@ jobs:
         if: inputs.type == 'ui' && always()
         uses: actions/upload-artifact@v4
         with:
-          name: playwright-test-trace-${{ matrix.mongodb-version }}-${{ matrix.shard }}
+          name: playwright-test-trace-${{ inputs.release }}-${{ matrix.mongodb-version }}-${{ matrix.shard }}
           path: ./apps/meteor/tests/e2e/.playwright*
           include-hidden-files: true
 

diff --git a/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js b/apps/meteor/app/federation/server/hooks/afterUnsetReaction.js
@@ -6,7 +6,7 @@ import { getFederationDomain } from '../lib/getFederationDomain';
 import { clientLogger } from '../lib/logger';
 
 async function afterUnsetReaction(message, { user, reaction }) {
-	const room = Rooms.findOneById(message.rid, { fields: { federation: 1 } });
+	const room = await Rooms.findOneById(message.rid, { projection: { federation: 1 } });
 
 	// If there are not federated users on this room, ignore it
 	if (!hasExternalDomain(room)) {