Chore: Migrate REST API - getMessages to Typescript (#3875)

This commit is contained in:
Alex Junior 2022-03-10 12:00:50 -03:00 committed by GitHub
parent 4dc43313ab
commit 69cf9b638e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 55 additions and 8 deletions

View File

@ -87,6 +87,17 @@ export interface IMessageFromServer {
drid?: string;
dcount?: number;
dml: string | Date;
starred?:
| {
_id: string;
}
| boolean;
pinned?: boolean;
pinnedAt?: string | Date;
pinnedBy?: {
_id: string;
username: string;
};
}
export interface ILoadMoreMessage {
@ -106,7 +117,11 @@ export interface IMessage extends IMessageFromServer {
emoji?: string;
status?: number;
pinned?: boolean;
starred?: boolean;
starred?:
| {
_id: string;
}
| boolean;
editedBy?: IEditedBy;
reactions?: IReaction[];
role?: string;

View File

@ -99,4 +99,14 @@ export type ChannelsEndpoints = {
'channels.removeLeader': {
POST: (params: { roomId: string; userId: string }) => {};
};
'channels.messages': {
GET: (params: {
roomId: IServerRoom['_id'];
query: { 'mentions._id': { $in: string[] } } | { 'starred._id': { $in: string[] } } | { pinned: boolean };
offset: number;
sort: { ts: number };
}) => {
messages: IMessageFromServer[];
};
};
};

View File

@ -69,4 +69,14 @@ export type GroupsEndpoints = {
'groups.leave': {
POST: (params: { roomId: string }) => {};
};
'groups.messages': {
GET: (params: {
roomId: IServerRoom['_id'];
query: { 'mentions._id': { $in: string[] } } | { 'starred._id': { $in: string[] } } | { pinned: boolean };
offset: number;
sort: { ts: number };
}) => {
messages: IMessageFromServer[];
};
};
};

View File

@ -55,4 +55,14 @@ export type ImEndpoints = {
'im.leave': {
POST: (params: { roomId: string }) => {};
};
'im.messages': {
GET: (params: {
roomId: IServerRoom['_id'];
query: { 'mentions._id': { $in: string[] } } | { 'starred._id': { $in: string[] } } | { pinned: boolean };
offset: number;
sort: { ts: number };
}) => {
messages: IMessageFromServer[];
};
};
};

View File

@ -600,16 +600,21 @@ export const getFiles = (roomId: string, type: RoomTypes, offset: number): any =
sort: { uploadedAt: -1 }
});
export const getMessages = (roomId: string, type: RoomTypes, query: any, offset: number): any =>
export const getMessages = (
roomId: string,
type: SubscriptionType,
query: { 'mentions._id': { $in: string[] } } | { 'starred._id': { $in: string[] } } | { pinned: boolean },
offset: number
) => {
const t = type as SubscriptionType.DIRECT | SubscriptionType.CHANNEL | SubscriptionType.GROUP;
// RC 0.59.0
// TODO: missing definitions from server
// @ts-ignore
sdk.get(`${roomTypeToApiType(type)}.messages`, {
return sdk.get(`${roomTypeToApiType(t)}.messages`, {
roomId,
query,
offset,
sort: { ts: -1 }
});
};
export const getReadReceipts = (messageId: string): any =>
// RC 0.63.0

View File

@ -226,7 +226,6 @@ class MessagesView extends React.Component<IMessagesViewProps, any> {
name: I18n.t('Mentions'),
fetchFunc: () => {
const { messages } = this.state;
// @ts-ignore
return RocketChat.getMessages(this.rid, this.t, { 'mentions._id': { $in: [user.id] } }, messages.length);
},
noDataMsg: I18n.t('No_mentioned_messages'),
@ -239,7 +238,6 @@ class MessagesView extends React.Component<IMessagesViewProps, any> {
name: I18n.t('Starred'),
fetchFunc: () => {
const { messages } = this.state;
// @ts-ignore
return RocketChat.getMessages(this.rid, this.t, { 'starred._id': { $in: [user.id] } }, messages.length);
},
noDataMsg: I18n.t('No_starred_messages'),
@ -260,7 +258,6 @@ class MessagesView extends React.Component<IMessagesViewProps, any> {
name: I18n.t('Pinned'),
fetchFunc: () => {
const { messages } = this.state;
// @ts-ignore
return RocketChat.getMessages(this.rid, this.t, { pinned: true }, messages.length);
},
noDataMsg: I18n.t('No_pinned_messages'),