Skip to content

[FIX] Messages View #2090

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
diegolmello merged 6 commits into from
May 8, 2020
Merged

[FIX] Messages View #2090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f642384
[FIX] Messages View
djorkaeffalexandre May 7, 2020
cf92ee7
[FIX] Opening PDF from Files View
djorkaeffalexandre May 7, 2020
a2dd6b4
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
djorkaeffalexandre May 8, 2020
fe151a4
[FIX] Audio
djorkaeffalexandre May 8, 2020
3d3a950
[FIX] SearchMessagesView
djorkaeffalexandre May 8, 2020
3bd62ce
Merge branch 'develop' into fix.messages-view
diegolmello May 8, 2020
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
7 changes: 6 additions & 1 deletion app/containers/message/Audio.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,15 @@ class MessageAudio extends React.Component {
const { file } = this.props;
const { baseUrl, user } = this.context;

let url = file.audio_url;
if (!url.startsWith('http')) {
url = `${ baseUrl }${ file.audio_url }`;
}

this.setState({ loading: true });
try {
await Audio.setAudioModeAsync(mode);
await this.sound.loadAsync({ uri: `${ baseUrl }${ file.audio_url }?rc_uid=${ user.id }&rc_token=${ user.token }` });
await this.sound.loadAsync({ uri: `${ url }?rc_uid=${ user.id }&rc_token=${ user.token }` });
} catch {
// Do nothing
}
Expand Down
5 changes: 4 additions & 1 deletion app/containers/message/Reply.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,10 @@ const Reply = React.memo(({
return;
}
if (attachment.type === 'file') {
url = `${ baseUrl }${ url }?rc_uid=${ user.id }&rc_token=${ user.token }`;
if (!url.startsWith('http')) {
url = `${ baseUrl }${ url }`;
}
url = `${ url }?rc_uid=${ user.id }&rc_token=${ user.token }`;
}
openLink(url, theme);
};
Expand Down
29 changes: 15 additions & 14 deletions app/views/MessagesView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import equal from 'deep-equal';
import ActionSheet from 'react-native-action-sheet';

import styles from './styles';
import Message from '../../containers/message/Message';
import Message from '../../containers/message';
import ActivityIndicator from '../../containers/ActivityIndicator';
import I18n from '../../i18n';
import RocketChat from '../../lib/rocketchat';
Expand Down Expand Up @@ -87,6 +87,7 @@ class MessagesView extends React.Component {
const { user, baseUrl, theme } = this.props;

const renderItemCommonProps = item => ({
item,
baseUrl,
user,
author: item.u || item.user,
Expand All @@ -110,21 +111,21 @@ class MessagesView extends React.Component {
},
noDataMsg: I18n.t('No_files'),
testID: 'room-files-view',
renderItem: (item) => {
const url = getFileUrlFromMessage(item);

return (
<Message
{...renderItemCommonProps(item)}
attachments={[{
renderItem: item => (
<Message
{...renderItemCommonProps(item)}
item={{
...item,
u: item.user,
attachments: [{
title: item.name,
description: item.description,
...url
}]}
theme={theme}
/>
);
}
...getFileUrlFromMessage(item)
}]
}}
theme={theme}
/>
)
},
// Mentions Messages Screen
Mentions: {
Expand Down
8 changes: 2 additions & 6 deletions app/views/SearchMessagesView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import styles from './styles';
import Markdown from '../../containers/markdown';
import debounce from '../../utils/debounce';
import RocketChat from '../../lib/rocketchat';
import Message from '../../containers/message/Message';
import Message from '../../containers/message';
import scrollPersistTaps from '../../utils/scrollPersistTaps';
import I18n from '../../i18n';
import StatusBar from '../../containers/StatusBar';
Expand Down Expand Up @@ -115,14 +115,10 @@ class SearchMessagesView extends React.Component {
const { user, baseUrl, theme } = this.props;
return (
<Message
item={item}
baseUrl={baseUrl}
user={user}
author={item.u}
ts={item.ts}
msg={item.msg}
attachments={item.attachments || []}
timeFormat='MMM Do YYYY, h:mm:ss a'
isEdited={!!item.editedAt}
isHeader
showAttachment={() => {}}
getCustomEmoji={this.getCustomEmoji}
Expand Down