gameUtils/sessionTypes.go

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

gameUtils/sessionUtils.go

@@ -11,31 +11,16 @@ 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:      "",
-			// Title:     "Regular Skirda Gmod server",
-			// Status:    "Super fake session",
-			// Version:   "",
-			Expires: time.Time{},
+			Icon:      "",
+			Title:     "Regular Skirda Gmod server",
+			Status:    "Super fake session",
+			Version:   "",
+			Expires:   time.Time{},
 			Arguments: []Argument{
 				{
 					Body:  "+connect",
@@ -44,17 +29,27 @@ var FakeSessions = Sessions{
 			},
 		},
 		{
-			// GameId:  "half-lide-1",
-			// Title:   "Half-Life 1 МЯСО",
-			// Status:  "Retro shit",
+			GameId:  "half-lide-1",
+			Title:   "Half-Life 1 МЯСО",
+			Status:  "Retro shit",
 			Expires: time.Time{},
 		},
 		{
-			GameId: "minecraft",
-			// Title:   "Test 3",
-			// Status:  "Testing session",
-			// Version: "1.54.7",
+			GameId:  "minecraft",
+			Title:   "Test 3",
+			Status:  "Testing session",
+			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
+}