feat: update relay contact configs to adhere to nip-11 (#63)

Author: jchiarulli

cmd/install.go

@@ -64,18 +64,21 @@ var installCmd = &cobra.Command{
 		}
 
 		var relayContact string
-		if selectedRelayOption == khatru_pyramid.RelayName || selectedRelayOption == nostr_rs_relay.RelayName || selectedRelayOption == khatru29.RelayName {
+		if selectedRelayOption == wot_relay.RelayName {
 			pterm.Println()
-			pterm.Println(pterm.Yellow("Leave email empty if you don't want to provide relay contact information."))
+			pterm.Println(pterm.Yellow("If you leave the relay contact information empty, then the relay's public key will be used."))
 
 			pterm.Println()
-			relayContact, _ = pterm.DefaultInteractiveTextInput.Show("Email address")
-		} else if selectedRelayOption == wot_relay.RelayName {
+			relayContact, _ = pterm.DefaultInteractiveTextInput.Show("Email address/Public key (hex not npub)")
+		} else {
 			pterm.Println()
-			pterm.Println(pterm.Yellow("If you leave the relay contact information empty, then the relay's public key will be used."))
+			pterm.Println(pterm.Yellow("Leave email empty if you don't want to provide relay contact information."))
 
 			pterm.Println()
-			relayContact, _ = pterm.DefaultInteractiveTextInput.Show("Email address/Public key (hex not npub)")
+			relayContact, _ = pterm.DefaultInteractiveTextInput.Show("Email address")
+			if relayContact != "" {
+				relayContact = fmt.Sprintf("mailto:%s", relayContact)
+			}
 		}
 
 		pterm.Println()
@@ -151,7 +154,7 @@ var installCmd = &cobra.Command{
 			strfry.InstallRelayBinary()
 
 			// Step 8: Set up the relay service
-			strfry.SetupRelayService(relayDomain)
+			strfry.SetupRelayService(relayDomain, relayContact)
 
 			// Step 9: Show success messages
 			strfry.SuccessMessages(relayDomain, httpsEnabled)
@@ -208,7 +211,7 @@ var installCmd = &cobra.Command{
 			strfry29.InstallRelayBinary()
 
 			// Step 8: Set up the relay service
-			strfry29.SetupRelayService(relayDomain, privKey)
+			strfry29.SetupRelayService(relayDomain, privKey, relayContact)
 
 			// Step 9: Show success messages
 			strfry29.SuccessMessages(relayDomain, httpsEnabled)

pkg/relays/strfry/service.go

@@ -10,7 +10,7 @@ import (
 )
 
 // Function to set up the relay service
-func SetupRelayService(domain string) {
+func SetupRelayService(domain, relayContact string) {
 	spinner, _ := pterm.DefaultSpinner.Start("Configuring relay service...")
 
 	// Ensure the data directory exists and set ownership
@@ -42,6 +42,9 @@ func SetupRelayService(domain string) {
 	// Determine preferred nofiles value
 	files.InPlaceEdit(`s|nofiles = .*|nofiles = 0|`, TmpConfigFilePath)
 
+	// Construct the sed command to change the contact
+	files.InPlaceEdit(fmt.Sprintf(`s|contact = ".*"|contact = "%s"|`, relayContact), TmpConfigFilePath)
+
 	// Copy config file to config directory
 	files.CopyFile(TmpConfigFilePath, ConfigDirPath)
 

pkg/relays/strfry29/service.go

@@ -11,7 +11,7 @@ import (
 )
 
 // Function to set up the relay service
-func SetupRelayService(domain, relaySecretKey string) {
+func SetupRelayService(domain, relaySecretKey, relayContact string) {
 	spinner, _ := pterm.DefaultSpinner.Start("Configuring relay service...")
 
 	// Ensure the data directory exists and set ownership
@@ -48,6 +48,9 @@ func SetupRelayService(domain, relaySecretKey string) {
 	// Construct the sed command to change the info description
 	files.InPlaceEdit(fmt.Sprintf(`s|description = ".*"|description = "%s"|`, ConfigFileInfoDescription), TmpConfigFilePath)
 
+	// Construct the sed command to change the contact
+	files.InPlaceEdit(fmt.Sprintf(`s|contact = ".*"|contact = "%s"|`, relayContact), TmpConfigFilePath)
+
 	// Construct the sed command to change the plugin path
 	files.InPlaceEdit(fmt.Sprintf(`s|plugin = ".*"|plugin = "%s"|`, BinaryPluginFilePath), TmpConfigFilePath)