tweak: small changes

tabarra · Jan 13, 2024 · a51bd05 · a51bd05
1 parent 52a857a
commit a51bd05
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/nui/src/hooks/useExitListener.tsx b/nui/src/hooks/useExitListener.tsx
@@ -22,6 +22,7 @@ export const useExitListener = () => {
 
         setVisible(false);
         fetchNui("closeMenu");
+        fetchNui("playSound", "enter");
       }
     };
 

diff --git a/nui/src/hooks/useNuiListenersService.tsx b/nui/src/hooks/useNuiListenersService.tsx
@@ -27,6 +27,6 @@ export const useNuiListenerService = () => {
   useNuiEvent<ServerCtx>("setServerCtx", setServerCtxState);
   useNuiEvent<txAdminMenuPage>("setMenuPage", setMenuPage);
   useNuiEvent("resetSession", ()=>{
-    fetchWebPipe<string>("/resetSession").catch();
+    fetchWebPipe<string>("/nui/resetSession").catch();
   });
 };
diff --git a/panel/src/layout/playerModal/HistoryTab.tsx b/panel/src/layout/playerModal/HistoryTab.tsx
@@ -34,10 +34,10 @@ function HistoryItem({ action, permsDisableWarn, permsDisableBan, serverTime, do
     if (action.revokedBy) {
         borderColorClass = '';
         const revocationDate = tsToLocaleDateTime(action.revokedAt ?? 0, 'medium', 'short');
-        footerNote = `Revoked by ${action.revokedBy} in ${revocationDate}.`;
+        footerNote = `Revoked by ${action.revokedBy} on ${revocationDate}.`;
     } else if (typeof action.exp === 'number') {
         const expirationDate = tsToLocaleDateTime(action.exp, 'medium', 'short');
-        footerNote = (action.exp < serverTime) ? `Expired in ${expirationDate}.` : `Expires in ${expirationDate}.`;
+        footerNote = (action.exp < serverTime) ? `Expired on ${expirationDate}.` : `Expires in ${expirationDate}.`;
     }
 
     return (

diff --git a/resource/menu/client/cl_base.lua b/resource/menu/client/cl_base.lua
@@ -176,6 +176,7 @@ RegisterSecureNuiCallback('closeMenu', function(_, cb)
   debugPrint('Releasing all NUI Focus')
   SetNuiFocus(false)
   SetNuiFocusKeepInput(false)
+  playLibrarySound('enter')
   cb({})
 end)
 
@@ -200,9 +201,9 @@ RegisterNetEvent('txcl:heal', function()
   ClearPedBloodDamage(ped)
   RestorePlayerStamina(PlayerId(), 100.0)
   if IS_REDM then
-    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 0, 100)   -- SetAttributeCoreValue
-    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 1, 100)   -- SetAttributeCoreValue
-    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 2, 100)   -- SetAttributeCoreValue
+    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 0, 100) -- SetAttributeCoreValue
+    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 1, 100) -- SetAttributeCoreValue
+    Citizen.InvokeNative(0xC6258F41D86676E0, ped, 2, 100) -- SetAttributeCoreValue
   end
 end)
 

diff --git a/resource/menu/client/cl_webpipe.lua b/resource/menu/client/cl_webpipe.lua
@@ -47,6 +47,7 @@ RegisterRawNuiCallback('WebPipe', function(req, cb)
     end
 
     -- Cookie wiper to prevent sticky cookie sessions after reauth
+    -- FIXME: deprecate this path?!
     if path == '/nui/resetSession' then
         if type(headers['Cookie']) ~= 'string' then
             return cb({
@@ -55,8 +56,8 @@ RegisterRawNuiCallback('WebPipe', function(req, cb)
             })
         else
             local cookies = {}
-            for cookie in headers['Cookie']:gmatch('(tx:[^=]+)') do 
-                cookies[#cookies +1] = cookie.."=deleted; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT; httponly; SameSite=None; Secure"
+            for cookie in headers['Cookie']:gmatch('(tx:[^=]+)') do
+                cookies[#cookies + 1] = cookie .. "=deleted; path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT; httponly; SameSite=None; Secure"
             end
             return cb({
                 status = 200,