Skip to content

Chore: Migrate REST API - addUsersToRoom to Typescript #3884

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 15, 2022
Merged

Chore: Migrate REST API - addUsersToRoom to Typescript #3884

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba53e5a
Chore: Migrate REST API - addUsersToRoom to Typescript
reinaldonetof Mar 11, 2022
15ffbd3
Update app/lib/rocketchat/services/restApi.ts
reinaldonetof Mar 14, 2022
3f52241
minor tweak
reinaldonetof Mar 14, 2022
8ab6840
Merge branch 'develop' into chore.ts-adduserstoroom
reinaldonetof Mar 15, 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
6 changes: 0 additions & 6 deletions app/lib/rocketchat/rocketchat.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,6 @@ const RocketChat = {
// RC 3.1.0
return this.post('users.2fa.sendEmailCode', { emailOrUsername: username });
},
addUsersToRoom(rid) {
let { users } = reduxStore.getState().selectedUsers;
users = users.map(u => u.name);
// RC 0.51.0
return this.methodCallWrapper('addUsersToRoom', { rid, users });
},
hasRole(role) {
const shareUser = reduxStore.getState().share.user;
const loginUser = reduxStore.getState().login.user;
Expand Down
10 changes: 9 additions & 1 deletion app/lib/rocketchat/services/restApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import sdk from './sdk';
import { TEAM_TYPE } from '../../../definitions/ITeam';
import roomTypeToApiType, { RoomTypes } from '../methods/roomTypeToApiType';
import { SubscriptionType, INotificationPreferences, IRoomNotifications } from '../../../definitions';
import { SubscriptionType, INotificationPreferences, IRoomNotifications, IUser } from '../../../definitions';
import { ISpotlight } from '../../../definitions/ISpotlight';
import { IAvatarSuggestion, IParams } from '../../../definitions/IProfileViewInterfaces';
import reduxStore from '../../createStore';
Comment thread
reinaldonetof marked this conversation as resolved.
Outdated

export const createChannel = ({
name,
Expand Down Expand Up @@ -743,3 +744,10 @@ export const useInviteToken = (token: string): any =>
// TODO: missing definitions from server
// @ts-ignore
sdk.post('useInviteToken', { token });

export const addUsersToRoom = (rid: string): Promise<boolean> => {
let { users } = reduxStore.getState().selectedUsers;
users = users.map((u: IUser) => u.name);
// RC 0.51.0
return sdk.methodCallWrapper('addUsersToRoom', { rid, users });
};