From 7fdf52d55f0bc9db6924b2abad0ded5de673c562 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Fri, 4 Mar 2022 22:45:57 -0300 Subject: [PATCH 1/2] Chore: Migrate REST API - getRoomCounters to Typescript --- app/definitions/rest/v1/channels.ts | 11 +++++++++++ app/definitions/rest/v1/groups.ts | 11 +++++++++++ app/lib/rocketchat/services/restApi.ts | 6 ++++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/definitions/rest/v1/channels.ts b/app/definitions/rest/v1/channels.ts index 6692f0a9ce8..40011304a4b 100644 --- a/app/definitions/rest/v1/channels.ts +++ b/app/definitions/rest/v1/channels.ts @@ -52,4 +52,15 @@ export type ChannelsEndpoints = { 'channels.convertToTeam': { POST: (params: { channelId: string; channelName: string }) => { team: ITeam }; }; + 'channels.counters': { + GET: (params: { roomId: string }) => { + joined: boolean; + members: number; + unreads: number; + unreadsFrom: Date; + msgs: number; + latest: Date; + userMentions: number; + }; + }; }; diff --git a/app/definitions/rest/v1/groups.ts b/app/definitions/rest/v1/groups.ts index 966a6759ae8..1f5246abfe4 100644 --- a/app/definitions/rest/v1/groups.ts +++ b/app/definitions/rest/v1/groups.ts @@ -46,4 +46,15 @@ export type GroupsEndpoints = { 'groups.convertToTeam': { POST: (params: { roomId: string; roomName: string }) => { team: ITeam }; }; + 'groups.counters': { + GET: (params: { roomId: string }) => { + joined: boolean; + members: number; + unreads: number; + unreadsFrom: Date; + msgs: number; + latest: Date; + userMentions: number; + }; + }; }; diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index 40db3b020fe..6f014bd616e 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -300,10 +300,12 @@ export const getUserRoles = () => // RC 0.27.0 sdk.methodCallWrapper('getUserRoles'); -export const getRoomCounters = (roomId: string, t: RoomTypes): any => +export const getRoomCounters = ( + roomId: string, + t: SubscriptionType.CHANNEL | SubscriptionType.GROUP | SubscriptionType.OMNICHANNEL +) => // RC 0.65.0 // TODO: missing definitions from server - // @ts-ignore sdk.get(`${roomTypeToApiType(t)}.counters`, { roomId }); export const getChannelInfo = (roomId: string): any => From 761b2d47a72eae21ecdf2bfcfa83e5f2553c7686 Mon Sep 17 00:00:00 2001 From: Reinaldo Neto Date: Fri, 4 Mar 2022 22:51:39 -0300 Subject: [PATCH 2/2] minor tweak --- app/lib/rocketchat/services/restApi.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/lib/rocketchat/services/restApi.ts b/app/lib/rocketchat/services/restApi.ts index 6f014bd616e..4944a1271ba 100644 --- a/app/lib/rocketchat/services/restApi.ts +++ b/app/lib/rocketchat/services/restApi.ts @@ -305,7 +305,6 @@ export const getRoomCounters = ( t: SubscriptionType.CHANNEL | SubscriptionType.GROUP | SubscriptionType.OMNICHANNEL ) => // RC 0.65.0 - // TODO: missing definitions from server sdk.get(`${roomTypeToApiType(t)}.counters`, { roomId }); export const getChannelInfo = (roomId: string): any =>