From ba1ec9cab4221c62e87b1f7555958747320e7a98 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sat, 6 Jul 2024 15:57:56 +0200
Subject: [PATCH 1/2] Fix msg attachment proxy_url when using paths

---
 .../channels/#channel_id/messages/index.ts    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index a5bfcfd73..4d7e388ff 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -1,17 +1,17 @@
 /*
 	Spacebar: A FOSS re-implementation and extension of the Discord.com backend.
 	Copyright (C) 2023 Spacebar and Spacebar Contributors
-	
+
 	This program is free software: you can redistribute it and/or modify
 	it under the terms of the GNU Affero General Public License as published
 	by the Free Software Foundation, either version 3 of the License, or
 	(at your option) any later version.
-	
+
 	This program is distributed in the hope that it will be useful,
 	but WITHOUT ANY WARRANTY; without even the implied warranty of
 	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 	GNU Affero General Public License for more details.
-	
+
 	You should have received a copy of the GNU Affero General Public License
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
@@ -183,9 +183,17 @@ router.get(
 				const uri = y.proxy_url.startsWith("http")
 					? y.proxy_url
 					: `https://example.org${y.proxy_url}`;
-				y.proxy_url = `${endpoint == null ? "" : endpoint}${
-					new URL(uri).pathname
-				}`;
+
+				let pathname = new URL(uri).pathname;
+				while (
+					pathname.split("/")[0] != "attachments" &&
+					pathname.length > 10
+				) {
+					pathname = pathname.split("/").slice(1).join("/");
+				}
+				if (!endpoint?.endsWith("/")) pathname = "/" + pathname;
+
+				y.proxy_url = `${endpoint == null ? "" : endpoint}${pathname}`;
 			});
 
 			/**

From 8358755eeb8aea4bc4d151b778f818c5d6e9527f Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sat, 6 Jul 2024 16:02:21 +0200
Subject: [PATCH 2/2] Increase minimum char count

---
 src/api/routes/channels/#channel_id/messages/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index 4d7e388ff..645c6db23 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -187,7 +187,7 @@ router.get(
 				let pathname = new URL(uri).pathname;
 				while (
 					pathname.split("/")[0] != "attachments" &&
-					pathname.length > 10
+					pathname.length > 30
 				) {
 					pathname = pathname.split("/").slice(1).join("/");
 				}