From b511d5455ae6038e8b8fa26f8171f50d0c77498a Mon Sep 17 00:00:00 2001
From: fsociety <fsociety.mp3@pm.me>
Date: Sat, 28 Sep 2024 13:15:04 +0200
Subject: [PATCH] feat(config): update relay list parsing

Update getRelayListFromEnvOrFile function to prioritize file over environment variable. Improve relay list parsing to handle both 'wss://' and 'ws://' prefixes.
---
 config.go | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/config.go b/config.go
index 2efa882..76e8203 100644
--- a/config.go
+++ b/config.go
@@ -54,15 +54,16 @@ type AwsConfig struct {
 
 func getRelayListFromEnvOrFile(envKey, fileKey string) []string {
 	envValue := getEnv(envKey)
-	if envValue != "" {
-		return getRelayList(envValue)
-	}
-
 	filePath := getEnv(fileKey)
+
 	if filePath != "" {
 		return getRelayListFromFile(filePath)
 	}
 
+	if envValue != "" {
+		return getRelayList(envValue)
+	}
+
 	return []string{}
 }
 
@@ -127,7 +128,13 @@ func getRelayListFromFile(filePath string) []string {
 	}
 
 	for i, relay := range relayList {
-		relayList[i] = "wss://" + strings.TrimSpace(relay)
+		relay = strings.TrimSpace(relay)
+		if strings.HasPrefix(relay, "wss://") {
+			relay = strings.TrimPrefix(relay, "wss://")
+		} else if strings.HasPrefix(relay, "ws://") {
+			relay = strings.TrimPrefix(relay, "ws://")
+		}
+		relayList[i] = relay
 	}
 	return relayList
 }