diff --git a/gameUtils/fakeGames.go b/gameUtils/fakeGames.go index 49df69b..28ffbd8 100644 --- a/gameUtils/fakeGames.go +++ b/gameUtils/fakeGames.go @@ -3,12 +3,7 @@ package gameUtils var garrysmodGame = SteamGame{ GameId: "garrysmod", SteamId: "4000", - Args: []Argument{ - Argument{ - Body: "+connect", - Value: "127.0.0.1:27015", - }, - }, + Args: []Argument{}, Platforms: map[string]bool{ "linux": true, "windows": true, @@ -21,10 +16,9 @@ var garrysmodGame = SteamGame{ } var openarena = SteamGame{ - GameId: "openarena", - SteamId: "", - //Executable: "/usr/games/openarena", - //Args: []string{}, + GameId: "half-life-1", + SteamId: "70", + Args: []Argument{}, Assets: GameInterfaceAssets{ Title: "Open Arena", Icon: "icon.png", @@ -32,16 +26,4 @@ var openarena = SteamGame{ }, } -var minecraft = SteamGame{ - GameId: "minecraft", - SteamId: "", - //Args: []string{}, - Assets: GameInterfaceAssets{ - Title: "Minecraft", - Icon: "icon.png", - Description: "Minecraft Game", - }, - Platforms: map[string]bool{}, -} - -var SteamFakeGamesList = []SteamGame{garrysmodGame, openarena, minecraft} +var SteamFakeGamesList = []SteamGame{garrysmodGame, openarena} diff --git a/sessionUtils/sessionTypes.go b/sessionUtils/sessionTypes.go index c9ebd85..eac1896 100644 --- a/sessionUtils/sessionTypes.go +++ b/sessionUtils/sessionTypes.go @@ -2,6 +2,8 @@ package sessionUtils import ( "time" + + "git.gregbrzezinski.com/Skirda/skirdaGoBackend/skirdagoutils/gameUtils" ) type Session struct { @@ -12,6 +14,7 @@ type Session struct { Status string Version string Expires time.Time + Arguments []gameUtils.Argument } type Sessions struct { diff --git a/sessionUtils/sessionUtils.go b/sessionUtils/sessionUtils.go index 99639c4..aefb32a 100644 --- a/sessionUtils/sessionUtils.go +++ b/sessionUtils/sessionUtils.go @@ -3,6 +3,8 @@ package sessionUtils import ( "encoding/json" "time" + + "git.gregbrzezinski.com/Skirda/skirdaGoBackend/skirdagoutils/gameUtils" ) func ConvertServerSessionsToJSON(s Session) []byte { @@ -15,14 +17,22 @@ var FakeSessions = Sessions{ Sessions: []Session{ { GameId: "garrysmod", - Title: "Test 1", + Icon: "", + Title: "Regular Skirda Gmod server", Status: "Super fake session", + Version: "", Expires: time.Time{}, + Arguments: []gameUtils.Argument{ + { + Body: "+connect", + Value: "127.0.0.1:27015", + }, + }, }, { - GameId: "beamng", - Title: "Test 2", - Status: "Super fake session 2", + GameId: "half-lide-1", + Title: "Half-Life 1 МЯСО", + Status: "Retro shit", Expires: time.Time{}, }, {