Compare commits

...

3 Commits

Author SHA1 Message Date
c035b05b46 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	sessionUtils/sessionUtils.go
2022-11-04 02:23:38 +03:00
948e31d4e3 fake sessions and arguments in sessions 2022-11-04 02:22:51 +03:00
a8dbeb6865 new fake games 2022-11-04 02:22:01 +03:00
3 changed files with 42 additions and 49 deletions

View File

@ -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}

View File

@ -2,15 +2,18 @@ package sessionUtils
import (
"time"
"git.gregbrzezinski.com/Skirda/skirdaGoBackend/skirdagoutils/gameUtils"
)
type Session struct {
GameId string
Icon string
Title string
Status string
Version string
Expires time.Time
GameId string
Icon string
Title string
Status string
Version string
Expires time.Time
Arguments []gameUtils.Argument
}
type Sessions struct {

View File

@ -3,6 +3,8 @@ package sessionUtils
import (
"encoding/json"
"time"
"git.gregbrzezinski.com/Skirda/skirdaGoBackend/skirdagoutils/gameUtils"
)
func ConvertServerSessionsToJSON(s Session) []byte {
@ -11,26 +13,32 @@ func ConvertServerSessionsToJSON(s Session) []byte {
return s_json
}
var FakeSessions = Sessions{
Sessions: []Session{
{
GameId: "garrysmod",
Title: "Test 1",
Status: "Super fake session",
Expires: time.Time{},
},
{
GameId: "beamng",
Title: "Test 2",
Status: "Super fake session 2",
Expires: time.Time{},
},
{
GameId: "minecraft",
Title: "Test 3",
Status: "Testing session",
Version: "1.54.7",
Expires: time.Time{},
var FakeSessions = []Session{
{
GameId: "garrysmod",
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{},
},
}