dont include hash w/ server events, fix bug where getUserInfo not resolv

This commit is contained in:
2023-07-12 21:58:01 -07:00
parent 67624bc074
commit f692b94c5c
2 changed files with 7 additions and 4 deletions

View File

@@ -51,7 +51,7 @@
_args call attendanceTracker_fnc_writeConnect; _args call attendanceTracker_fnc_writeConnect;
}, },
missionNamespace getVariable ["AttendanceTracker_" + "dbupdateintervalseconds", 300], missionNamespace getVariable ["AttendanceTracker_" + "dbupdateintervalseconds", 90],
[ [
"Server", "Server",
_playerID, _playerID,
@@ -141,7 +141,10 @@
private _playerID = _args select 1; private _playerID = _args select 1;
private _playerUID = _args select 2; private _playerUID = _args select 2;
private _userInfo = getUserInfo _playerID; private _userInfo = getUserInfo _playerID;
private _clientStateNumber = _userInfo select 6; private _clientStateNumber = 0;
if (!isNil "_userInfo" && {count _userInfo >= 7}) then {
_clientStateNumber = _userInfo select 6;
};
if (_clientStateNumber < 6) exitWith { if (_clientStateNumber < 6) exitWith {
[format ["(EventHandler) PlayerConnected: %1 (UID) is no longer connected to the mission, exiting CBA PFH", _playerID], "DEBUG"] call attendanceTracker_fnc_log; [format ["(EventHandler) PlayerConnected: %1 (UID) is no longer connected to the mission, exiting CBA PFH", _playerID], "DEBUG"] call attendanceTracker_fnc_log;
_args call attendanceTracker_fnc_writeConnect; _args call attendanceTracker_fnc_writeConnect;

View File

@@ -503,7 +503,7 @@ func writeAttendance(data string) {
db.Where("player_id = ? AND player_uid = ? AND event_type = ?", event.PlayerId, event.PlayerUID, event.EventType).Order("join_time_utc desc").First(&attendance) db.Where("player_id = ? AND player_uid = ? AND event_type = ?", event.PlayerId, event.PlayerUID, event.EventType).Order("join_time_utc desc").First(&attendance)
if attendance.ID != 0 { if attendance.ID != 0 {
// update disconnect time // update disconnect time
row := db.Model(&attendance).Update("disconnect_time_utc", attendance.DisconnectTimeUTC) row := db.Model(&attendance).Update("disconnect_time_utc", time.Now())
if row.Error != nil { if row.Error != nil {
writeLog(functionName, fmt.Sprintf(`["%s", "ERROR"]`, row.Error)) writeLog(functionName, fmt.Sprintf(`["%s", "ERROR"]`, row.Error))
return return
@@ -513,7 +513,7 @@ func writeAttendance(data string) {
} else { } else {
// insert new row // insert new row
event.JoinTimeUTC = time.Now() event.JoinTimeUTC = time.Now()
row := db.Omit("MissionID").Create(&event) row := db.Omit("MissionID").Omit("MissionHash").Create(&event)
if row.Error != nil { if row.Error != nil {
writeLog(functionName, fmt.Sprintf(`["%s", "ERROR"]`, row.Error)) writeLog(functionName, fmt.Sprintf(`["%s", "ERROR"]`, row.Error))
return return