wip: fix type in playerDatabase.registerAction

tabarra · Oct 18, 2023 · 3dc54e7 · 3dc54e7
1 parent 7731ecb
commit 3dc54e7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/core/extras/helpers.ts b/core/extras/helpers.ts
@@ -81,7 +81,7 @@ export const calcExpirationFromDuration = (inputDuration: string) => {
     let expiration;
     let duration;
     if (inputDuration === 'permanent') {
-        expiration = false;
+        expiration = false as const;
     } else {
         const [multiplierInput, unit] = inputDuration.split(/\s+/);
         const multiplier = parseInt(multiplierInput);

diff --git a/core/webroutes/databaseActions.ts b/core/webroutes/databaseActions.ts
@@ -87,8 +87,14 @@ async function handleBandIds(ctx: AuthedCtx): Promise<GenericApiResp> {
     //Register action
     let actionId;
     try {
-        //FIXME: this type has some issue
-        actionId = ctx.txAdmin.playerDatabase.registerAction(identifiers, 'ban', ctx.admin.name, reason, expiration, false);
+        actionId = ctx.txAdmin.playerDatabase.registerAction(
+            identifiers,
+            'ban',
+            ctx.admin.name,
+            reason,
+            expiration,
+            false
+        );
     } catch (error) {
         return { error: `Failed to ban identifiers: ${(error as Error).message}` };
     }

diff --git a/core/webroutes/player/actions.ts b/core/webroutes/player/actions.ts
@@ -183,7 +183,7 @@ async function handleBan(ctx: AuthedCtx, player: PlayerClass): Promise<GenericAp
             expiration,
             player.displayName,
             allHwids
-        ); //FIXME: expiration
+        );
     } catch (error) {
         return { error: `Failed to ban player: ${(error as Error).message}` };
     }

diff --git a/docs/dev_notes.md b/docs/dev_notes.md
@@ -12,7 +12,7 @@ Processo:
 - [x] aplicar novo tipo e trocar todos os ctx.session e ctx.utils.xxxxx de todas as rotas
 - [x] remove all `globals.` in the webroutes folder from typescript files
 - [x] test and commit all changed files
-- [ ] check `playerDatabase.registerAction` expiration type error
+- [x] check `playerDatabase.registerAction` expiration type error
 - [ ] translation fix the `The player was xxxxx` lines in all files
 - [ ] renomear csrfToken e forumUsername pra snake case, mas no AuthedAdmin pode ficar tudo como camel
     - sim, colocar o csrfToken pra dentro do admin, e tb editar o preAuth
@@ -21,20 +21,6 @@ Processo:
 - [ ] escrever teste automatizado pros authMiddlewares e authLogic
 
 
-Ainda preciso do shared/sessionTypes.ts ?
-
-
-Retest:
-- auth legacy
-- auth auth intercom
-- auth admin (menu opens?)
-    - razão de não abrir o menu, admin_not_found
-- auth of old menu /nui/ get/action routes (player info, revoke action, ban)
-- menu iframe, iframe start
-- auth socketio
-
-
-
 =======================================================================
 
 ### v7 Menus: