Leahnaya/wfc-server
1
0
Fork 0
mirror of https://github.com/WiiLink24/wfc-server.git synced 2026-09-14 11:35:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

QR2: Add create time to /api/groups

Browse Source
This commit is contained in:
mkwcat
2024-02-13 10:55:58 -05:00
parent fe2d7243c2
commit 467d54b765
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/groups.go
View File

@@ -21,7 +21,7 @@ func HandleGroups(w http.ResponseWriter, r *http.Request) {
return
}
groups := qr2.GetGroups(query["game"], query["id"])
groups := qr2.GetGroups(query["game"], query["id"], true)
var jsonData []byte
if len(groups) == 0 {

2
api/stats.go
View File

@@ -33,7 +33,7 @@ func HandleStats(w http.ResponseWriter, r *http.Request) {
stats := map[string]Stats{}
servers := qr2.GetSessionServers()
groups := qr2.GetGroups([]string{}, []string{})
groups := qr2.GetGroups([]string{}, []string{}, false)
globalStats := Stats{
OnlinePlayerCount: len(servers),

27
qr2/group.go
View File

@@ -4,8 +4,10 @@ import (
"encoding/base64"
"encoding/binary"
"fmt"
"sort"
"strconv"
"strings"
"time"
"wwfc/common"
"wwfc/logging"
@@ -15,6 +17,7 @@ import (
type Group struct {
GroupID uint32
GroupName string
CreateTime time.Time
GameName string
MatchType string
MKWRegion string
@@ -36,6 +39,7 @@ func processResvOK(moduleName string, matchVersion int, reservation common.Match
group = &Group{
GroupID: resvOK.GroupID,
GroupName: "",
CreateTime: time.Now(),
GameName: sender.Data["gamename"],
MatchType: sender.Data["dwc_mtype"],
MKWRegion: "",
@@ -382,12 +386,13 @@ type PlayerInfo struct {
type GroupInfo struct {
GroupName string `json:"id"`
GameName string `json:"game"`
CreateTime time.Time `json:"created"`
MatchType string `json:"type"`
Suspend bool `json:"suspend"`
ServerIndex string `json:"host,omitempty"`
MKWRegion string `json:"rk,omitempty"`
PlayersRaw map[string]map[string]string `json:"-"`
Players []PlayerInfo `json:"players"`
Players map[string]PlayerInfo `json:"players"`
}
func getGroupsRaw(gameNames []string, groupNames []string) []GroupInfo {
@@ -408,11 +413,13 @@ func getGroupsRaw(gameNames []string, groupNames []string) []GroupInfo {
groupInfo := GroupInfo{
GroupName: group.GroupName,
GameName: group.GameName,
CreateTime: group.CreateTime,
MatchType: "",
Suspend: true,
ServerIndex: "",
MKWRegion: "",
PlayersRaw: map[string]map[string]string{},
Players: map[string]PlayerInfo{},
}
if group.MatchType == "0" || group.MatchType == "1" {
@@ -456,12 +463,12 @@ func getGroupsRaw(gameNames []string, groupNames []string) []GroupInfo {
return groupsCopy
}
// GetGroups returns an unsorted copy of all online rooms
func GetGroups(gameNames []string, groupNames []string) []GroupInfo {
// GetGroups returns a copy of all online rooms
func GetGroups(gameNames []string, groupNames []string, sorted bool) []GroupInfo {
groupsCopy := getGroupsRaw(gameNames, groupNames)
for i, group := range groupsCopy {
for _, rawPlayer := range group.PlayersRaw {
for joinIndex, rawPlayer := range group.PlayersRaw {
playerInfo := PlayerInfo{
Count: rawPlayer["+localplayers"],
ProfileID: rawPlayer["dwc_pid"],
@@ -490,9 +497,19 @@ func GetGroups(gameNames []string, groupNames []string) []GroupInfo {
})
}
groupsCopy[i].Players = append(groupsCopy[i].Players, playerInfo)
groupsCopy[i].Players[joinIndex] = playerInfo
}
}
if sorted {
sort.Slice(groupsCopy, func(i, j int) bool {
if groupsCopy[i].CreateTime.Equal(groupsCopy[j].CreateTime) {
return groupsCopy[i].GroupName < groupsCopy[j].GroupName
}
return groupsCopy[i].CreateTime.Before(groupsCopy[j].CreateTime)
})
}
return groupsCopy
}