Skip to content

Chore: Migrate REST API - removeUserFromRoom to Typescript #3837

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
dnlsilva merged 2 commits into from
Mar 7, 2022
Merged

Chore: Migrate REST API - removeUserFromRoom to Typescript #3837

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dab6690
chore: add rest api type
dnlsilva Mar 4, 2022
adb8c4a
Merge branch 'develop' into chore/remove-user-from-room-rest-api
dnlsilva 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,4 +52,7 @@ export type ChannelsEndpoints = {
'channels.convertToTeam': {
POST: (params: { channelId: string; channelName: string }) => { team: ITeam };
};
'channels.kick': {
POST: (params: { roomId: string; userId: string }) => {};
};
};
3 changes: 3 additions & 0 deletions app/definitions/rest/v1/groups.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,7 @@ export type GroupsEndpoints = {
'groups.convertToTeam': {
POST: (params: { roomId: string; roomName: string }) => { team: ITeam };
};
'groups.kick': {
POST: (params: { roomId: string; userId: string }) => {};
};
};
3 changes: 3 additions & 0 deletions app/definitions/rest/v1/im.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,7 @@ export type ImEndpoints = {
messages: IMessageFromServer[];
};
};
'im.kick': {
POST: (params: { roomId: string; userId: string }) => {};
};
};
4 changes: 1 addition & 3 deletions app/lib/rocketchat/services/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,10 +536,8 @@ export const toggleRoomModerator = ({
return sdk.post(`${roomTypeToApiType(t)}.removeModerator`, { roomId, userId });
};

export const removeUserFromRoom = ({ roomId, t, userId }: { roomId: string; t: SubscriptionType; userId: string }): any =>
export const removeUserFromRoom = ({ roomId, t, userId }: { roomId: string; t: RoomTypes; userId: string }) =>
// RC 0.48.0
// TODO: missing definitions from server
// @ts-ignore
sdk.post(`${roomTypeToApiType(t)}.kick`, { roomId, userId });

export const ignoreUser = ({ rid, userId, ignore }: { rid: string; userId: string; ignore: boolean }): any =>
Expand Down
4 changes: 3 additions & 1 deletion app/views/RoomMembersView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { goRoom, TGoRoomItem } from '../../utils/goRoom';
import { showConfirmationAlert, showErrorAlert } from '../../utils/info';
import log from '../../utils/log';
import scrollPersistTaps from '../../utils/scrollPersistTaps';
import { RoomTypes } from '../../lib/rocketchat/methods/roomTypeToApiType';
import styles from './styles';

const PAGE_SIZE = 25;
Expand Down Expand Up @@ -590,7 +591,8 @@ class RoomMembersView extends React.Component<IRoomMembersViewProps, IRoomMember
try {
const { room, members, membersFiltered } = this.state;
const userId = selectedUser._id;
await RocketChat.removeUserFromRoom({ roomId: room.rid, t: room.t, userId });
// TODO: interface SubscriptionType on IRoom is wrong
await RocketChat.removeUserFromRoom({ roomId: room.rid, t: room.t as RoomTypes, userId });
const message = I18n.t('User_has_been_removed_from_s', { s: RocketChat.getRoomTitle(room) });
EventEmitter.emit(LISTENER, { message });
this.setState({
Expand Down