From f59c43afa727fe12668c068408dfda9e8d56cc98 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Wed, 15 Jul 2020 23:08:56 -0400
Subject: [PATCH] Don't display default port in URL

---
 Gemini/NavigationManager.swift | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Gemini/NavigationManager.swift b/Gemini/NavigationManager.swift
index 9c608f2..27d3bc0 100644
--- a/Gemini/NavigationManager.swift
+++ b/Gemini/NavigationManager.swift
@@ -19,10 +19,18 @@ class NavigationManager: NSObject, ObservableObject {
     
     func changeURL(_ url: URL) {
         backStack.append(currentURL)
-        currentURL = url
+        currentURL = cannonicalizeURL(url)
         forwardStack = []
     }
     
+    private func cannonicalizeURL(_ url: URL) -> URL {
+        var components = URLComponents(url: url, resolvingAgainstBaseURL: false)!
+        if components.scheme == "gemini" && components.port == 1965 {
+            components.port = nil
+        }
+        return components.url!
+    }
+    
     @objc func back() {
         guard !backStack.isEmpty else { return }
         forwardStack.insert(currentURL, at: 0)