refactor: refactor func get commands

totanvix · Jul 3, 2023 · 6fc7837 · 6fc7837
1 parent 470c5b5
commit 6fc7837
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/utils/bot/bot.go b/utils/bot/bot.go
@@ -211,7 +211,11 @@ func (b Bot) sendStartMessage(data structs.DataTele) error {
 
 func (b Bot) sendHelpMessage(data structs.DataTele) error {
 	messages := ""
-	botCommands := b.getBotCommands()
+	botCommands, err := b.getBotCommands()
+
+	if err != nil {
+		return err
+	}
 
 	for _, command := range botCommands.Result {
 		messages += fmt.Sprintf("<code>/%s</code> - %s\n\n", command.Command, command.Description)
@@ -222,7 +226,7 @@ func (b Bot) sendHelpMessage(data structs.DataTele) error {
 	return telegram.SendMessage(data)
 }
 
-func (b Bot) getBotCommands() structs.BotCommands {
+func (b Bot) getBotCommands() (*structs.BotCommands, error) {
 	return telegram.GetBotCommands()
 }
 

diff --git a/utils/middleware/index.go b/utils/middleware/index.go
@@ -17,7 +17,8 @@ func Recoverer(next http.Handler) http.Handler {
 				w.WriteHeader(http.StatusOK)
 
 				resp["status"] = "ERROR"
-				resp["message"] = rvr.(string)
+				resp["code"] = "internal_error"
+				resp["message"] = "Something went wrong"
 				jsonResp, _ := json.Marshal(resp)
 
 				logEntry := middleware.GetLogEntry(r)

diff --git a/utils/telegram/telegram.go b/utils/telegram/telegram.go
@@ -226,41 +226,42 @@ func SetTypingAction(data structs.DataTele) error {
 	return nil
 }
 
-func GetBotCommands() structs.BotCommands {
+func GetBotCommands() (*structs.BotCommands, error) {
 	url := getApiURL("getMyCommands")
 	req, err := http.NewRequest("GET", url, nil)
 
 	if err != nil {
-		log.Panic(err)
+		return nil, err
 	}
 
 	client := &http.Client{}
 
 	res, err := client.Do(req)
 
 	if err != nil {
-		log.Panic(err)
+		return nil, err
 	}
 
 	defer res.Body.Close()
 
 	body, err := ioutil.ReadAll(res.Body)
 
 	if err != nil {
-		log.Panic(err)
+		return nil, err
 	}
 
 	var botCommands structs.BotCommands
 
 	err = json.Unmarshal(body, &botCommands)
 	if err != nil {
-		log.Panic(err)
+		return nil, err
 	}
 
-	if botCommands.Ok == false {
-		log.Fatalln(string(body))
+	if botCommands.Ok {
+		log.Println("GetBotCommands OK")
+
+		return &botCommands, nil
 	}
 
-	log.Println("GetBotCommands OK")
-	return botCommands
+	return nil, errors.New(string(body))
 }