Merge branch 'main' into v1.7.0

README.md

@@ -229,4 +229,4 @@ The process bears no risk to the participants. If any joiner becomes unresponsiv
 
 # Support
 
-Information about PeerSwap and a link to join their Discord channel is at [PeerSwap.dev](https://peerswap.dev). Additionally, there is a [Telegram group](https://t.me/PeerSwapLN) for node runners with PeerSwap. Just beware of scammers who may DM you. Immediately block and report to Telegram anyone with empty Username field.
+Join PeerSwap Discord channel at [PeerSwap.dev](https://peerswap.dev). 

cmd/psweb/config/common.go

@@ -131,14 +131,32 @@ func Load(dataDir string, network string) {
 		} else {
 			log.Println("Config file created in", Config.DataDir)
 		}
-		return
+	} else {
+		err = json.Unmarshal(fileData, &Config)
+		if err != nil {
+			log.Println("Error unmarshalling config file. Using defaults.")
+		}
 	}
 
-	err = json.Unmarshal(fileData, &Config)
-	if err != nil {
-		log.Println("Error unmarshalling config file. Using defaults.")
+	// on the first start without pswebconfig.json there will be no elements user and password
+	if Config.ElementsPass == "" || Config.ElementsUser == "" {
+		// check in peerswap.conf
+		Config.ElementsPass = GetPeerswapLNDSetting("elementsd.rpcpass")
+		Config.ElementsUser = GetPeerswapLNDSetting("elementsd.rpcuser")
+
+		// check if they were passed as env
+		if Config.ElementsUser == "" && os.Getenv("ELEMENTS_USER") != "" {
+			Config.ElementsUser = os.Getenv("ELEMENTS_USER")
+		}
+		if Config.ElementsPass == "" && os.Getenv("ELEMENTS_PASS") != "" {
+			Config.ElementsPass = os.Getenv("ELEMENTS_PASS")
+		}
+		// save changes
+		Save()
 	}
 
+	// if ElementPass is still empty, this will create temporary peerswap.conf with Liquid disabled
+	SavePS()
 }
 
 // saves PS Web config to pswebconfig.json