From c84bd87ea90ebc1058f8913202fff549a970908b Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Fri, 4 Mar 2022 15:37:19 -0300 Subject: [PATCH 1/2] Chore: Migrate REST API - joinRoom to Typescript --- app/definitions/rest/v1/channels.ts | 3 +++ app/lib/rocketchat/services/restApi.ts | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/definitions/rest/v1/channels.ts b/app/definitions/rest/v1/channels.ts index 6692f0a9ce8..5e6af86f32f 100644 --- a/app/definitions/rest/v1/channels.ts +++ b/app/definitions/rest/v1/channels.ts @@ -52,4 +52,7 @@ export type ChannelsEndpoints = { 'channels.convertToTeam': { POST: (params: { channelId: string; channelName: string }) => { team: ITeam }; }; + 'channels.join': { + POST: (params: { roomId: string; joinCode: string | null }) => { channel: IServerRoomItem }; + }; }; diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index e9e7937d901..485ca65bd6b 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -228,14 +228,12 @@ export const convertTeamToChannel = ({ teamId, selected }: { teamId: string; sel return sdk.post('teams.convertToChannel', params); }; -export const joinRoom = (roomId: string, joinCode: string | null, type: 'c' | 'p'): any => { +export const joinRoom = (roomId: string, joinCode: string | null, type: 'c' | 'p') => { // TODO: join code // RC 0.48.0 if (type === 'p') { return sdk.methodCallWrapper('joinRoom', roomId); } - // TODO: missing definitions from server - // @ts-ignore return sdk.post('channels.join', { roomId, joinCode }); }; From da7b224eea7f80c789174359ee6f3d0472761874 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Fri, 4 Mar 2022 22:29:38 -0300 Subject: [PATCH 2/2] join to discussion --- app/lib/rocketchat/services/restApi.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index 485ca65bd6b..ff0757f10d9 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -229,10 +229,9 @@ export const convertTeamToChannel = ({ teamId, selected }: { teamId: string; sel }; export const joinRoom = (roomId: string, joinCode: string | null, type: 'c' | 'p') => { - // TODO: join code // RC 0.48.0 if (type === 'p') { - return sdk.methodCallWrapper('joinRoom', roomId); + return sdk.methodCallWrapper('joinRoom', roomId) as Promise; } return sdk.post('channels.join', { roomId, joinCode }); };