Skip to content

Chore: Migrate REST API - searchMessages to Typescript #3874

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

Chore: Migrate REST API - searchMessages to Typescript #3874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea31fe4
chore: add rest api return
AlexAlexandre Mar 10, 2022
812e6bb
Merge branch 'develop' into chore/searchMessages
AlexAlexandre Mar 10, 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
1 change: 1 addition & 0 deletions app/definitions/IMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ export interface IMessageFromServer {
_id: string;
username: string;
};
score?: number;
}

export interface ILoadMoreMessage {
Expand Down
5 changes: 5 additions & 0 deletions app/definitions/rest/v1/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,9 @@ export type ChatEndpoints = {
'chat.ignoreUser': {
GET: (params: { rid: string; userId: string; ignore: boolean }) => {};
};
'chat.search': {
GET: (params: { roomId: IServerRoom['_id']; searchText: string; count: number; offset: number }) => {
messages: IMessageFromServer[];
};
};
};
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 @@ -624,10 +624,8 @@ export const getReadReceipts = (messageId: string): any =>
messageId
});

export const searchMessages = (roomId: string, searchText: string, count: number, offset: number): any =>
export const searchMessages = (roomId: string, searchText: string, count: number, offset: number) =>
// RC 0.60.0
// TODO: missing definitions from server
// @ts-ignore
sdk.get('chat.search', {
roomId,
searchText,
Expand Down
4 changes: 3 additions & 1 deletion app/views/SearchMessagesView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,13 @@ class SearchMessagesView extends React.Component<ISearchMessagesViewProps, ISear
if (result.success) {
return result.messages;
}
};

return [];
};
getMessages = async (searchText: string, debounced?: boolean) => {
try {
const messages = await this.searchMessages(searchText);
// @ts-ignore TODO: find a way to deal with the difference between IMessageFromServer and TMessageModel expected by state
this.setState(prevState => ({
messages: debounced ? messages : [...prevState.messages, ...messages],
loading: false
Expand Down