Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions .changeset/remove-dead-federation-plumbing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@rocket.chat/core-services': major
'@rocket.chat/rest-typings': major
'@rocket.chat/core-typings': major
'@rocket.chat/meteor': major
'@rocket.chat/i18n': major
---

Removes dead code left behind by the old Matrix bridge federation: the `Federation`/`FederationEE` service proxies and `IFederationService`/`IFederationServiceEE` interfaces (no service implemented them anymore), the never-implemented `/v1/federation/*` REST endpoint typings (`searchPublicRooms`, `joinExternalPublicRoom`, `listServersByUser`, `addServerByUser`, `removeServerByUser`), the listener-less `federation.userRoleChanged` event, unused federation v1 statistics fields and types, the old two-server federation E2E test suite, and orphaned translation keys.
19 changes: 0 additions & 19 deletions apps/meteor/client/startup/slashCommands/federation.ts
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
import { slashCommands } from '../../../app/utils/client/slashCommand';

const callback = undefined;
const result = undefined;
const providesPreview = false;
const previewer = undefined;
const previewCallback = undefined;

slashCommands.add({
command: 'federation',
callback,
options: {
description: 'Federation_slash_commands',
params: '#command (dm) #user',
},
result,
providesPreview,
previewer,
previewCallback,
});

slashCommands.add({
command: 'xmpp-join',
options: {
Expand Down
1 change: 0 additions & 1 deletion apps/meteor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"stylelint:fix": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\"",
"test": "yarn testunit && yarn testapi",
"test:e2e": "playwright test",
"test:e2e:federation": "playwright test --config=playwright-federation.config.ts",
"test:e2e:nyc": "nyc report --reporter=lcovonly",
"testapi": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' mocha --config ./.mocharc.api.js",
"testapi:livechat": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' mocha --config ./.mocharc.api.livechat.js",
Expand Down
29 changes: 0 additions & 29 deletions apps/meteor/playwright-federation.config.ts

This file was deleted.

1 change: 0 additions & 1 deletion apps/meteor/playwright.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export default {
],
].filter(Boolean) as unknown as PlaywrightTestConfig['reporter'],
testDir: 'tests/e2e',
testIgnore: 'tests/e2e/federation/**',
workers: 1,
timeout: 60 * 1000,
globalTimeout: (process.env.IS_EE === 'true' ? 50 : 40) * 60 * 1000,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,5 @@ export const removeUserFromRole = async (userId: string, roleId: string, usernam
if (settings.get('UI_DisplayRoles')) {
void api.broadcast('user.roleUpdate', event);
}
void api.broadcast('federation.userRoleChanged', { ...event, givenByUserId: userId });

return remove;
};
2 changes: 0 additions & 2 deletions apps/meteor/server/meteor-methods/rooms/addRoomModerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,6 @@ export const addRoomModerator = async (fromUserId: IUser['_id'], rid: IRoom['_id
void api.broadcast('user.roleUpdate', event);
}

void api.broadcast('federation.userRoleChanged', { ...event, givenByUserId: fromUserId });

return true;
};

Expand Down
1 change: 0 additions & 1 deletion apps/meteor/server/meteor-methods/rooms/addRoomOwner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ export const addRoomOwner = async (fromUserId: IUser['_id'], rid: IRoom['_id'],
if (settings.get('UI_DisplayRoles')) {
void api.broadcast('user.roleUpdate', event);
}
void api.broadcast('federation.userRoleChanged', { ...event, givenByUserId: fromUserId });

return true;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@ export const removeRoomModerator = async (fromUserId: IUser['_id'], rid: IRoom['
if (settings.get('UI_DisplayRoles')) {
void api.broadcast('user.roleUpdate', event);
}
void api.broadcast('federation.userRoleChanged', { ...event, givenByUserId: fromUserId });

return true;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ export const removeRoomOwner = async (fromUserId: string, rid: string, userId: s
if (settings.get('UI_DisplayRoles')) {
void api.broadcast('user.roleUpdate', event);
}
void api.broadcast('federation.userRoleChanged', { ...event, givenByUserId: fromUserId });
return true;
};

Expand Down
12 changes: 0 additions & 12 deletions apps/meteor/tests/e2e/federation/README.md

This file was deleted.

20 changes: 0 additions & 20 deletions apps/meteor/tests/e2e/federation/config/constants.ts

This file was deleted.

20 changes: 0 additions & 20 deletions apps/meteor/tests/e2e/federation/config/global-setup.ts

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
39,580 changes: 0 additions & 39,580 deletions apps/meteor/tests/e2e/federation/files/video_mock_for_webcam.y4m

This file was deleted.

This file was deleted.

78 changes: 0 additions & 78 deletions apps/meteor/tests/e2e/federation/page-objects/admin.ts

This file was deleted.

94 changes: 0 additions & 94 deletions apps/meteor/tests/e2e/federation/page-objects/channel.ts

This file was deleted.

Loading
Loading