refactor: refactor package telegram

totanvix · Jul 5, 2023 · 726bfad · 726bfad
1 parent 7be9135
commit 726bfad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/utils/bot/bot.go b/utils/bot/bot.go
@@ -59,7 +59,7 @@ func (b Bot) setTypingAction() {
 
 	log.Printf("Yêu cầu từ bạn %s: %s", data.FirstName, rawMessage)
 
-	err := telegram.SetTypingAction(data)
+	err := b.Telegram.SetTypingAction(data)
 
 	defer func() {
 		b.rCh <- rChannel{err: err}
@@ -195,5 +195,5 @@ func (b Bot) getFirstName() string {
 }
 
 func (b Bot) getBotCommands() (*structs.BotCommands, error) {
-	return telegram.GetBotCommands()
+	return b.Telegram.GetBotCommands()
 }
diff --git a/utils/telegram/telegram.go b/utils/telegram/telegram.go
@@ -110,8 +110,7 @@ func (t Telegram) SendPhoto(data structs.DataTele, path string) error {
 	req, _ := http.NewRequest("GET", url, payload)
 	req.Header.Set("Content-Type", writer.FormDataContentType())
 
-	client := &http.Client{}
-	res, err := client.Do(req)
+	res, err := t.client.Do(req)
 	if err != nil {
 		return err
 	}
@@ -164,9 +163,7 @@ func (t Telegram) SendMessageWithReplyMarkup(data structs.DataTele, replyMark []
 
 	req.URL.RawQuery = q.Encode()
 
-	client := &http.Client{}
-
-	res, err := client.Do(req)
+	res, err := t.client.Do(req)
 	if err != nil {
 		return err
 	}
@@ -192,7 +189,7 @@ func (t Telegram) SendMessageWithReplyMarkup(data structs.DataTele, replyMark []
 	return errors.New(string(body))
 }
 
-func SetTypingAction(data structs.DataTele) error {
+func (t Telegram) SetTypingAction(data structs.DataTele) error {
 	chatId := data.ChatId
 
 	url := getApiURL("sendChatAction")
@@ -207,18 +204,14 @@ func SetTypingAction(data structs.DataTele) error {
 
 	req.URL.RawQuery = q.Encode()
 
-	client := &http.Client{}
-
-	res, err := client.Do(req)
-
+	res, err := t.client.Do(req)
 	if err != nil {
 		return err
 	}
 
 	defer res.Body.Close()
 
 	body, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return err
 	}
@@ -230,26 +223,22 @@ func SetTypingAction(data structs.DataTele) error {
 	return nil
 }
 
-func GetBotCommands() (*structs.BotCommands, error) {
+func (t Telegram) GetBotCommands() (*structs.BotCommands, error) {
 	url := getApiURL("getMyCommands")
 	req, err := http.NewRequest("GET", url, nil)
 
 	if err != nil {
 		return nil, err
 	}
 
-	client := &http.Client{}
-
-	res, err := client.Do(req)
-
+	res, err := t.client.Do(req)
 	if err != nil {
 		return nil, err
 	}
 
 	defer res.Body.Close()
 
 	body, err := ioutil.ReadAll(res.Body)
-
 	if err != nil {
 		return nil, err
 	}