diff --git a/gameUtils/sessionTypes.go b/gameUtils/sessionTypes.go index 7606e7c..3c454e0 100644 --- a/gameUtils/sessionTypes.go +++ b/gameUtils/sessionTypes.go @@ -7,10 +7,7 @@ import ( type Session struct { SessionId string GameId string - Icon string - Title string - Status string - Version string + Assets GameInterfaceAssets Expires time.Time Arguments []Argument } @@ -20,10 +17,8 @@ type Sessions struct { } type JSSessionInterface struct { - 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"` + GameID string `json:"gameId"` + SessionId string `json:"sessionId"` + Expires time.Time `json:"expires"` + Assets GameInterfaceAssets `json:"assets"` } diff --git a/gameUtils/sessionUtils.go b/gameUtils/sessionUtils.go index fcfd8aa..5fdd6be 100644 --- a/gameUtils/sessionUtils.go +++ b/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: "", - 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", @@ -29,27 +44,17 @@ 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 -} diff --git a/sessionUtils/sessionTypes.go b/sessionUtils/sessionTypes.go deleted file mode 100644 index f6c1ebb..0000000 --- a/sessionUtils/sessionTypes.go +++ /dev/null @@ -1,28 +0,0 @@ -package sessionUtils - -import ( - "time" - - "git.gregbrzezinski.com/Skirda/skirdagoutils/gameUtils" -) - -type Session struct { - SessionId string - GameId string - Assets gameUtils.GameInterfaceAssets - Expires time.Time - Arguments []gameUtils.Argument -} - -type Sessions struct { - Sessions []Session -} - -type JSSessionInterface struct { - 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"` -} diff --git a/sessionUtils/sessionUtils.go b/sessionUtils/sessionUtils.go deleted file mode 100644 index 382d641..0000000 --- a/sessionUtils/sessionUtils.go +++ /dev/null @@ -1,54 +0,0 @@ -package sessionUtils - -import ( - "encoding/json" -) - -func ConvertServerSessionsToJSON(s Session) []byte { - s_json, err := json.Marshal(s) - _ = err //TODO: Check Errors - return s_json -} - -// var FakeSessions = Sessions{ -// Sessions: []Session{ -// { -// GameId: "garrysmod", -// SessionId: "gmod-test", -// 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: "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", -// 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 -}