From e1a86e73175f8b8fd8a644559b6877c660564793 Mon Sep 17 00:00:00 2001
From: tabarra <tabarra@vexguard.net>
Date: Tue, 9 May 2023 20:02:46 -0300
Subject: [PATCH] fix(core): added playerIds/playerHwids into events

---
 core/webroutes/databaseActions.ts | 4 +++-
 core/webroutes/player/actions.ts  | 1 +
 docs/dev_notes.md                 | 2 ++
 docs/events.md                    | 2 ++
 fxmanifest.lua                    | 2 +-
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/webroutes/databaseActions.ts b/core/webroutes/databaseActions.ts
index aad423444..7a74d90e5 100644
--- a/core/webroutes/databaseActions.ts
+++ b/core/webroutes/databaseActions.ts
@@ -131,6 +131,7 @@ async function handleBandIds(ctx: Context, sess: any): Promise<GenericApiResp> {
             durationTranslated,
             targetNetId: null,
             targetIds: identifiers,
+            targetHwids: [],
             targetName: 'identifiers',
             kickMessage,
         });
@@ -179,7 +180,8 @@ async function handleRevokeAction(ctx: Context, sess: any): Promise<GenericApiRe
             actionReason: action.reason,
             actionAuthor: action.author,
             playerName: action.playerName,
-            playerIds: action.identifiers,
+            playerIds: action.ids,
+            playerHwids: action.hwids ?? [],
             revokedBy: sess.auth.username,
         });
     } catch (error) { }
diff --git a/core/webroutes/player/actions.ts b/core/webroutes/player/actions.ts
index 148efe358..b93bf09db 100644
--- a/core/webroutes/player/actions.ts
+++ b/core/webroutes/player/actions.ts
@@ -225,6 +225,7 @@ async function handleBan(ctx: Context, sess: any, player: PlayerClass): Promise<
         durationTranslated,
         targetNetId: (player instanceof ServerPlayer) ? player.netid : null,
         targetIds: player.ids,
+        targetHwids: player.hwids,
         targetName: player.displayName,
         kickMessage,
     });
diff --git a/docs/dev_notes.md b/docs/dev_notes.md
index 0eae8c4f4..807a82e20 100644
--- a/docs/dev_notes.md
+++ b/docs/dev_notes.md
@@ -97,6 +97,8 @@
     - [x] find out where that .replxx_history is comming from
 
 > beta release
+- [x] fix system log page font fallback
+- [x] fix playerBanned and actionRevoked events playerIds and add playerHwids
 - [ ] Update discord.js... AGAIN!
 - [ ] inject consts isZapHosting and isPterodactyl in ctxUtil
 - [ ] stats: 
diff --git a/docs/events.md b/docs/events.md
index 4e8d2e69f..5b425ab33 100644
--- a/docs/events.md
+++ b/docs/events.md
@@ -61,6 +61,7 @@ Event Data:
 - `durationTranslated`: xxx or `null`. Added in v5.0.
 - `targetNetId`: The netid of the player that was banned, or `null` if a ban was applied to identifiers only. Added in v5.0.
 - `targetIds`: The identifiers that were banned. Added in v5.0.
+- `targetHwids`: The hardware identifiers that were banned. Might be an empty array. Added in v6.0.
 - `targetName`: The clean name of the banned player, or `identifiers` if ban was applied to ids only (legacy ban). Added in v5.0.
 - `kickMessage`: The message to show the player as a kick reason. Added in v5.0.
 
@@ -111,6 +112,7 @@ Event Data:
 - `actionAuthor`: The name of the admin that issued the action.
 - `playerName`: name of the player that received the action, or `false` if doesn't apply.
 - `playerIds`: Array containing all identifiers (ex. license, discord, etc.) this action applied to.
+- `playerHwids`: Array containing all hardware ID tokens this action applied to. Might be an empty array. Added in v6.0.
 - `revokedBy`: The name of the admin that revoked the action.
 
 ## txAdmin:events:skippedNextScheduledRestart (v5.2)
diff --git a/fxmanifest.lua b/fxmanifest.lua
index 910a48f9c..3c566ad25 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -5,7 +5,7 @@
 author 'Tabarra'
 description 'Remotely Manage & Monitor your GTA5 FiveM Server'
 repository 'https://github.com/tabarra/txAdmin'
-version '6.0.0-beta1'
+version '6.0.0-beta2'
 ui_label 'txAdmin'
 
 rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.'