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
6 changes: 6 additions & 0 deletions apps/meteor/app/lib/server/functions/createRoom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ export const createRoom = async <T extends RoomType>(
fname: name,
_updatedAt: now,
...extraData,
...(extraData.federated && {
federated: true,
federation: {
version: 1,
},
}),
name: isDiscussion ? name : await getValidRoomName(name.trim(), undefined),
t: type,
msgs: 0,
Expand Down
18 changes: 0 additions & 18 deletions apps/meteor/server/services/federation/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,24 +34,6 @@ export function throwIfFederationNotEnabledOrNotReady(): void {
if (!isFederationEnabled()) {
throw new Error('Federation is not enabled');
}

if (!isFederationReady()) {
throw new Error('Federation configuration is invalid');
}
}

export function throwIfFederationEnabledButNotReady(): void {
if (!isFederationEnabled()) {
return;
}

throwIfFederationNotReady();
}

export function throwIfFederationNotReady(): void {
if (!isFederationReady()) {
throw new Error('Federation configuration is invalid');
}
}

export class FederationMatrixInvalidConfigurationError extends Error {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { isMessageFromNativeFederation, isRoomFederated, isRoomNativeFederated } from '@rocket.chat/core-typings';
import { isRoomFederated, isRoomNativeFederated } from '@rocket.chat/core-typings';
import type { AtLeast, IMessage, IRoom } from '@rocket.chat/core-typings';

import { isFederationEnabled } from '../../federation/utils';

export class FederationActions {
public static shouldPerformAction(message: IMessage, room: AtLeast<IRoom, 'federated'>): boolean {
public static shouldPerformAction(_message: IMessage, room: AtLeast<IRoom, 'federated'>): boolean {
if (!isRoomFederated(room)) {
return true;
}

if (!isRoomNativeFederated(room) || !isMessageFromNativeFederation(message)) {
if (!isRoomNativeFederated(room)) {
return false;
}

Expand Down
3 changes: 3 additions & 0 deletions ee/packages/federation-matrix/src/api/_matrix/invite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,9 @@ async function joinRoom({
name: inviteEvent.sender,
requirePasswordChange: false,
federated: true,
federation: {
version: 1,
},
createdAt: new Date(),
_updatedAt: new Date(),
};
Expand Down
3 changes: 3 additions & 0 deletions ee/packages/federation-matrix/src/events/invite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ export function invite(emitter: Emitter<HomeserverEventSignatures>) {
createdAt: new Date(),
_updatedAt: new Date(),
federated: true,
federation: {
version: 1,
},
});
const serverName = data.sender.split(':')[1] || 'unknown';
const bridgedUser = await MatrixBridgedUser.findOne({ mui: data.sender });
Expand Down
Loading