From d1e2c3fe6d71e26dcb8a4d677c7073d994bb6032 Mon Sep 17 00:00:00 2001
From: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Date: Fri, 23 Sep 2022 17:21:11 -0300
Subject: [PATCH] [FIX] Fix filenames and servers url when downloading audio
 files (#4553)

---
 app/containers/message/Attachments.tsx | 14 +++++++++++---
 app/containers/message/Audio.tsx       |  5 +++--
 app/containers/message/Reply.tsx       |  4 +++-
 app/containers/message/interfaces.ts   |  1 +
 app/lib/methods/audioFile.ts           | 18 ++++++++++++++----
 5 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/app/containers/message/Attachments.tsx b/app/containers/message/Attachments.tsx
index ddbed86f0..a581f194e 100644
--- a/app/containers/message/Attachments.tsx
+++ b/app/containers/message/Attachments.tsx
@@ -57,7 +57,7 @@ const AttachedActions = ({ attachment }: { attachment: IAttachment }) => {
 };
 
 const Attachments: React.FC<IMessageAttachments> = React.memo(
-	({ attachments, timeFormat, showAttachment, style, getCustomEmoji, isReply }: IMessageAttachments) => {
+	({ attachments, timeFormat, showAttachment, style, getCustomEmoji, isReply, id }: IMessageAttachments) => {
 		const { theme } = useTheme();
 
 		if (!attachments || attachments.length === 0) {
@@ -80,7 +80,15 @@ const Attachments: React.FC<IMessageAttachments> = React.memo(
 
 			if (file && file.audio_url) {
 				return (
-					<Audio key={file.audio_url} file={file} getCustomEmoji={getCustomEmoji} isReply={isReply} style={style} theme={theme} />
+					<Audio
+						key={file.audio_url}
+						file={file}
+						getCustomEmoji={getCustomEmoji}
+						isReply={isReply}
+						style={style}
+						theme={theme}
+						messageId={id}
+					/>
 				);
 			}
 
@@ -106,7 +114,7 @@ const Attachments: React.FC<IMessageAttachments> = React.memo(
 				);
 			}
 
-			return <Reply key={index} index={index} attachment={file} timeFormat={timeFormat} getCustomEmoji={getCustomEmoji} />;
+			return <Reply key={index} index={index} attachment={file} timeFormat={timeFormat} getCustomEmoji={getCustomEmoji} messageId={id} />;
 		});
 		return <>{attachmentsElements}</>;
 	},
diff --git a/app/containers/message/Audio.tsx b/app/containers/message/Audio.tsx
index 99acaa117..3afc4025e 100644
--- a/app/containers/message/Audio.tsx
+++ b/app/containers/message/Audio.tsx
@@ -36,6 +36,7 @@ interface IMessageAudioProps {
 	theme: TSupportedThemes;
 	getCustomEmoji: TGetCustomEmoji;
 	scale?: number;
+	messageId: string;
 }
 
 interface IMessageAudioState {
@@ -128,7 +129,7 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
 	}
 
 	async componentDidMount() {
-		const { file } = this.props;
+		const { file, messageId } = this.props;
 		const { baseUrl, user } = this.context;
 
 		let url = file.audio_url;
@@ -139,7 +140,7 @@ class MessageAudio extends React.Component<IMessageAudioProps, IMessageAudioStat
 		this.setState({ loading: true });
 		try {
 			if (url) {
-				const audio = await downloadAudioFile(`${url}?rc_uid=${user.id}&rc_token=${user.token}`, url);
+				const audio = await downloadAudioFile(`${url}?rc_uid=${user.id}&rc_token=${user.token}`, url, messageId);
 				await this.sound.loadAsync({ uri: audio });
 			}
 		} catch {
diff --git a/app/containers/message/Reply.tsx b/app/containers/message/Reply.tsx
index 14654192b..d80c8a5ec 100644
--- a/app/containers/message/Reply.tsx
+++ b/app/containers/message/Reply.tsx
@@ -90,6 +90,7 @@ interface IMessageReply {
 	timeFormat?: string;
 	index: number;
 	getCustomEmoji: TGetCustomEmoji;
+	messageId: string;
 }
 
 const Title = React.memo(
@@ -201,7 +202,7 @@ const Fields = React.memo(
 );
 
 const Reply = React.memo(
-	({ attachment, timeFormat, index, getCustomEmoji }: IMessageReply) => {
+	({ attachment, timeFormat, index, getCustomEmoji, messageId }: IMessageReply) => {
 		const [loading, setLoading] = useState(false);
 		const { theme } = useTheme();
 		const { baseUrl, user, jumpToMessage } = useContext(MessageContext);
@@ -256,6 +257,7 @@ const Reply = React.memo(
 							timeFormat={timeFormat}
 							style={[{ color: themes[theme].auxiliaryTintColor, fontSize: 14, marginBottom: 8 }]}
 							isReply
+							id={messageId}
 						/>
 						<UrlImage image={attachment.thumb_url} />
 						<Description attachment={attachment} getCustomEmoji={getCustomEmoji} theme={theme} />
diff --git a/app/containers/message/interfaces.ts b/app/containers/message/interfaces.ts
index fbf78de3f..a3c97ac1a 100644
--- a/app/containers/message/interfaces.ts
+++ b/app/containers/message/interfaces.ts
@@ -14,6 +14,7 @@ export interface IMessageAttachments {
 	isReply?: boolean;
 	showAttachment?: (file: IAttachment) => void;
 	getCustomEmoji: TGetCustomEmoji;
+	id: string;
 }
 
 export interface IMessageAvatar {
diff --git a/app/lib/methods/audioFile.ts b/app/lib/methods/audioFile.ts
index 80aa854e1..31cd09f9e 100644
--- a/app/lib/methods/audioFile.ts
+++ b/app/lib/methods/audioFile.ts
@@ -1,8 +1,17 @@
 import * as FileSystem from 'expo-file-system';
 
+import { sanitizeLikeString } from '../database/utils';
 import { store } from '../store/auxStore';
 import log from './helpers/log';
 
+const sanitizeString = (value: string) => sanitizeLikeString(value.substring(value.lastIndexOf('/') + 1));
+
+const parseFilename = (value: string) => {
+	const extension = value.substring(value.lastIndexOf('.') + 1);
+	const filename = sanitizeString(value.substring(value.lastIndexOf('/') + 1).split('.')[0]);
+	return `${filename}.${extension}`;
+};
+
 const ensureDirAsync = async (dir: string, intermediates = true): Promise<void> => {
 	const info = await FileSystem.getInfoAsync(dir);
 	if (info.exists && info.isDirectory) {
@@ -12,13 +21,14 @@ const ensureDirAsync = async (dir: string, intermediates = true): Promise<void>
 	return ensureDirAsync(dir, intermediates);
 };
 
-export const downloadAudioFile = async (url: string, fileUrl: string): Promise<string> => {
+export const downloadAudioFile = async (url: string, fileUrl: string, messageId: string): Promise<string> => {
 	let path = '';
 	try {
 		const serverUrl = store.getState().server.server;
-		const serverUrlParsed = serverUrl.substring(serverUrl.lastIndexOf('/') + 1);
+		const serverUrlParsed = sanitizeString(serverUrl);
 		const folderPath = `${FileSystem.documentDirectory}audios/${serverUrlParsed}`;
-		const filePath = `${folderPath}/${fileUrl.substring(fileUrl.lastIndexOf('/') + 1)}`;
+		const filename = `${messageId}_${parseFilename(fileUrl)}`;
+		const filePath = `${folderPath}/${filename}`;
 		await ensureDirAsync(folderPath);
 		const file = await FileSystem.getInfoAsync(filePath);
 		if (!file.exists) {
@@ -35,7 +45,7 @@ export const downloadAudioFile = async (url: string, fileUrl: string): Promise<s
 
 export const deleteAllAudioFiles = async (serverUrl: string): Promise<void> => {
 	try {
-		const serverUrlParsed = serverUrl.substring(serverUrl.lastIndexOf('/') + 1);
+		const serverUrlParsed = sanitizeString(serverUrl);
 		const path = `${FileSystem.documentDirectory}audios/${serverUrlParsed}`;
 		await FileSystem.deleteAsync(path);
 	} catch (error) {