refactor audio

This commit is contained in:
Reinaldo Neto 2023-06-07 17:23:01 -03:00
parent 420bd49c9e
commit b341528f10
2 changed files with 6 additions and 10 deletions

View File

@ -85,7 +85,6 @@ const Attachments: React.FC<IMessageAttachments> = React.memo(
isReply={isReply} isReply={isReply}
style={style} style={style}
theme={theme} theme={theme}
messageId={id}
author={author} author={author}
/> />
); );

View File

@ -19,7 +19,7 @@ import { withDimensions } from '../../dimensions';
import { TGetCustomEmoji } from '../../definitions/IEmoji'; import { TGetCustomEmoji } from '../../definitions/IEmoji';
import { IAttachment, IUserMessage } from '../../definitions'; import { IAttachment, IUserMessage } from '../../definitions';
import { TSupportedThemes, useTheme } from '../../theme'; import { TSupportedThemes, useTheme } from '../../theme';
import { MediaTypes, downloadMediaFile, searchMediaFileAsync } from '../../lib/methods/handleMediaDownload'; import { downloadMediaFile, searchMediaFileAsync } from '../../lib/methods/handleMediaDownload';
import EventEmitter from '../../lib/methods/helpers/events'; import EventEmitter from '../../lib/methods/helpers/events';
import { PAUSE_AUDIO } from './constants'; import { PAUSE_AUDIO } from './constants';
import { fetchAutoDownloadEnabled } from '../../lib/methods/autoDownloadPreference'; import { fetchAutoDownloadEnabled } from '../../lib/methods/autoDownloadPreference';
@ -39,7 +39,6 @@ interface IMessageAudioProps {
theme: TSupportedThemes; theme: TSupportedThemes;
getCustomEmoji: TGetCustomEmoji; getCustomEmoji: TGetCustomEmoji;
scale?: number; scale?: number;
messageId: string;
author?: IUserMessage; author?: IUserMessage;
} }
@ -144,11 +143,11 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
}; };
async componentDidMount() { async componentDidMount() {
const { messageId, file } = this.props; const { file } = this.props;
const fileSearch = await searchMediaFileAsync({ const fileSearch = await searchMediaFileAsync({
type: MediaTypes.audio, type: 'audio',
mimeType: file.audio_type, mimeType: file.audio_type,
messageId urlToCache: this.getUrl()
}); });
this.filePath = fileSearch.filePath; this.filePath = fileSearch.filePath;
if (fileSearch?.file?.exists) { if (fileSearch?.file?.exists) {
@ -167,7 +166,7 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
if (url && !url.startsWith('http')) { if (url && !url.startsWith('http')) {
url = `${baseUrl}${file.audio_url}`; url = `${baseUrl}${file.audio_url}`;
} }
return url; return url as string;
}; };
handleAutoDownload = async () => { handleAutoDownload = async () => {
@ -286,7 +285,6 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
}; };
handleDownload = async () => { handleDownload = async () => {
const { messageId } = this.props;
// @ts-ignore can't use declare to type this // @ts-ignore can't use declare to type this
const { user } = this.context; const { user } = this.context;
this.setState({ loading: true }); this.setState({ loading: true });
@ -295,8 +293,7 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
if (url && this.filePath) { if (url && this.filePath) {
const audio = await downloadMediaFile({ const audio = await downloadMediaFile({
downloadUrl: `${url}?rc_uid=${user.id}&rc_token=${user.token}`, downloadUrl: `${url}?rc_uid=${user.id}&rc_token=${user.token}`,
mediaType: MediaTypes.audio, mediaType: 'audio',
messageId,
path: this.filePath path: this.filePath
}); });