diff --git a/nex/ranking/database/store_user_match_result.go b/nex/ranking/database/store_user_match_result.go index 271fcc1..5cf1f3d 100644 --- a/nex/ranking/database/store_user_match_result.go +++ b/nex/ranking/database/store_user_match_result.go @@ -16,7 +16,7 @@ func StoreUserMatchResult(userPID types.PID, data ranking_splatoon_types.Competi team_id, team_score ) VALUES ($1, $2, $3, $4, $5) - `, int64(userPID), int64(data.SplatfestId), int64(data.Score), int16(data.TeamId), int64(data.TeamScore)) + `, int64(userPID), int64(data.SplatfestId), int64(data.Score), int16(data.TeamID), int64(data.TeamScore)) if err != nil { return err diff --git a/nex/ranking/get_competition_ranking_score.go b/nex/ranking/get_competition_ranking_score.go index 05cafa9..49893dd 100644 --- a/nex/ranking/get_competition_ranking_score.go +++ b/nex/ranking/get_competition_ranking_score.go @@ -14,7 +14,7 @@ func GetSingleCompetitionRankingScore(splatfestID uint32) (ranking_splatoon_type var err error info := ranking_splatoon_types.NewCompetitionRankingScoreInfo() - info.FestId = types.UInt32(splatfestID) + info.FestID = types.UInt32(splatfestID) team_wins, team_votes, err := database.GetVoteAndWinCount(splatfestID) diff --git a/nex/ranking/types/competition_ranking_score_info.go b/nex/ranking/types/competition_ranking_score_info.go index b0c6de1..64c86dc 100644 --- a/nex/ranking/types/competition_ranking_score_info.go +++ b/nex/ranking/types/competition_ranking_score_info.go @@ -11,7 +11,7 @@ import ( // CompetitionRankingScoreInfo is a type within the Ranking protocol type CompetitionRankingScoreInfo struct { types.Structure - FestId types.UInt32 + FestID types.UInt32 ScoreData types.List[CompetitionRankingScoreData] Unknown types.UInt32 TeamWins types.List[types.UInt32] @@ -22,7 +22,7 @@ type CompetitionRankingScoreInfo struct { func (crsi CompetitionRankingScoreInfo) WriteTo(writable types.Writable) { contentWritable := writable.CopyNew() - crsi.FestId.WriteTo(contentWritable) + crsi.FestID.WriteTo(contentWritable) crsi.ScoreData.WriteTo(contentWritable) crsi.Unknown.WriteTo(contentWritable) crsi.TeamWins.WriteTo(contentWritable) @@ -41,7 +41,7 @@ func (crsi CompetitionRankingScoreInfo) ExtractFrom(readable types.Readable) err return fmt.Errorf("failed to extract CompetitionRankingScoreInfo header. %s", err.Error()) } - if err := crsi.FestId.ExtractFrom(readable); err != nil { + if err := crsi.FestID.ExtractFrom(readable); err != nil { return fmt.Errorf("failed to extract CompetitionRankingScoreInfo.FestId. %s", err.Error()) } @@ -69,7 +69,7 @@ func (crsi CompetitionRankingScoreInfo) Copy() types.RVType { copied := NewCompetitionRankingScoreInfo() copied.StructureVersion = crsi.StructureVersion - copied.FestId = crsi.FestId.Copy().(types.UInt32) + copied.FestID = crsi.FestID.Copy().(types.UInt32) copied.ScoreData = crsi.ScoreData.Copy().(types.List[CompetitionRankingScoreData]) copied.Unknown = crsi.Unknown.Copy().(types.UInt32) copied.TeamWins = crsi.TeamWins.Copy().(types.List[types.UInt32]) @@ -90,7 +90,7 @@ func (crsi CompetitionRankingScoreInfo) Equals(o types.RVType) bool { return false } - if !crsi.FestId.Equals(other.FestId) { + if !crsi.FestID.Equals(other.FestID) { return false } @@ -140,7 +140,7 @@ func (crsi CompetitionRankingScoreInfo) FormatToString(indentationLevel int) str var b strings.Builder b.WriteString("CompetitionRankingScoreInfo{\n") - fmt.Fprintf(&b, "%sFestId: %s,\n", indentationValues, crsi.FestId) + fmt.Fprintf(&b, "%sFestId: %s,\n", indentationValues, crsi.FestID) fmt.Fprintf(&b, "%sScoreData: %s,\n", indentationValues, crsi.ScoreData) fmt.Fprintf(&b, "%sUnknown: %s,\n", indentationValues, crsi.Unknown) fmt.Fprintf(&b, "%sTeamWins: %s,\n", indentationValues, crsi.TeamWins) @@ -153,7 +153,7 @@ func (crsi CompetitionRankingScoreInfo) FormatToString(indentationLevel int) str // NewCompetitionRankingScoreInfo returns a new CompetitionRankingScoreInfo func NewCompetitionRankingScoreInfo() CompetitionRankingScoreInfo { return CompetitionRankingScoreInfo{ - FestId: types.NewUInt32(0), + FestID: types.NewUInt32(0), ScoreData: types.NewList[CompetitionRankingScoreData](), Unknown: types.NewUInt32(0), TeamWins: types.NewList[types.UInt32](), diff --git a/nex/ranking/types/competition_ranking_upload_score_param.go b/nex/ranking/types/competition_ranking_upload_score_param.go index c0e52ed..60dfa98 100644 --- a/nex/ranking/types/competition_ranking_upload_score_param.go +++ b/nex/ranking/types/competition_ranking_upload_score_param.go @@ -15,7 +15,7 @@ type CompetitionRankingUploadScoreParam struct { SplatfestId types.UInt32 Unknown2 types.UInt32 Score types.UInt32 - TeamId types.UInt8 + TeamID types.UInt8 TeamScore types.UInt32 IsFirstUpload types.Bool AppData types.QBuffer @@ -29,7 +29,7 @@ func (crusp CompetitionRankingUploadScoreParam) WriteTo(writable types.Writable) crusp.SplatfestId.WriteTo(contentWritable) crusp.Unknown2.WriteTo(contentWritable) crusp.Score.WriteTo(contentWritable) - crusp.TeamId.WriteTo(contentWritable) + crusp.TeamID.WriteTo(contentWritable) crusp.TeamScore.WriteTo(contentWritable) crusp.IsFirstUpload.WriteTo(contentWritable) crusp.AppData.WriteTo(contentWritable) @@ -59,7 +59,7 @@ func (crusp CompetitionRankingUploadScoreParam) ExtractFrom(readable types.Reada if err := crusp.Score.ExtractFrom(readable); err != nil { return fmt.Errorf("failed to extract CompetitionRankingUploadScoreParam.Score. %s", err.Error()) } - if err := crusp.TeamId.ExtractFrom(readable); err != nil { + if err := crusp.TeamID.ExtractFrom(readable); err != nil { return fmt.Errorf("failed to extract CompetitionRankingUploadScoreParam.TeamId. %s", err.Error()) } if err := crusp.TeamScore.ExtractFrom(readable); err != nil { @@ -84,7 +84,7 @@ func (crusp CompetitionRankingUploadScoreParam) Copy() types.RVType { copied.SplatfestId = crusp.SplatfestId.Copy().(types.UInt32) copied.Unknown2 = crusp.Unknown2.Copy().(types.UInt32) copied.Score = crusp.Score.Copy().(types.UInt32) - copied.TeamId = crusp.TeamId.Copy().(types.UInt8) + copied.TeamID = crusp.TeamID.Copy().(types.UInt8) copied.TeamScore = crusp.TeamScore.Copy().(types.UInt32) copied.IsFirstUpload = crusp.IsFirstUpload.Copy().(types.Bool) copied.AppData = crusp.AppData.Copy().(types.QBuffer) @@ -116,7 +116,7 @@ func (crusp CompetitionRankingUploadScoreParam) Equals(o types.RVType) bool { if !crusp.Score.Equals(other.Score) { return false } - if !crusp.TeamId.Equals(other.TeamId) { + if !crusp.TeamID.Equals(other.TeamID) { return false } if !crusp.TeamScore.Equals(other.TeamScore) { @@ -160,7 +160,7 @@ func (crusp CompetitionRankingUploadScoreParam) FormatToString(indentationLevel fmt.Fprintf(&b, "%sSplatfestId: %s,\n", indentationValues, crusp.SplatfestId) fmt.Fprintf(&b, "%sUnknown2: %s,\n", indentationValues, crusp.Unknown2) fmt.Fprintf(&b, "%sScore: %s,\n", indentationValues, crusp.Score) - fmt.Fprintf(&b, "%sTeamId: %s,\n", indentationValues, crusp.TeamId) + fmt.Fprintf(&b, "%sTeamId: %s,\n", indentationValues, crusp.TeamID) fmt.Fprintf(&b, "%TeamScore: %s,\n", indentationValues, crusp.TeamScore) fmt.Fprintf(&b, "%sIsFirstUpload: %s,\n", indentationValues, crusp.IsFirstUpload) fmt.Fprintf(&b, "%sAppData: %s,\n", indentationValues, crusp.AppData) @@ -176,7 +176,7 @@ func NewCompetitionRankingUploadScoreParam() CompetitionRankingUploadScoreParam SplatfestId: types.NewUInt32(0), Unknown2: types.NewUInt32(0), Score: types.NewUInt32(0), - TeamId: types.NewUInt8(0), + TeamID: types.NewUInt8(0), TeamScore: types.NewUInt32(0), IsFirstUpload: types.NewBool(false), AppData: types.NewQBuffer([]byte{}),