Skip to content

Commit f9d85e6

Browse files
committed
chore(federation-sdk): update @rocket.chat/federation-sdk to version 0.1.16 in package.json and yarn.lock; adjust type definitions in FederationMatrix.ts and member.ts
1 parent 560b3d3 commit f9d85e6

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

ee/packages/federation-matrix/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"@rocket.chat/core-services": "workspace:^",
3939
"@rocket.chat/core-typings": "workspace:^",
4040
"@rocket.chat/emitter": "^0.31.25",
41-
"@rocket.chat/federation-sdk": "0.1.14",
41+
"@rocket.chat/federation-sdk": "0.1.16",
4242
"@rocket.chat/http-router": "workspace:^",
4343
"@rocket.chat/license": "workspace:^",
4444
"@rocket.chat/models": "workspace:^",

ee/packages/federation-matrix/src/FederationMatrix.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
} from '@rocket.chat/core-typings';
1010
import type { MessageQuoteAttachment, IMessage, IRoom, IUser, IRoomNativeFederated } from '@rocket.chat/core-typings';
1111
import { eventIdSchema, getAllServices, roomIdSchema, userIdSchema } from '@rocket.chat/federation-sdk';
12-
import type { EventID, HomeserverServices, FileMessageType, PresenceState } from '@rocket.chat/federation-sdk';
12+
import type { EventID, UserID, HomeserverServices, FileMessageType, PresenceState } from '@rocket.chat/federation-sdk';
1313
import { Logger } from '@rocket.chat/logger';
1414
import { Users, Subscriptions, Messages, Rooms, Settings } from '@rocket.chat/models';
1515
import emojione from 'emojione';
@@ -26,7 +26,7 @@ export const fileTypes: Record<string, FileMessageType> = {
2626
};
2727

2828
/** helper to validate the username format */
29-
export function validateFederatedUsername(mxid: string): mxid is `@${string}:${string}` {
29+
export function validateFederatedUsername(mxid: string): mxid is UserID {
3030
if (!mxid.startsWith('@')) return false;
3131

3232
const parts = mxid.substring(1).split(':');
@@ -89,11 +89,7 @@ export const getUsernameServername = (mxid: string, serverName: string): [mxid:
8989
* Because of historical reasons, we can have users only with federated flag but no federation object
9090
* So we need to upsert the user with the federation object
9191
*/
92-
export async function createOrUpdateFederatedUser(options: {
93-
username: `@${string}:${string}`;
94-
name?: string;
95-
origin: string;
96-
}): Promise<string> {
92+
export async function createOrUpdateFederatedUser(options: { username: UserID; name?: string; origin: string }): Promise<string> {
9793
const { username, name = username, origin } = options;
9894

9995
const result = await Users.updateOne(

ee/packages/federation-matrix/src/events/member.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ async function membershipJoinAction(data: HomeserverEventSignatures['homeserver.
6666
}
6767

6868
const insertedId = await createOrUpdateFederatedUser({
69-
username: data.state_key as `@${string}:${string}`,
69+
username: data.event.state_key,
7070
origin: serverName,
7171
name: data.content.displayname || (data.state_key as `@${string}:${string}`),
7272
});

yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7534,7 +7534,7 @@ __metadata:
75347534
"@rocket.chat/core-typings": "workspace:^"
75357535
"@rocket.chat/emitter": "npm:^0.31.25"
75367536
"@rocket.chat/eslint-config": "workspace:^"
7537-
"@rocket.chat/federation-sdk": "npm:0.1.14"
7537+
"@rocket.chat/federation-sdk": "npm:0.1.16"
75387538
"@rocket.chat/http-router": "workspace:^"
75397539
"@rocket.chat/license": "workspace:^"
75407540
"@rocket.chat/models": "workspace:^"
@@ -7560,9 +7560,9 @@ __metadata:
75607560
languageName: unknown
75617561
linkType: soft
75627562

7563-
"@rocket.chat/federation-sdk@npm:0.1.14":
7564-
version: 0.1.14
7565-
resolution: "@rocket.chat/federation-sdk@npm:0.1.14"
7563+
"@rocket.chat/federation-sdk@npm:0.1.16":
7564+
version: 0.1.16
7565+
resolution: "@rocket.chat/federation-sdk@npm:0.1.16"
75667566
dependencies:
75677567
"@datastructures-js/priority-queue": "npm:^6.3.3"
75687568
"@noble/ed25519": "npm:^3.0.0"
@@ -7575,7 +7575,7 @@ __metadata:
75757575
zod: "npm:^3.22.4"
75767576
peerDependencies:
75777577
typescript: ~5.9.2
7578-
checksum: 10/5050b67228cfec59a2d2bf4cb373077ccbcfc63450b21fe25ea7dbe94f81148d2fab55285ecdf21799aad8b6499ea866db7e0b8d639925bb3ac605ccbb3ecbe4
7578+
checksum: 10/88edcce215b91956237c896ce0b5d00fea5aba9c8ebe314cb63f26c8677cde8e9c9c4ad72a0e7ce6ea5be40c2b7d1bbdfae295289acfe7cf242e23a7f0583f63
75797579
languageName: node
75807580
linkType: hard
75817581

0 commit comments

Comments
 (0)