Compare commits

...

2 Commits

Author SHA1 Message Date
e0905ef578 Merge remote-tracking branch 'origin/main' 2022-11-11 15:30:18 +03:00
4319b1e1b3 fix sessions 2022-11-11 15:30:08 +03:00
2 changed files with 32 additions and 32 deletions

View File

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

View File

@ -11,15 +11,30 @@ func ConvertServerSessionsToJSON(s Session) []byte {
return s_json 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{ var FakeSessions = Sessions{
Sessions: []Session{ Sessions: []Session{
{ {
GameId: "garrysmod", GameId: "garrysmod",
SessionId: "gmod-test", 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{ Arguments: []Argument{
{ {
@ -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{}, 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{}, 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
}