Merge pull request #13 from VATUSA/raaj

remove deprecated func & better error logging
VATUSA · Jun 25, 2024 · 744bb6f · 744bb6f
2 parents 544742a + fdfb772
commit 744bb6f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/internal/api/controller.go b/internal/api/controller.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 )
 
 type ControllerDataWrapper struct {
@@ -43,9 +43,9 @@ func GetControllerData(discordId string) (*ControllerData, error) {
 		return nil, nil
 	}
 	if response.StatusCode != 200 {
-		return nil, errors.New("HTTP Error when fetching controller data")
+		return nil, errors.New(fmt.Sprintf("HTTP Error when fetching controller data: %d", response.StatusCode))
 	}
-	responseData, err := ioutil.ReadAll(response.Body)
+	responseData, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/api/facility.go b/internal/api/facility.go
@@ -3,7 +3,8 @@ package api
 import (
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"fmt"
+	"io"
 )
 
 type FacilityData struct {
@@ -30,9 +31,9 @@ func GetFacilities() ([]FacilityData, error) {
 		return nil, nil
 	}
 	if response.StatusCode != 200 {
-		return nil, errors.New("HTTP Error when fetching facility data")
+		return nil, errors.New(fmt.Sprintf("HTTP Error when fetching facility data: %d", response.StatusCode))
 	}
-	responseData, err := ioutil.ReadAll(response.Body)
+	responseData, err := io.ReadAll(response.Body)
 	if err != nil {
 		return nil, err
 	}

diff --git a/internal/bot/server.go b/internal/bot/server.go
@@ -6,7 +6,6 @@ import (
 	"github.com/VATUSA/discord-bot-v3/internal/config"
 	"github.com/VATUSA/discord-bot-v3/pkg/constants"
 	"gopkg.in/yaml.v3"
-	"io/ioutil"
 	"log"
 	"os"
 	"time"
@@ -68,7 +67,7 @@ func LoadAllServerConfig(configPath string) (map[string]ServerConfig, error) {
 }
 
 func LoadServerConfig(configPath string) (*ServerConfig, error) {
-	data, err := ioutil.ReadFile(configPath)
+	data, err := os.ReadFile(configPath)
 	if err != nil {
 		return nil, err
 	}