Skip to content

Chore: Migrate REST API - joinRoom to Typescript #3835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reinaldonetof merged 4 commits into from
Mar 7, 2022
Merged

Chore: Migrate REST API - joinRoom to Typescript #3835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c84bd87
Chore: Migrate REST API - joinRoom to Typescript
reinaldonetof Mar 4, 2022
da7b224
join to discussion
reinaldonetof Mar 5, 2022
166acbb
Merge branch 'develop' into chore.ts-joinroom
reinaldonetof Mar 7, 2022
4d50896
Merge branch 'develop' into chore.ts-joinroom
reinaldonetof Mar 7, 2022
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
3 changes: 3 additions & 0 deletions app/definitions/rest/v1/channels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ export type ChannelsEndpoints = {
'channels.convertToTeam': {
POST: (params: { channelId: string; channelName: string }) => { team: ITeam };
};
'channels.join': {
POST: (params: { roomId: string; joinCode: string | null }) => { channel: IServerRoomItem };
};
'channels.close': {
POST: (params: { roomId: string }) => {};
};
Expand Down
7 changes: 2 additions & 5 deletions app/lib/rocketchat/services/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,11 @@ 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 => {
// TODO: join code
export const joinRoom = (roomId: string, joinCode: string | null, type: 'c' | 'p') => {
// RC 0.48.0
if (type === 'p') {
return sdk.methodCallWrapper('joinRoom', roomId);
return sdk.methodCallWrapper('joinRoom', roomId) as Promise<boolean>;
}
// TODO: missing definitions from server
// @ts-ignore
return sdk.post('channels.join', { roomId, joinCode });
};

Expand Down