Merge remote-tracking branch 'origin/main'

gameUtils/sessionTypes.go

@@ -7,10 +7,7 @@ import (
 type Session struct {
 	SessionId string
 	GameId    string
-	Icon      string
+	Assets    GameInterfaceAssets
-	Title     string
-	Status    string
-	Version   string
 	Expires   time.Time
 	Arguments []Argument
 }
@@ -20,10 +17,8 @@ type Sessions struct {
 }
 
 type JSSessionInterface struct {
-	GameID  string    `json:"gameId"`
+	GameID    string              `json:"gameId"`
-	Icon    string    `json:"icon"`
+	SessionId string              `json:"sessionId"`
-	Title   string    `json:"title"`
+	Expires   time.Time           `json:"expires"`
-	Status  string    `json:"status"`
+	Assets    GameInterfaceAssets `json:"assets"`
-	Version string    `json:"version"`
-	Expires time.Time `json:"expires"`
 }

gameUtils/sessionUtils.go

@@ -11,16 +11,31 @@ func ConvertServerSessionsToJSON(s Session) []byte {
 	return s_json
 }
 
+func FindSessionByID(sessionId string, sessions []Session) Session {
+	for _, session := range sessions {
+		if session.SessionId == sessionId {
+			return session
+		}
+	}
+	return Session{ //TODO: Return Errors
+		SessionId: sessionId,
+		GameId:    "",
+		Assets:    GameInterfaceAssets{},
+		Expires:   time.Time{},
+		Arguments: []Argument{},
+	}
+}
+
 var FakeSessions = Sessions{
 	Sessions: []Session{
 		{
 			GameId:    "garrysmod",
 			SessionId: "gmod-test",
-			Icon:      "",
+			// Icon:      "",
-			Title:     "Regular Skirda Gmod server",
+			// Title:     "Regular Skirda Gmod server",
-			Status:    "Super fake session",
+			// Status:    "Super fake session",
-			Version:   "",
+			// Version:   "",
-			Expires:   time.Time{},
+			Expires: time.Time{},
 			Arguments: []Argument{
 				{
 					Body:  "+connect",
@@ -29,27 +44,17 @@ var FakeSessions = Sessions{
 			},
 		},
 		{
-			GameId:  "half-lide-1",
+			// GameId:  "half-lide-1",
-			Title:   "Half-Life 1 МЯСО",
+			// Title:   "Half-Life 1 МЯСО",
-			Status:  "Retro shit",
+			// Status:  "Retro shit",
 			Expires: time.Time{},
 		},
 		{
-			GameId:  "minecraft",
+			GameId: "minecraft",
-			Title:   "Test 3",
+			// Title:   "Test 3",
-			Status:  "Testing session",
+			// Status:  "Testing session",
-			Version: "1.54.7",
+			// Version: "1.54.7",
 			Expires: time.Time{},
 		},
 	},
 }
-
-func FindSessionByID(sessionId string, sessions []Session) Session {
-	for _, session := range sessions {
-		if session.SessionId == sessionId {
-			return session
-		}
-	}
-	var temp Session = Session{}
-	return temp
-}