adapt new api url

Author: Elfshot

aliveServers.go

@@ -46,7 +46,7 @@ func Init() {
 			Name:      "NY-1",
 			Id:        1,
 			CfxId:     "2epova",
-			DirectUrl: "http://server.tycoon.community:30120",
+			DirectUrl: "http://v1.api.tycoon.community/main",
 			CfxUrl:    "https://tycoon-2epova.users.cfx.re",
 			AliveUrl:  "",
 			Alive:     false,
@@ -55,8 +55,8 @@ func Init() {
 			Name:      "NY-2",
 			Id:        2,
 			CfxId:     "njyvop",
-			DirectUrl: "http://server.tycoon.community:30121",
-			CfxUrl:    "https://tycoon-njyvop.users.cfx.re",
+			DirectUrl: "http://v1.api.tycoon.community/beta",
+			CfxUrl:    "https://tycoon-njyvop.users.cfx.re/status",
 			AliveUrl:  "",
 			Alive:     false,
 		},
@@ -71,7 +71,8 @@ func Init() {
 
 func checkServers() {
 	aliveDown := 0
-	for i := range &AliveServers.Servers {
+
+	for i := len(&AliveServers.Servers) - 1; i >= 0; i-- {
 		server := &AliveServers.Servers[i]
 		aliveCheck(server)
 		if server.Alive {
@@ -87,12 +88,12 @@ func checkServers() {
 }
 
 func aliveCheck(server *serverType) {
-	first, err := GetNoParse_(server.DirectUrl + "/status/alive")
+	first, err := GetNoParse_(server.DirectUrl + "/alive")
 	if err != nil || (first.StatusCode != 200 && first.StatusCode != 204) {
-		second, err := GetNoParse_(server.CfxUrl + "/status/alive")
+		second, err := GetNoParse_(server.CfxUrl + "/alive")
 
 		if err != nil || (second.StatusCode != 200 && second.StatusCode != 204) {
-			server.AliveUrl = server.DirectUrl
+			server.AliveUrl = ""
 			server.Alive = false
 		} else {
 			server.AliveUrl = server.CfxUrl

ttRequests.go

@@ -22,7 +22,7 @@ func primaryGet(append string, struc any) (*any, error) {
 
 func Get_DataAdv(playerId uint32) (data *models.UserData, Error error) {
 	var res models.UserData
-	_, err := primaryGet(fmt.Sprintf("/status/dataadv/%d", playerId), &res)
+	_, err := primaryGet(fmt.Sprintf("/dataadv/%d", playerId), &res)
 
 	if err != nil {
 		return nil, err
@@ -32,27 +32,27 @@ func Get_DataAdv(playerId uint32) (data *models.UserData, Error error) {
 
 func Get_Players() (data *models.Players, Error error) {
 	var res models.Players
-	_, err := primaryGet("/status/players.json", &res)
+	_, err := primaryGet("/players.json", &res)
 
 	if err != nil {
 		return nil, err
 	}
 	return &res, nil
 }
 
-func Get_FxPlayers() (data *models.FxPlayers, Error error) {
-	var res models.FxPlayers
-	_, err := primaryGet("/players.json", &res)
+// func Get_FxPlayers() (data *models.FxPlayers, Error error) {
+// 	var res models.FxPlayers
+// 	_, err := primaryGet("/players.json", &res)
 
-	if err != nil {
-		return nil, err
-	}
-	return &res, nil
-}
+// 	if err != nil {
+// 		return nil, err
+// 	}
+// 	return &res, nil
+// }
 
 func Get_Sotd() (data *models.Sotd, Error error) {
 	var res models.Sotd
-	_, err := primaryGet("/status/sotd.json", &res)
+	_, err := primaryGet("/sotd.json", &res)
 
 	if err != nil {
 		return nil, err

ttRequests_test.go

@@ -9,10 +9,10 @@ func TestAdd(t *testing.T) {
 	Init()
 	data, err := Get_DataAdv(59504)
 	players, err := Get_Players()
-	fxplayers, err := Get_FxPlayers()
+	// fxplayers, err := Get_FxPlayers()
 	sotd, err := Get_Sotd()
 
-	if data == nil || players == nil || fxplayers == nil || sotd == nil {
+	if data == nil || players == nil || sotd == nil {
 		t.Error("One of the requests failed (empty response)")
 	}
 	if err != nil {