From 6a92dd336ba6d7a960885692651f7ae048fb266e Mon Sep 17 00:00:00 2001
From: Marc Ransome <marc.ransome@fidgetbox.co.uk>
Date: Fri, 3 Nov 2023 15:34:18 +0000
Subject: [PATCH] Update URLs for official Project Gemini capsule (#342)

* Update URLs for official Project Gemini capsule

* Update disabled tests
---
 client/url_test.go  | 4 ++--
 config/config.go    | 2 +-
 config/default.go   | 2 +-
 default-config.toml | 2 +-
 display/newtab.go   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/client/url_test.go b/client/url_test.go
index 5b492752..6455cd5b 100644
--- a/client/url_test.go
+++ b/client/url_test.go
@@ -24,9 +24,9 @@ var normalizeURLTests = []struct {
 	{"https://example.com", "https://example.com"},
 	// Fixing URL tests
 	// Some commented out due to #324
-	//{"gemini://gemini.circumlunar.space/%64%6f%63%73/%66%61%71%2e%67%6d%69", "gemini://gemini.circumlunar.space/docs/faq.gmi"},
+	//{"gemini://geminiprotocol.net/%64%6f%63%73/%66%61%71%2e%67%6d%69", "gemini://geminiprotocol.net/docs/faq.gmi"},
 	{"gemini://example.com/蛸", "gemini://example.com/%E8%9B%B8"},
-	//{"gemini://gemini.circumlunar.space/%64%6f%63%73/;;.'%66%61%71蛸%2e%67%6d%69", "gemini://gemini.circumlunar.space/docs/%3B%3B.%27faq%E8%9B%B8.gmi"},
+	//{"gemini://geminiprotocol.net/%64%6f%63%73/;;.'%66%61%71蛸%2e%67%6d%69", "gemini://geminiprotocol.net/docs/%3B%3B.%27faq%E8%9B%B8.gmi"},
 	{"gemini://example.com/?%2Ch%64ello蛸", "gemini://example.com/?%2Chdello%E8%9B%B8"},
 	// IPv6 tests, see #195
 	{"gemini://[::1]", "gemini://[::1]/"},
diff --git a/config/config.go b/config/config.go
index 6531fe6a..76af68fc 100644
--- a/config/config.go
+++ b/config/config.go
@@ -190,7 +190,7 @@ func Init() error {
 
 	// Setup main config
 
-	viper.SetDefault("a-general.home", "gemini://gemini.circumlunar.space")
+	viper.SetDefault("a-general.home", "gemini://geminiprotocol.net")
 	viper.SetDefault("a-general.auto_redirect", false)
 	viper.SetDefault("a-general.http", "default")
 	viper.SetDefault("a-general.search", "gemini://geminispace.info/search")
diff --git a/config/default.go b/config/default.go
index a73593e1..f481f234 100644
--- a/config/default.go
+++ b/config/default.go
@@ -25,7 +25,7 @@ var defaultConf = []byte(`# This is the default config file.
 
 [a-general]
 # Press Ctrl-H to access it
-home = "gemini://gemini.circumlunar.space"
+home = "gemini://geminiprotocol.net"
 
 # Follow up to 5 Gemini redirects without prompting.
 # A prompt is always shown after the 5th redirect and for redirects to protocols other than Gemini.
diff --git a/default-config.toml b/default-config.toml
index c465dcef..3a4ca62f 100644
--- a/default-config.toml
+++ b/default-config.toml
@@ -22,7 +22,7 @@
 
 [a-general]
 # Press Ctrl-H to access it
-home = "gemini://gemini.circumlunar.space"
+home = "gemini://geminiprotocol.net"
 
 # Follow up to 5 Gemini redirects without prompting.
 # A prompt is always shown after the 5th redirect and for redirects to protocols other than Gemini.
diff --git a/display/newtab.go b/display/newtab.go
index 87b538dc..7999eb95 100644
--- a/display/newtab.go
+++ b/display/newtab.go
@@ -29,7 +29,7 @@ Happy browsing!
 => https://github.com/makeworld-the-better-one/amfora/wiki Amfora Wiki [GitHub]
 => gemini://makeworld.space/amfora-wiki/ Amfora Wiki [On Gemini!]
 
-=> gemini://gemini.circumlunar.space Project Gemini
+=> gemini://geminiprotocol.net Project Gemini
 `
 
 // Read the new tab content from a file if it exists or fallback to a default page.