From 71528c89155c632dc506ed7f35ab9699e12deb8a Mon Sep 17 00:00:00 2001
From: Gleidson Daniel <gleidson10daniel@hotmail.com>
Date: Thu, 22 Sep 2022 09:36:56 -0300
Subject: [PATCH 1/4] parse server url

---
 app/lib/methods/audioFile.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/lib/methods/audioFile.ts b/app/lib/methods/audioFile.ts
index 80aa854e107..bd95728f39d 100644
--- a/app/lib/methods/audioFile.ts
+++ b/app/lib/methods/audioFile.ts
@@ -1,8 +1,11 @@
 import * as FileSystem from 'expo-file-system';
 
+import { sanitizeLikeString } from '../database/utils';
 import { store } from '../store/auxStore';
 import log from './helpers/log';
 
+const parseServerUrl = (serverUrl: string) => sanitizeLikeString(serverUrl.substring(serverUrl.lastIndexOf('/') + 1));
+
 const ensureDirAsync = async (dir: string, intermediates = true): Promise<void> => {
 	const info = await FileSystem.getInfoAsync(dir);
 	if (info.exists && info.isDirectory) {
@@ -16,7 +19,7 @@ export const downloadAudioFile = async (url: string, fileUrl: string): Promise<s
 	let path = '';
 	try {
 		const serverUrl = store.getState().server.server;
-		const serverUrlParsed = serverUrl.substring(serverUrl.lastIndexOf('/') + 1);
+		const serverUrlParsed = parseServerUrl(serverUrl);
 		const folderPath = `${FileSystem.documentDirectory}audios/${serverUrlParsed}`;
 		const filePath = `${folderPath}/${fileUrl.substring(fileUrl.lastIndexOf('/') + 1)}`;
 		await ensureDirAsync(folderPath);
@@ -35,7 +38,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 = parseServerUrl(serverUrl);
 		const path = `${FileSystem.documentDirectory}audios/${serverUrlParsed}`;
 		await FileSystem.deleteAsync(path);
 	} catch (error) {

From bfec112184b40fd00bd68e14997a345923dada90 Mon Sep 17 00:00:00 2001
From: Gleidson Daniel <gleidson10daniel@hotmail.com>
Date: Thu, 22 Sep 2022 10:24:50 -0300
Subject: [PATCH 2/4] fix filenames

---
 app/containers/message/Attachments.tsx | 12 ++++++++++--
 app/containers/message/Audio.tsx       |  5 +++--
 app/containers/message/interfaces.ts   |  1 +
 app/lib/methods/audioFile.ts           | 18 +++++++++++++-----
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/containers/message/Attachments.tsx b/app/containers/message/Attachments.tsx
index ddbed86f03e..25ad98f5918 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}
+					/>
 				);
 			}
 
diff --git a/app/containers/message/Audio.tsx b/app/containers/message/Audio.tsx
index 99acaa117fa..3afc4025e7f 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/interfaces.ts b/app/containers/message/interfaces.ts
index fbf78de3fbd..a3c97ac1a4c 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 bd95728f39d..08bbb3db83a 100644
--- a/app/lib/methods/audioFile.ts
+++ b/app/lib/methods/audioFile.ts
@@ -4,7 +4,13 @@ import { sanitizeLikeString } from '../database/utils';
 import { store } from '../store/auxStore';
 import log from './helpers/log';
 
-const parseServerUrl = (serverUrl: string) => sanitizeLikeString(serverUrl.substring(serverUrl.lastIndexOf('/') + 1));
+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);
@@ -15,15 +21,17 @@ 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 = parseServerUrl(serverUrl);
+		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);
+		console.log(file);
 		if (!file.exists) {
 			const downloadedFile = await FileSystem.downloadAsync(url, filePath);
 			path = downloadedFile.uri;
@@ -38,7 +46,7 @@ export const downloadAudioFile = async (url: string, fileUrl: string): Promise<s
 
 export const deleteAllAudioFiles = async (serverUrl: string): Promise<void> => {
 	try {
-		const serverUrlParsed = parseServerUrl(serverUrl);
+		const serverUrlParsed = sanitizeString(serverUrl);
 		const path = `${FileSystem.documentDirectory}audios/${serverUrlParsed}`;
 		await FileSystem.deleteAsync(path);
 	} catch (error) {

From 588fe45d6abe682ea01b680670cee648777972ef Mon Sep 17 00:00:00 2001
From: Gleidson Daniel <gleidson10daniel@hotmail.com>
Date: Thu, 22 Sep 2022 14:10:34 -0300
Subject: [PATCH 3/4] pass id as prop

---
 app/containers/message/Attachments.tsx | 2 +-
 app/containers/message/Reply.tsx       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/containers/message/Attachments.tsx b/app/containers/message/Attachments.tsx
index 25ad98f5918..a581f194e87 100644
--- a/app/containers/message/Attachments.tsx
+++ b/app/containers/message/Attachments.tsx
@@ -114,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/Reply.tsx b/app/containers/message/Reply.tsx
index 14654192b81..d80c8a5ec7c 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} />

From 3186551ce9d7d7bbde3d39135b9e322394bfde22 Mon Sep 17 00:00:00 2001
From: Gleidson Daniel <gleidson10daniel@hotmail.com>
Date: Thu, 22 Sep 2022 14:17:12 -0300
Subject: [PATCH 4/4] remove log

---
 app/lib/methods/audioFile.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/lib/methods/audioFile.ts b/app/lib/methods/audioFile.ts
index 08bbb3db83a..31cd09f9e6a 100644
--- a/app/lib/methods/audioFile.ts
+++ b/app/lib/methods/audioFile.ts
@@ -31,7 +31,6 @@ export const downloadAudioFile = async (url: string, fileUrl: string, messageId:
 		const filePath = `${folderPath}/${filename}`;
 		await ensureDirAsync(folderPath);
 		const file = await FileSystem.getInfoAsync(filePath);
-		console.log(file);
 		if (!file.exists) {
 			const downloadedFile = await FileSystem.downloadAsync(url, filePath);
 			path = downloadedFile.uri;