small fixes and typos

README.md

@@ -3,7 +3,6 @@
 
 ![](https://img.shields.io/github/v/release/alireza0/s-ui.svg)
 ![S-UI Docker pull](https://img.shields.io/docker/pulls/alireza7/s-ui.svg)
-![S-UI-Singbox Docker pull](https://img.shields.io/docker/pulls/alireza7/s-ui-singbox.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/alireza0/s-ui)](https://goreportcard.com/report/github.com/alireza0/s-ui)
 [![Downloads](https://img.shields.io/github/downloads/alireza0/s-ui/total.svg)](https://img.shields.io/github/downloads/alireza0/s-ui/total.svg)
 [![License](https://img.shields.io/badge/license-GPL%20V3-blue.svg?longCache=true)](https://www.gnu.org/licenses/gpl-3.0.en.html)

config/config.go

@@ -51,7 +51,7 @@ func GetDBFolderPath() string {
 	if dbFolderPath == "" {
 		dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
 		if err != nil {
-			dbFolderPath = "/usr/local/s-ui/db"
+			return "/usr/local/s-ui/db"
 		}
 		dbFolderPath = dir + "/db"
 	}

service/inbounds.go

@@ -336,6 +336,9 @@ func (s *InboundService) RestartInbounds(tx *gorm.DB, ids []uint) error {
 			return err
 		}
 		inboundConfig, err = s.addUsers(tx, inboundConfig, inbound.Id, inbound.Type)
+		if err != nil {
+			return err
+		}
 		err = corePtr.AddInbound(inboundConfig)
 		if err != nil {
 			return err

service/server.go

@@ -185,7 +185,7 @@ func (s *ServerService) generateECHKeyPair(options string) []string {
 }
 
 func (s *ServerService) generateTLSKeyPair(serverName string) []string {
-	privateKeyPem, publicKeyPem, err := tls.GenerateKeyPair(time.Now, serverName, time.Now().AddDate(0, 12, 0))
+	privateKeyPem, publicKeyPem, err := tls.GenerateCertificate(nil, nil, time.Now, serverName, time.Now().AddDate(0, 12, 0))
 	if err != nil {
 		return []string{"Failed to generate TLS keypair: ", err.Error()}
 	}

service/setting.go

@@ -358,7 +358,7 @@ func (s *SettingService) Save(tx *gorm.DB, data json.RawMessage) error {
 		return err
 	}
 	for key, obj := range settings {
-		// Secure file existance check
+		// Secure file existence check
 		if obj != "" && (key == "webCertFile" ||
 			key == "webKeyFile" ||
 			key == "subCertFile" ||

util/outJson.go

@@ -25,6 +25,9 @@ func FillOutJson(i *model.Inbound, hostname string) error {
 	}
 
 	inbound, err := i.MarshalFull()
+	if err != nil {
+		return err
+	}
 
 	outJson["type"] = i.Type
 	outJson["tag"] = i.Tag

web/web.go

@@ -24,7 +24,7 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-//go:embed html/*
+//go:embed *
 var content embed.FS
 
 type Server struct {