Skip to content

Chore: Migrate REST API - getReadReceipts to Typescript #3877

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

Chore: Migrate REST API - getReadReceipts to Typescript #3877

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
e3a3bc9
Chore: Migrate REST API - getReadReceipts to Typescript
reinaldonetof Mar 10, 2022
cb0e92d
Merge branch 'develop' into chore.ts-getreadreceipts
reinaldonetof Mar 14, 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
10 changes: 10 additions & 0 deletions app/definitions/IMessage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,13 @@ export type TMessageModel = IMessage & Model;

export type TAnyMessageModel = TMessageModel | TThreadModel | TThreadMessageModel;
export type TTypeMessages = IMessageFromServer | ILoadMoreMessage | IMessage;

// Read receipts to ReadReceiptView and chat.getMessageReadReceipts
export interface IReadReceipts {
_id: string;
roomId: string;
userId: string;
messageId: string;
ts: string;
user?: IUserMessage;
}
5 changes: 4 additions & 1 deletion app/definitions/rest/v1/chat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IMessage, IMessageFromServer } from '../../IMessage';
import type { IMessage, IMessageFromServer, IReadReceipts } from '../../IMessage';
import type { IServerRoom } from '../../IRoom';
import { PaginatedResult } from '../helpers/PaginatedResult';

Expand Down Expand Up @@ -65,4 +65,7 @@ export type ChatEndpoints = {
messages: IMessageFromServer[];
};
};
'chat.getMessageReadReceipts': {
GET: (params: { messageId: string }) => { receipts: IReadReceipts[] };
};
};
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 @@ -617,10 +617,8 @@ export const getMessages = (
});
};

export const getReadReceipts = (messageId: string): any =>
export const getReadReceipts = (messageId: string) =>
// RC 0.63.0
// TODO: missing definitions from server
// @ts-ignore
sdk.get('chat.getMessageReadReceipts', {
messageId
});
Expand Down
18 changes: 3 additions & 15 deletions app/views/ReadReceiptView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,11 @@ import { themes } from '../../constants/colors';
import SafeAreaView from '../../containers/SafeAreaView';
import styles from './styles';
import { ChatsStackParamList } from '../../stacks/types';

interface IReceipts {
_id: string;
roomId: string;
userId: string;
messageId: string;
ts: string;
user?: {
_id: string;
name: string;
username: string;
};
}
import { IReadReceipts } from '../../definitions';

interface IReadReceiptViewState {
loading: boolean;
receipts: IReceipts[];
receipts: IReadReceipts[];
}

interface INavigationOption {
Expand Down Expand Up @@ -125,7 +113,7 @@ class ReadReceiptView extends React.Component<IReadReceiptViewProps, IReadReceip
);
};

renderItem = ({ item }: { item: IReceipts }) => {
renderItem = ({ item }: { item: IReadReceipts }) => {
const { theme, Message_TimeAndDateFormat } = this.props;
const time = moment(item.ts).format(Message_TimeAndDateFormat);
if (!item?.user?.username) {
Expand Down