Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions app/definitions/IMessage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ export interface IMessageFromServer {
files?: IMessageFile[];
groupable?: boolean;
attachments?: IAttachment[];
t?: MessageType;
drid?: string;
dcount?: number;
dml: string | Date;
}

export interface ILoadMoreMessage {
Expand Down
4 changes: 2 additions & 2 deletions app/definitions/rest/v1/chat.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { IMessage } from '../../IMessage';
import type { IMessage, IMessageFromServer } from '../../IMessage';
import type { IServerRoom } from '../../IRoom';
import { PaginatedResult } from '../helpers/PaginatedResult';

Expand Down Expand Up @@ -31,7 +31,7 @@ export type ChatEndpoints = {
};
'chat.getDiscussions': {
GET: (params: { roomId: IServerRoom['_id']; text?: string; offset: number; count: number }) => {
messages: IMessage[];
messages: IMessageFromServer[];
total: number;
};
};
Expand Down
4 changes: 2 additions & 2 deletions app/views/DiscussionsView/DiscussionDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import { StyleSheet, Text, View } from 'react-native';

import { TThreadModel } from '../../definitions/IThread';
import { CustomIcon } from '../../lib/Icons';
import { themes } from '../../constants/colors';
import sharedStyles from '../Styles';
import { useTheme } from '../../theme';
import { IMessageFromServer } from '../../definitions';

const styles = StyleSheet.create({
container: {
Expand All @@ -31,7 +31,7 @@ const styles = StyleSheet.create({
});

interface IDiscussionDetails {
item: TThreadModel;
item: IMessageFromServer;
date: string;
}

Expand Down
4 changes: 2 additions & 2 deletions app/views/DiscussionsView/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { themes } from '../../constants/colors';
import { MarkdownPreview } from '../../containers/markdown';
import { formatDateThreads, makeThreadName } from '../../utils/room';
import DiscussionDetails from './DiscussionDetails';
import { TThreadModel } from '../../definitions/IThread';
import { IMessageFromServer } from '../../definitions';

const styles = StyleSheet.create({
container: {
Expand Down Expand Up @@ -48,7 +48,7 @@ const styles = StyleSheet.create({
});

interface IItem {
item: TThreadModel;
item: IMessageFromServer;
onPress: {
(...args: any[]): void;
stop(): void;
Expand Down
10 changes: 5 additions & 5 deletions app/views/DiscussionsView/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { HeaderBackButton, StackNavigationOptions, StackNavigationProp } from '@react-navigation/stack';
import { RouteProp } from '@react-navigation/core';

import { IApplicationState } from '../../definitions';
import { IApplicationState, IMessageFromServer } from '../../definitions';
import { ChatsStackParamList } from '../../stacks/types';
import ActivityIndicator from '../../containers/ActivityIndicator';
import I18n from '../../i18n';
Expand Down Expand Up @@ -47,8 +47,8 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem
const isMasterDetail = useSelector((state: IApplicationState) => state.app?.isMasterDetail);

const [loading, setLoading] = useState(false);
const [discussions, setDiscussions] = useState([]);
const [search, setSearch] = useState([]);
const [discussions, setDiscussions] = useState<IMessageFromServer[]>([]);
const [search, setSearch] = useState<IMessageFromServer[]>([]);
const [isSearching, setIsSearching] = useState(false);
const [total, setTotal] = useState(0);
const [searchTotal, setSearchTotal] = useState(0);
Expand All @@ -63,7 +63,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem

setLoading(true);
try {
const result: any = await RocketChat.getDiscussions({
const result = await RocketChat.getDiscussions({
Comment thread
AlexAlexandre marked this conversation as resolved.
roomId: rid,
offset: isSearching ? search.length : discussions.length,
count: API_FETCH_COUNT,
Expand Down Expand Up @@ -171,7 +171,7 @@ const DiscussionsView = ({ navigation, route }: IDiscussionsViewProps): JSX.Elem
true
);

const renderItem = ({ item }: { item: TThreadModel }) => (
const renderItem = ({ item }: { item: IMessageFromServer }) => (
<Item
{...{
item,
Expand Down