chore: use common.SubstringBetween

Signed-off-by: HystericalDragon <HystericalDragons@proton.me>
xchacha20-poly1305 · Jun 22, 2024 · eaa2fe5 · eaa2fe5
1 parent e15bb6c
commit eaa2fe5
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 55 deletions.
diff --git a/libcore/strings.go b/libcore/strings.go
diff --git a/libcore/strings_test.go b/libcore/strings_test.go
diff --git a/libcore/url.go b/libcore/url.go
@@ -6,6 +6,7 @@ import (
 	"strings"
 	_ "unsafe"
 
+	"github.com/sagernet/sing/common"
 	E "github.com/sagernet/sing/common/exceptions"
 )
 
@@ -73,7 +74,7 @@ func ParseURL(rawURL string) (URL, error) {
 		if !strings.Contains(errStr, "invalid port") {
 			return nil, E.Cause(err, "pause rawURL")
 		}
-		multiplePort := stringBetween(errStr, "invalid port \"", "\" after host")
+		multiplePort := common.SubstringBetween(errStr, "invalid port \"", "\" after host")
 		noPort := strings.Replace(rawURL, multiplePort, "", 1)
 		uu, err = url.Parse(noPort)
 		if err != nil {