From ba2d581975c3b1b63f1794d3bcd912ad12e6f15b Mon Sep 17 00:00:00 2001
From: Brian Picciano <mediocregopher@gmail.com>
Date: Thu, 21 Sep 2023 10:51:30 +0200
Subject: Fix gemini gateway proxying to work with gateways like tildeverse's

---
 src/gmi/gemtext.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/gmi/gemtext.go')

diff --git a/src/gmi/gemtext.go b/src/gmi/gemtext.go
index 3e5f6fc..884635c 100644
--- a/src/gmi/gemtext.go
+++ b/src/gmi/gemtext.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/url"
 	"path"
-	"path/filepath"
 	"regexp"
 	"strings"
 )
@@ -50,11 +49,10 @@ func GemtextToMarkdown(dst io.Writer, src io.Reader, gmiGateway *url.URL) error
 			}
 
 			if u.Scheme == "gemini" && gmiGateway != nil {
-
-				newU := *gmiGateway
-				newU.Path = filepath.Join(newU.Path, u.Host, u.Path)
-				newU.RawQuery = u.RawQuery
-				u = &newU
+				newUStr := gmiGateway.String() + u.Host + u.Path
+				if u, err = url.Parse(newUStr); err != nil {
+					return fmt.Errorf("parsing proxied URL %q: %w", newUStr, err)
+				}
 			}
 
 			isImg := hasImgExt(u.Path)
-- 
cgit v1.2.3