Fixed some files

src/utils/ids.ts

@@ -23,21 +23,20 @@ module.exports = {
   Load: Load,
 }
 
-const utils = require('../utils/utils.js')
-const logger = require('../utils/logger.js')
+import utils from '../utils/utils.js'
+import logger from '../utils/logger.js'
 const idStatFile = 'stats/idstats'
 const idVStatFile = 'stats/idvstats'
 
 const writeInterval = 1
 
-let data = {}
-let vData = {}
+let idStatsData = {}
+let idvStatsData = {}
 let writes = 0
 
 function Load() {
   try {
-    var prevData = utils.ReadFile(idStatFile)
-    data = JSON.parse(prevData)
+    idStatsData = utils.ReadJSON(idStatFile)
   } catch (err) {
     logger.Log(
       'Error at loading id logs! (@ first run its normal)',
@@ -47,8 +46,8 @@ function Load() {
   }
 
   try {
-    var prevVData = utils.ReadFile(idVStatFile)
-    vData = JSON.parse(prevVData)
+    const prevVData = utils.ReadFile(idVStatFile)
+    idvStatsData = JSON.parse(prevVData)
   } catch (err) {
     logger.Log(
       'Error at loading id logs! (@ first run its normal)',
@@ -58,71 +57,86 @@ function Load() {
   }
 }
 
-function LogId(id, subj, newQuestions, allQuestions) {
+function LogId(
+  id: number,
+  subj: string,
+  newQuestions: number,
+  allQuestions: number
+) {
   Inc(id, subj, newQuestions, allQuestions)
   AddVisitStat(id, subj, newQuestions, allQuestions)
   Save()
 }
 
-function AddSubjToList(list, subj) {
+function AddSubjToList(list: Array<string>, subj: string) {
   if (!list[subj]) {
     list[subj] = 0
   }
   list[subj]++
 }
 
-function Inc(value, subj, newQuestions, allQuestions) {
-  if (data[value] === undefined) {
-    data[value] = {
+function Inc(
+  value: string,
+  subj: string,
+  newQuestions: number,
+  allQuestions: number
+) {
+  if (idStatsData[value] === undefined) {
+    idStatsData[value] = {
       count: 0,
       newQuestions: 0,
       allQuestions: 0,
       subjs: {},
     }
   }
-  data[value].count++
-  data[value].newQuestions += newQuestions
-  data[value].allQuestions += allQuestions
-  AddSubjToList(data[value].subjs, subj)
+  idStatsData[value].count++
+  idStatsData[value].newQuestions += newQuestions
+  idStatsData[value].allQuestions += allQuestions
+  AddSubjToList(idStatsData[value].subjs, subj)
 }
 
-function AddVisitStat(name, subj, newQuestions, allQuestions) {
-  var date = new Date()
+function AddVisitStat(
+  name: string,
+  subj: string,
+  newQuestions: number,
+  allQuestions: number
+) {
+  const date = new Date()
   const now =
     date.getFullYear() +
     '-' +
     ('0' + (date.getMonth() + 1)).slice(-2) +
     '-' +
     ('0' + date.getDate()).slice(-2)
-  if (vData[now] === undefined) {
-    vData[now] = {}
+  if (idvStatsData[now] === undefined) {
+    idvStatsData[now] = {}
   }
-  if (vData[now][name] === undefined) {
-    vData[now][name] = {
+  if (idvStatsData[now][name] === undefined) {
+    idvStatsData[now][name] = {
       count: 0,
       newQuestions: 0,
       allQuestions: 0,
       subjs: {},
     }
   }
-  vData[now][name].count++
-  vData[now][name].newQuestions += newQuestions
-  vData[now][name].allQuestions += allQuestions
-  AddSubjToList(vData[now][name].subjs, subj)
+  idvStatsData[now][name].count++
+  idvStatsData[now][name].newQuestions += newQuestions
+  idvStatsData[now][name].allQuestions += allQuestions
+  AddSubjToList(idvStatsData[now][name].subjs, subj)
 }
 
 function Save() {
   writes++
   if (writes === writeInterval) {
     try {
-      utils.WriteFile(JSON.stringify(data), idStatFile)
+      utils.WriteFile(JSON.stringify(idStatsData), idStatFile)
       // Log("Stats wrote.");
     } catch (err) {
       logger.Log('Error at writing logs!', logger.GetColor('redbg'))
       console.error(err)
     }
     try {
-      utils.WriteFile(JSON.stringify(vData), idVStatFile)
+      utils.WriteFile(JSON.stringify(idvStatsData), idVStatFile)
       // Log("Stats wrote.");
     } catch (err) {
       logger.Log('Error at writing visit logs!', logger.GetColor('redbg'))