diff --git a/qr2/group.go b/qr2/group.go index 06943c3..0d0c93d 100644 --- a/qr2/group.go +++ b/qr2/group.go @@ -86,11 +86,11 @@ func processResvOK(moduleName string, matchVersion int, reservation common.Match logging.Notice(moduleName, "Created new group", aurora.Cyan(group.GroupName)) eventData := map[string]any{ - "group_id": group.GroupID, - "group_name": group.GroupName, - "game_name": group.GameName, - "match_type": group.MatchType, - "host_id": sender.Data["dwc_pid"], + "dwc_group_id": group.GroupID, + "group_name": group.GroupName, + "game_name": group.GameName, + "match_type": group.MatchType, + "host_id": sender.Data["dwc_pid"], } if group.GameName == "mariokartwii" { eventData["mario_kart_wii_region"] = group.MKWRegion @@ -115,9 +115,9 @@ func processResvOK(moduleName string, matchVersion int, reservation common.Match logging.Event( "group_joined", map[string]any{ - "group_id": group.GroupID, - "group_name": group.GroupName, - "profile_id": destination.Data["dwc_pid"], + "dwc_group_id": group.GroupID, + "group_name": group.GroupName, + "profile_id": destination.Data["dwc_pid"], }, ) @@ -376,8 +376,8 @@ func ProcessNATNEGReport(result byte, ip1 string, ip2 string) { logging.Event( "natneg_failed", map[string]any{ - "group_id": session1.groupPointer.GroupID, - "group_name": session1.groupPointer.GroupName, + "dwc_group_id": session1.groupPointer.GroupID, + "group_name": session1.groupPointer.GroupName, "peers": []map[string]string{ { "profile_id": session1.Data["dwc_pid"], @@ -396,8 +396,8 @@ func ProcessNATNEGReport(result byte, ip1 string, ip2 string) { logging.Event( "natneg_succeeded", map[string]any{ - "group_id": session1.groupPointer.GroupID, - "group_name": session1.groupPointer.GroupName, + "dwc_group_id": session1.groupPointer.GroupID, + "group_name": session1.groupPointer.GroupName, "peers": []map[string]string{ { "profile_id": session1.Data["dwc_pid"], @@ -507,8 +507,8 @@ func (g *Group) findNewServer() { } eventData := map[string]any{ - "group_id": g.GroupID, - "group_name": g.GroupName, + "dwc_group_id": g.GroupID, + "group_name": g.GroupName, } if server != nil { eventData["new_host_id"] = server.Data["dwc_pid"] diff --git a/qr2/session.go b/qr2/session.go index b14fab3..272f7e5 100644 --- a/qr2/session.go +++ b/qr2/session.go @@ -86,8 +86,8 @@ func (session *Session) removeFromGroup() { logging.Event( "group_deleted", map[string]any{ - "group_id": session.groupPointer.GroupID, - "group_name": session.groupPointer.GroupName, + "dwc_group_id": session.groupPointer.GroupID, + "group_name": session.groupPointer.GroupName, }, ) } else if session.groupPointer.server == session { @@ -108,9 +108,9 @@ func (session *Session) removeFromGroup() { logging.Event( "group_left", map[string]any{ - "group_id": session.groupPointer.GroupID, - "group_name": session.groupPointer.GroupName, - "profile_id": session.Data["dwc_pid"], + "dwc_group_id": session.groupPointer.GroupID, + "group_name": session.groupPointer.GroupName, + "profile_id": session.Data["dwc_pid"], }, )