Remove deperated go func

mail/attachment.go

@@ -1,7 +1,6 @@
 package mail
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -19,7 +18,7 @@ func SaveAttachment(fileContent []byte, token, fileName string) error {
 		return err
 	}
 	attachmentPath := filepath.Join(homeDir, util.ConfigPath["tmpPath"], token, fileName)
-	err = ioutil.WriteFile(attachmentPath, fileContent, os.ModePerm)
+	err = os.WriteFile(attachmentPath, fileContent, os.ModePerm)
 	if err != nil {
 		util.FileLog.Error(err.Error())
 		return err

main.go

@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
@@ -274,7 +273,7 @@ func fileHandler(w http.ResponseWriter, r *http.Request) {
 		for _, fileHeaders := range r.MultipartForm.File {
 			for _, fileHeader := range fileHeaders {
 				f, _ := fileHeader.Open()
-				fileContent, _ := ioutil.ReadAll(f)
+				fileContent, _ := io.ReadAll(f)
 				err := mail.SaveAttachment(fileContent, token, fileHeader.Filename)
 				if err != nil {
 					sendError(w, "E! save attachment fail")

smtp/smtp.go

@@ -52,7 +52,7 @@ func GetSMTPServer(email string) (SMTPServer, error) {
 		}
 	}
 
-	return SMTPServer{}, util.SMTPServerNotFoundErr
+	return SMTPServer{}, util.ErrSMTPServerNotFound
 }
 func GetCustomSMTPServer() ([]SMTPServer, error) {
 

smtp/smtp_test.go

@@ -18,7 +18,7 @@ func TestGetSMTPServer(t *testing.T) {
 
 	fakeEmailAddress0 := "[email protected]"
 	_, err := GetSMTPServer(fakeEmailAddress0)
-	if util.SMTPServerNotFoundErr != err {
+	if util.ErrSMTPServerNotFound != err {
 		t.Error("@example.net SMTP Server exists")
 	}
 

util/boltStore.go

@@ -17,7 +17,7 @@ var (
 	ContactsBucketName = []byte("contacts")
 	SmtpBucketName     = []byte("smtp")
 	testBucketName     = []byte("test")
-	KeyNotFoundErr     = errors.New("Key Not Found")
+	ErrKeyNotFound     = errors.New("key not found")
 )
 
 type BoltStore struct {
@@ -111,7 +111,7 @@ func (b *BoltStore) Get(k, bucketName []byte) ([]byte, error) {
 	val := bucket.Get(k)
 
 	if val == nil {
-		return nil, KeyNotFoundErr
+		return nil, ErrKeyNotFound
 	}
 
 	return append([]byte{}, val...), nil

util/util.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 
@@ -27,7 +27,7 @@ var (
 	}
 	DBPath                string
 	DefaultLang           = "en"
-	SMTPServerNotFoundErr = errors.New("SMTP Server Not Found")
+	ErrSMTPServerNotFound = errors.New("SMTP server not found")
 )
 
 func init() {
@@ -49,7 +49,7 @@ func init() {
 type Msg struct {
 	Success bool        `json:"success"`
 	Message string      `json:"message"`
-	Data    interface{} `json:"data,emitempty"`
+	Data    interface{} `json:"data,omitempty"`
 }
 
 func GetHomeDir() string {
@@ -115,11 +115,12 @@ func GetContentFromStatik(name string) (string, error) {
 	}
 
 	hf, err := staticFS.Open(name)
-	defer hf.Close()
 	if err != nil {
 		return "", err
 	}
-	content, err := ioutil.ReadAll(hf)
+	defer hf.Close()
+
+	content, err := io.ReadAll(hf)
 	if err != nil {
 		return "", err
 	}