From 37ac502611c94b6760e9f47c52ffcf2c3dc8bba8 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Thu, 3 Mar 2022 21:26:42 -0300 Subject: [PATCH 1/2] Chore: Migrate REST API - spotlight to Typescript --- app/definitions/ISpotlight.ts | 11 +++++++++++ app/lib/rocketchat/services/restApi.ts | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/definitions/ISpotlight.ts diff --git a/app/definitions/ISpotlight.ts b/app/definitions/ISpotlight.ts new file mode 100644 index 00000000000..8a055775656 --- /dev/null +++ b/app/definitions/ISpotlight.ts @@ -0,0 +1,11 @@ +import { IServerRoomItem } from './IRoom'; +import { IUser } from './IUser'; + +export type TSpotlightUser = Pick & { outside: boolean }; + +export type ISpotlightRoom = Pick & Partial>; + +export interface ISpotlight { + users: TSpotlightUser[]; + rooms: ISpotlightRoom[]; +} diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index e9e7937d901..f54c307a5f5 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -2,6 +2,7 @@ import sdk from './sdk'; import { TEAM_TYPE } from '../../../definitions/ITeam'; import roomTypeToApiType, { RoomTypes } from '../methods/roomTypeToApiType'; import { SubscriptionType, INotificationPreferences } from '../../../definitions'; +import { ISpotlight } from '../../../definitions/ISpotlight'; export const createChannel = ({ name, @@ -80,7 +81,7 @@ export const forgotPassword = (email: string): any => export const sendConfirmationEmail = (email: string): Promise<{ message: string; success: boolean }> => sdk.methodCallWrapper('sendConfirmationEmail', email); -export const spotlight = (search: string, usernames: string, type: { users: boolean; rooms: boolean }) => +export const spotlight = (search: string, usernames: string, type: { users: boolean; rooms: boolean }): Promise => // RC 0.51.0 sdk.methodCallWrapper('spotlight', search, usernames, type); From 04691b307b19d60c99f2ab2d32c004940171b873 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Thu, 3 Mar 2022 21:43:38 -0300 Subject: [PATCH 2/2] minor tweak --- app/lib/rocketchat/services/restApi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index f54c307a5f5..baa36a9aadd 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -81,7 +81,7 @@ export const forgotPassword = (email: string): any => export const sendConfirmationEmail = (email: string): Promise<{ message: string; success: boolean }> => sdk.methodCallWrapper('sendConfirmationEmail', email); -export const spotlight = (search: string, usernames: string, type: { users: boolean; rooms: boolean }): Promise => +export const spotlight = (search: string, usernames: string[], type: { users: boolean; rooms: boolean }): Promise => // RC 0.51.0 sdk.methodCallWrapper('spotlight', search, usernames, type);